From 4ec4c57b8e650aa458f6007905466b626405e88d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Wed, 20 Mar 2024 08:39:42 +0800
Subject: [PATCH 01/65] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E8=BF=BD=E6=BA=AF?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/packageoverRetrospect/index.ts    |  83 ++++
 .../packageoverJobMain.data.ts                |  25 +-
 .../packageoverRetrospect/index.vue           | 129 ++++++
 .../packageoverRetrospect.data.ts             | 409 ++++++++++++++++++
 4 files changed, 636 insertions(+), 10 deletions(-)
 create mode 100644 src/api/wms/packageoverRetrospect/index.ts
 create mode 100644 src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts

diff --git a/src/api/wms/packageoverRetrospect/index.ts b/src/api/wms/packageoverRetrospect/index.ts
new file mode 100644
index 000000000..9641a1472
--- /dev/null
+++ b/src/api/wms/packageoverRetrospect/index.ts
@@ -0,0 +1,83 @@
+import request from '@/config/axios'
+
+export interface PackageoverRetrospectVO {
+  id: number
+  number: string
+  jobNumber: string
+  warehouseCode: string
+  areaCode: string
+  locationGroupCode: string
+  locationCode: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  requestTime: Date
+  dueTime: Date
+  fromPackingNumber: string
+  toPackingNumber: string
+  fromBatch: string
+  toBatch: string
+  fromPackUnit: string
+  toPackUnit: string
+  fromPackQty: number
+  toPackQty: number
+  fromInventoryStatus: string
+  toInventoryStatus: string
+  fromContainerNumber: string
+  toContainerNumber: string
+  businessType: string
+  departmentCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  fromOwnerCode: string
+  toOwnerCode: string
+  remark: string
+  available: string
+}
+
+// 查询翻包记录主列表
+export const getPackageoverRetrospectPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packageover-retrospect/senior', data })
+  } else {
+    return await request.get({ url: `/wms/packageover-retrospect/page`, params })
+  }
+}
+
+// 查询翻包记录主详情
+export const getPackageoverRetrospect = async (id: number) => {
+  return await request.get({ url: `/wms/packageover-retrospect/get?id=` + id })
+}
+
+// 新增翻包记录主
+export const createPackageoverRetrospect = async (data: PackageoverRetrospectVO) => {
+  return await request.post({ url: `/wms/packageover-retrospect/create`, data })
+}
+
+// 修改翻包记录主
+export const updatePackageoverRetrospect = async (data: PackageoverRetrospectVO) => {
+  return await request.put({ url: `/wms/packageover-retrospect/update`, data })
+}
+
+// 删除翻包记录主
+export const deletePackageoverRetrospect = async (id: number) => {
+  return await request.delete({ url: `/wms/packageover-retrospect/delete?id=` + id })
+}
+
+// 导出翻包记录主 Excel
+export const exportPackageoverRetrospect = async (params) => {
+  return await request.download({ url: `/wms/packageover-retrospect/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/packageover-retrospect/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
index a66d844e0..d9afde219 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
@@ -193,7 +193,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -212,7 +212,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -231,7 +231,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -250,7 +250,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowBiggerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 180
@@ -269,7 +269,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowSmallerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 180
@@ -288,7 +288,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyInventoryStatus',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 180
@@ -307,7 +307,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowContinuousScanning',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -326,7 +326,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowPartialComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -345,7 +345,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyBatch',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -364,7 +364,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyPackingNumber',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -382,6 +382,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '承接人用户名',
     field: 'acceptUserId',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -394,6 +395,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
+    isTable: false,
     table: {
       width: 180
     },
@@ -410,6 +412,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '完成人用户名',
     field: 'completeUserId',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -422,6 +425,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
+    isTable: false,
     table: {
       width: 180
     },
@@ -438,6 +442,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '业务类型',
     field: 'businessType',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
new file mode 100644
index 000000000..674d15de0
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
@@ -0,0 +1,129 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PackageoverRetrospect.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PackageoverRetrospect.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :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>
+    </Table>
+  </ContentWrap>
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="PackageoverRetrospect.allSchemas" />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PackageoverRetrospect } from './packageoverRetrospect.data'
+import * as PackageoverRetrospectApi from '@/api/wms/packageoverRetrospect'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+defineOptions({ name: 'PackageoverRetrospect' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PackageoverRetrospect.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PackageoverRetrospectApi.getPackageoverRetrospectPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:packageoverRetrospect:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:packageoverRetrospect:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:packageoverRetrospect:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicPackageoverRetrospect')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PackageoverRetrospectApi.exportPackageoverRetrospect(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>
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
new file mode 100644
index 000000000..725b82081
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
@@ -0,0 +1,409 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+// 表单校验
+export const PackageoverRetrospectRules = reactive({
+})
+
+export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '任务单据号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    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',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    sort: 'custom',
+    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',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 200
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 200
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从包装规格',
+    field: 'fromPackUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装规格',
+    field: 'toPackUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从标包数量',
+    field: 'fromPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到标包数量',
+    field: 'toPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isTable:false
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    sort: 'custom',
+    isTable:false
+  },
+
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isTable:false
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    sort: 'custom',
+    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',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    sort: 'custom',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable:false
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'update',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  }
+]))

From ab07a0d626cb44399172acea526609219e78f2e1 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Wed, 20 Mar 2024 09:03:53 +0800
Subject: [PATCH 02/65] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E4=BD=8D=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E5=B7=A5=E7=BB=84=E3=80=81=E5=B7=A5=E5=BA=8F=E3=80=81?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AD=89=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/workstationBind/index.ts       |   3 +
 .../workstationBind/src/workstationBind.vue   | 642 ++++++++++++++++++
 src/utils/disposition/defaultButtons.ts       |  26 +-
 src/views/mes/workstation/index.vue           |  15 +-
 src/views/mes/workstation/workstation.data.ts |  39 +-
 5 files changed, 701 insertions(+), 24 deletions(-)
 create mode 100644 src/components/workstationBind/index.ts
 create mode 100644 src/components/workstationBind/src/workstationBind.vue

diff --git a/src/components/workstationBind/index.ts b/src/components/workstationBind/index.ts
new file mode 100644
index 000000000..bbab7d7c3
--- /dev/null
+++ b/src/components/workstationBind/index.ts
@@ -0,0 +1,3 @@
+import workstationBind from './src/workstationBind.vue'
+import detail from './src/Detail.vue'
+export { workstationBind,detail }
diff --git a/src/components/workstationBind/src/workstationBind.vue b/src/components/workstationBind/src/workstationBind.vue
new file mode 100644
index 000000000..df08c7e94
--- /dev/null
+++ b/src/components/workstationBind/src/workstationBind.vue
@@ -0,0 +1,642 @@
+<template>
+  <div>
+    <el-drawer
+      v-model="isShowDrawer"
+      title="详情"
+      direction="rtl"
+      size="80%"
+      v-loading="detailLoading"
+    >
+      <template #header>
+        <div class="font-size-18px">
+          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
+        </div>
+      </template>
+      <ContentWrap>
+        <!-- 默认单表展现 -->
+        <Descriptions
+          v-if="isBasic && !tabsExtend"
+          :data="detailData"
+          :schema="allSchemas.detailSchema"
+          :columns="2"
+        />
+      </ContentWrap>
+
+      <Tabs :tabsList="TabsList" :current="current" @change="change" />
+      <div class="flex">
+        <!-- 详情 -->
+        <ContentWrap class="w-[100%]">
+          <!-- 单表切换tabs 展现table -->
+          <Table
+            v-if="isBasic && tabsExtend"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :loading="tableObjectRef.loading"
+            :pagination="{ total: tableObjectRef.total }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
+          >
+            <template>
+              <div>1</div>
+            </template>
+          </Table>
+          <Table
+            v-if="!isBasic && fromeWhere != 'Equipment'"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :loading="tableObjectRef.loading"
+            :pagination="{ total: tableObjectRef.total }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
+          >
+            <template>
+              <div>1</div>
+            </template>
+          </Table>
+          <Table
+            v-if="!isBasic && fromeWhere != 'Process'"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :loading="tableObjectRef.loading"
+            :pagination="{ total: tableObjectRef.total }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
+          >
+            <template>
+              <div>1</div>
+            </template>
+          </Table>
+          <DetailTable
+            v-if="!isBasic && fromeWhere == 'Production' && isShowDrawer"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :allList="allList"
+            :countScopeType="countScopeType"
+            :key="updateKey"
+          >
+            <template>
+              <div>1</div>
+            </template>
+          </DetailTable>
+        </ContentWrap>
+      </div>
+    </el-drawer>
+    <!-- 表单弹窗：添加/修改 -->
+    <BasicForm
+      ref="formRef"
+      @success="submitForm"
+      :rules="detailAllSchemasRules"
+      :formAllSchemas="detailAllSchemas"
+      :isBusiness="false"
+      :apiUpdate="apiUpdate"
+      :apiCreate="apiCreate"
+      :fromeWhere="fromeWhere"
+      :isDetail="true"
+      @searchTableSuccess="searchTableSuccess"
+      :detailData="detailData"
+      @submitForm="submitForm"
+      @selectChangeDetail="selectChangeDetail"
+      :formTypeDetail="formTypeDetail"
+      :countPlanAllList="countPlanAllList"
+      @onChange="detailBasicFormOnChange"
+      @onBlur="onBlur"
+      @formFormDateChange="formFormDateChange"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import * as RemarkApi from '@/api/wms/remark'
+import * as FileApi from '@/api/wms/file'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import Detail from "@/components/workstationBind/src/Detail.vue";
+import {TabsList} from "@/views/mes/workstation/workstation.data";
+import DetailTable from "@/components/DetailTable/src/DetailTable.vue";
+import Tabs from "@/components/Tabs/src/Tabs.vue";
+import Annex from "@/components/Annex/src/Annex.vue";
+import Remarks from "@/components/Remarks/src/Remarks.vue";
+import BasicForm from "@/components/BasicForm/src/BasicForm.vue";
+import TableHead from "@/components/TableHead/src/TableHead.vue";
+import ChangeRecord from "@/components/ChangeRecord/src/ChangeRecord.vue";
+import {Team} from "@/utils/disposition/formFields";
+
+defineOptions({ name: 'BindDetail' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail'
+const updateKey = ref(0)
+
+const props = defineProps({
+  // 标签参数
+  tabs: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 是否是基础数据 展现详情顶部表单
+  isBasic: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 表单，列表 相关信息
+  allSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 明细列表相关信息
+  detailAllSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  //  明细验证
+  detailAllSchemasRules: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 子表新增API
+  apiCreate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表编辑API
+  apiUpdate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表分页列表API
+  apiPage: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表删除API
+  apiDelete: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表新增修改校验
+  detailValidate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 来源 countPlan盘点计划进入
+  fromeWhere: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  // 获取接口列表集合
+  allList: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 盘点范围类型
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
+  formTypeDetail: {
+    type: String,
+    required: false,
+    default: 'InputString'
+  },
+  //盘点详情子表新增的时候判断盘点范围值的下拉列表
+  countPlanAllList: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 详情列表扩展操作按钮
+  buttondataTable: {
+    type: Array,
+    required: false,
+    default: ()=>{
+      return []
+    }
+  },
+  // 针对基础数据tabs扩展 显示table列表 默认false
+  tabsExtend: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // tableObject 数据过滤条件 针对 详情扩展标签页 传入不同条件
+  tableObjectExtend: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 子列表 筛选 展示与隐藏 ，默认展示
+  detailButtonIsShowFilter:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 子列表 新增 展示与隐藏 ，默认展示
+  detailButtonIsShowAdd:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 子列表 编辑 展示与隐藏 ，默认展示
+  detailButtonIsShowEdit:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 子列表 删除 展示与隐藏 ，默认展示
+  detailButtonIsShowDelete:{
+    type: Boolean,
+    required: false,
+    default: true
+  }
+})
+const isShowDrawer = ref(false)
+const detailLoading = ref(false)
+const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
+
+if (props.isBasic == true) {
+  if (tabsList.value && tabsList.value.length > 0) {
+    tabsList.value.unshift({
+      label: '详情',
+      prop: 'Detail'
+    })
+  }
+} else {
+  if (tabsList.value && tabsList.value.length > 0) {
+  } else {
+    tabsList.value = [
+      {
+        label: '明细',
+        prop: 'Detail'
+      }
+    ]
+  }
+}
+if (tabsList.value) {
+}
+
+// 附件默认数据
+const annexData = reactive({
+  annexList: []
+})
+
+// 备注数据
+const remarksData = reactive({
+  remarksList: [],
+  data: {}
+})
+
+// 变更记录默认数据
+const changeRecordData = reactive({
+  changeRecordList: []
+})
+const detailData = ref({}) //详情数据
+// 获取附件列表篇
+const getFileList = async () => {
+  detailLoading.value = true
+  try {
+    annexData.annexList = await FileApi.getFileList(remarksData.data)
+  } finally {
+    detailLoading.value = false
+  }
+}
+/** 添加附件 */
+const handleAnnexSuccess = () => {
+  getFileList()
+  getChangeRecordList()
+}
+// 删除附件成功之后所走的方法
+const deleteAnnexSuccess = async () => {
+  getFileList()
+  getChangeRecordList()
+}
+
+// Tabs当前选择
+const current = ref(0)
+const change = (item, index) => {
+  current.value = index
+  emit('changeTabs', item)
+}
+
+//主表所需的参数
+const masterParmas = ref({
+  masterId: '', //主表id
+  number: '', //主表单据号
+  status: '' //主表状态 用于控制子表新增编辑按钮显示情况
+})
+
+// 列表头部按钮
+const HeadButttondata = ref()
+// 列表-操作按钮
+const buttondata = ref()
+
+/** 打开弹窗 */
+const formRef = ref()
+const titleNameRef = ref()
+const titleValueRef = ref()
+const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
+  titleNameRef.value = titleName
+  titleValueRef.value = titleValue
+  remarksData.data = {
+    tableId: row.id,
+    tableName: tableName
+  }
+  // 加载明细列表
+  if (!props.isBasic) {
+    // 设置主表id
+    masterParmas.value.masterId = row.id
+    masterParmas.value.number = row.number
+    masterParmas.value.status = row.status
+    tableObjectRef.value.params = {
+      masterId: row.id
+    }
+    await getList()
+  }
+  isShowDrawer.value = true
+  if (row) {
+    detailLoading.value = true
+    try {
+      detailData.value = row
+      getRemarkList()
+      getFileList()
+      getChangeRecordList()
+      // 判断详情按钮是否显示
+      let detailButtonFilter: any = []
+      let detailButtonAdd: any = []
+      if (props.detailButtonIsShowFilter) {
+        // 筛选
+        detailButtonFilter = [
+          defaultButtons.defaultFilterBtn(null)
+        ]
+      }
+      if (props.detailButtonIsShowAdd) {
+        // 新增
+        detailButtonAdd = [
+          defaultButtons.defaultAddBtn({
+            hide: isShowMainButton(row, ['1'])
+          })
+        ]
+      }
+      HeadButttondata.value = [...detailButtonFilter,...detailButtonAdd]
+
+      // 针对特殊处理 当业务是任务的 只显示筛选 正常情况下应在业务页面设置 后期再作优化
+      if (routeName.value.indexOf('Job') > -1) {
+        HeadButttondata.value = [
+          defaultButtons.defaultFilterBtn(null) // 筛选
+        ]
+      }
+
+      let detailButtonEdit: any = []
+      let detailButtonDelete: any = []
+      if (props.detailButtonIsShowEdit) {
+        // 编辑
+        detailButtonEdit = [
+          defaultButtons.mainListEditBtn({
+            hide: isShowMainButton(row, ['1'])
+          })
+        ]
+      }
+      if (props.detailButtonIsShowDelete) {
+        // 删除
+        detailButtonDelete = [
+          defaultButtons.mainListDeleteBtn({
+            hide: isShowMainButton(row, ['1'])
+          })
+        ]
+      }
+      buttondata.value = [...detailButtonEdit,...detailButtonDelete,...props.buttondataTable]
+
+    } finally {
+      detailLoading.value = false
+    }
+  }
+}
+defineExpose({ openDetail, formRef }) // 提供 open 方法，用于打开弹窗
+// tabs 切换事件
+const changeTabs = (item) => {
+  alert(item.value)
+}
+// 获取备注列表
+const getRemarkList = async () => {
+  detailLoading.value = true
+  try {
+    remarksData.remarksList = await RemarkApi.getRemarkPage(remarksData.data)
+  } finally {
+    detailLoading.value = false
+  }
+}
+// 备注提交成功之后
+const remarksSubmitScuess = async (remark) => {
+  detailLoading.value = false
+  getRemarkList()
+  getChangeRecordList()
+}
+// 获取变更记录
+const getChangeRecordList = async () => {
+  changeRecordData.changeRecordList = await RemarkApi.getChangeRecordPage(remarksData.data)
+}
+
+const tableObjectRef = ref()
+const tableMethodsRef = ref()
+const detailAllSchemasRef = ref()
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: props.apiPage // 分页接口
+})
+
+tableObjectRef.value = tableObject
+tableMethodsRef.value = tableMethods
+detailAllSchemasRef.value = props.detailAllSchemas
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 获得表格的各种操作
+const { getList } = tableMethodsRef.value
+
+
+// 字段设置 更新主列表字段
+// const updataTableColumns = (val) => {
+//   detailAllSchemas.tableColumns.value = val
+// }
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  } else {
+    emit('tableFormButton',val, row)
+  }
+}
+/** 添加/修改操作 */
+const openForm = async (type: string, row?: number) => {
+  formRef.value.open(type, row, masterParmas.value)
+  emit('detailOpenForm', type, row)
+}
+// form 提交
+const submitForm = async (formType, data) => {
+  try {
+    // 子表新增编辑校验 如果业务需要子表提交校验 需在主页详情组件添加 detailValidate 参数及方法
+    const rs = (await props.detailValidate) ? await props.detailValidate(data) : true
+    if (!rs) return
+    if (formType === 'create') {
+      await props.apiCreate(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await props.apiUpdate(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    await getList()
+    updateKey.value += 1
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
+}
+// 传递给父类
+const emit = defineEmits([
+  'searchTableSuccessDetail',
+  'changeTabs',
+  'selectChangeDetail',
+  'detailOpenForm',
+  'tableFormButton',
+  'openImage',
+  'onBlur',
+  'detailBasicFormOnChange',
+  'formFormDateChange'
+])
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await props.apiDelete(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+    updateKey.value += 1
+  } catch {}
+}
+// 筛选提交
+const searchFormClick = async (searchData) => {
+  const { tableObject, tableMethods } = useTable({
+    getListApi: props.apiPage // 分页接口
+  })
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+      ? searchData.filters
+      : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
+  }
+  detailAllSchemasRef.value = props.detailAllSchemas
+  tableObjectRef.value = tableObject
+  tableMethodsRef.value = tableMethods
+  tableObjectRef.value.tableList = []
+  const { getList } = tableMethods
+  await getList()
+  updateKey.value += 1
+  // tableObjectRef.value.params = {
+  //   isSearch: true,
+  //   filters: searchData.filters
+  //     ? searchData.filters
+  //     : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
+  // }
+  // getList() // 刷新当前列表
+}
+// 选择盘点类型的时候针对限值的操作
+const selectChangeDetail = (field, val) => {
+  emit('selectChangeDetail', field, val)
+}
+// 打开图片
+const openImage=(item)=>{
+  emit('openImage', item)
+}
+/**
+ * 监听改变事件
+ * @param field 当前操作字段
+ * @param cur 改变后值
+ */
+const detailBasicFormOnChange = (field, cur) => {
+  emit('detailBasicFormOnChange', field, cur)
+}
+
+/**
+ * 监听失焦事件
+ * @param field 当前操作字段
+ * @param e
+ */
+const onBlur = (field, e) => {
+  emit('onBlur', field, e)
+}
+
+// 日期改变事件
+const formFormDateChange = (field, val,row, index) => {
+  emit('formFormDateChange', field, val,row, index)
+}
+//监视属性
+watch(
+  () => props.apiPage,
+  () => {
+    const { tableObject, tableMethods } = useTable({
+      getListApi: props.apiPage // 分页接口
+    })
+    tableObject.params.masterId = masterParmas.value.masterId
+    detailAllSchemasRef.value = props.detailAllSchemas
+    if (props.tableObjectExtend) {
+      props.tableObjectExtend.forEach(item => {
+        tableObject.params[item.key] = item.value
+      })
+    }
+    tableObjectRef.value = tableObject
+    tableMethodsRef.value = tableMethods
+    const { getList } = tableMethods
+    getList()
+  }
+)
+</script>
+<style lang="scss">
+.el-drawer__body {
+  background: #f5f5f5 !important;
+}
+
+::v-deep(.label-class-name) {
+  color: #dedede;
+}
+</style>
+<style scoped lang="scss"></style>
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index b7f8ca791..0b59fdb7b 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -250,7 +250,18 @@ export function mainListDeleteBtn(option:any) {
     hasPermi: ''
   })
 }
-
+// 主列表-绑定
+export function mainListBindBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '绑定',
+    name: 'bind',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 // 主列表-申请流程-关闭按钮
 export function mainListCloseBtn(option:any) {
   return __defaultBtnOption(option,{
@@ -735,18 +746,7 @@ export function mainThawRequesttBtn(option:any) {
     hasPermi: ''
   })
 }
-// 主列表-绑定
-export function mainListBindBtn(option:any) {
-  return __defaultBtnOption(option,{
-    label: '绑定',
-    name: 'bind',
-    hide: false,
-    type: 'primary',
-    color: '',
-    link: true, // 文本展现按钮
-    hasPermi: ''
-  })
-}
+
 // 默认按钮规则
 function __defaultBtnOption(option:any,specific:any){
   return {
diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue
index 35f6f2dd1..83f02b07f 100644
--- a/src/views/mes/workstation/index.vue
+++ b/src/views/mes/workstation/index.vue
@@ -52,7 +52,8 @@
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Workstation.allSchemas" />
-
+  <!-- 绑定 -->
+  <BindDetail ref="bindDetailRef" :isBasic="true" :allSchemas="Workstation.allSchemas" />
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/workstation/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
@@ -65,7 +66,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
-
+import BindDetail from '@/components/workstationBind/src/workstationBind.vue'
 defineOptions({ name: 'Workstation' })
 
 const message = useMessage() // 消息弹窗
@@ -144,11 +145,10 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     await handleDelete(row.id)
-  }else if (val == 'bind') { // 删除
-    await detailRef.value.openDetail(row, '绑定', row.name, 'mesWorkstation')
+  }else if (val == 'bind') { // 绑定
+    openBindDetail(row,row.name,row.code)
   }
 }
-
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
@@ -184,6 +184,11 @@ const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkstation')
 }
+/** 绑定操作 */
+const bindDetailRef = ref()
+const openBindDetail = (row: any, titleName: any, titleValue: any) => {
+  bindDetailRef.value.openDetail(row, titleName, titleValue, 'basicWorkstation')
+}
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts
index 611194817..b4e7b8f1a 100644
--- a/src/views/mes/workstation/workstation.data.ts
+++ b/src/views/mes/workstation/workstation.data.ts
@@ -1,11 +1,28 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import type {CrudSchema} from '@/hooks/web/useCrudSchemas'
+import {dateFormatter} from '@/utils/formatTime'
 
 // 表单校验
 export const WorkstationRules = reactive({
   code: [required]
 })
+export const TabsList = [{
+  label: "工组",
+  prop: 'Team',
+},
+  {
+    label: "设备",
+    prop: 'Equipment',
+  },
+  {
+    label: "工序",
+    prop: 'Process',
+  },
+  {
+    label: "产品",
+    prop: 'Production',
+  }
 
+]
 export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
 
   {
@@ -46,26 +63,36 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'activeTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width: '100%'},
         type: 'datetime',
-        valueFormat: 'x'
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
-    }
+    },
   },
   {
     label: '失效时间',
     field: 'expireTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width: '100%'},
         type: 'datetime',
-        valueFormat: 'x'
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
-    }
+    },
   },
   {
     label: '操作',

From fbbc3fe5700df428da88135a3f0bcd64cc153920 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 20 Mar 2024 13:01:30 +0800
Subject: [PATCH 03/65] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9i?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/supplierdeliverRequestMain/index.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 94e827a47..e1ef80cea 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -157,7 +157,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         let beginTime =  val[0]['endTime']
         let deliveryDate =  formatDate(val[0]['deliveryDate'],'YYYY-MM-DD')
         planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
-        setV['planArriveTime']= new Date(planArriveTimeStr.value)
+        setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
         // 清空子表数据
         tableData.value = []
       }

From 3aae780a565f2fef313d6daddd651eaddebeb036 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 20 Mar 2024 13:55:10 +0800
Subject: [PATCH 04/65] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchaseMain/purchaseMain.data.ts           | 1 +
 .../supplierdeliverRequestMain.data.ts                          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index a608952a1..2bb831a34 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -449,6 +449,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150
    },
    tableForm: {
+     disabled:true,
      type: 'Select'
    }
  },
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 5f20f3fee..a858281dd 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -506,7 +506,7 @@ export const SupplierdeliverRequestMainRules = reactive({
   ],
   contactEmail: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validator: validateEmail, message: '请输入正确的手机号', trigger: 'blur' }
+    { validator: validateEmail, message: '请输入正确的邮箱地址', trigger: 'blur' }
   ],
   carrierCode: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }

From d8b612f21bd04f6b0f0fbd4365e58017cb4b7f47 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 20 Mar 2024 13:59:21 +0800
Subject: [PATCH 05/65] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95=E6=90=9C=E7=B4=A2=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockup/stockupMainRequest/index.vue      |   2 +
 .../stockupMainRequest.data.ts                | 244 ++++++++++--------
 2 files changed, 140 insertions(+), 106 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
index df54d6c80..a0d1bca2c 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
@@ -90,6 +90,8 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail'
+import {DeliverRequestDetail} from '../../deliver/deliverRequestMain/deliverRequestMain.data'
+
 // 备货申请
 defineOptions({ name: 'StockupMainRequest' })
 
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index 156c1f1df..d0241eb88 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -7,6 +7,9 @@ import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 import * as BalanceApi  from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
+import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain'
+import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMain.data'
+
 import * as  locationApi from '@/api/wms/location'
 import { Location } from '../../../basicDataManage/factoryModeling/location/location.data'
 
@@ -48,6 +51,35 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
+  {
+    label: '发货计划单号',
+    field: 'deliverPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择发货计划单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '发货计划信息', // 查询弹窗标题
+        searchAllSchemas: DeliverPlanMain.allSchemas, // 查询弹窗所需类
+        searchPage: DeliverPlanMainApi.getDeliverPlanMainPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },
+        {
+          key: 'status',
+          value: '6',
+          isMainValue: false
+        }]
+      }
+    }
+  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',
@@ -318,26 +350,26 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
         }
       }
     },
-    {
-      label: '直接生成记录',
-      field: 'directCreateRecord',
-      dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string',
-      isTable: true,
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      form: {
-        component: 'Switch',
-        value: requestsettingData.directCreateRecord,
-        componentProps: {
-          inactiveValue: 'FALSE',
-          activeValue: 'TRUE',
-          disabled: true
-        }
-      }
-    },
+    // {
+    //   label: '直接生成记录',
+    //   field: 'directCreateRecord',
+    //   dictType: DICT_TYPE.TRUE_FALSE,
+    //   dictClass: 'string',
+    //   isTable: true,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'Switch',
+    //     value: requestsettingData.directCreateRecord,
+    //     componentProps: {
+    //       inactiveValue: 'FALSE',
+    //       activeValue: 'TRUE',
+    //       disabled: true
+    //     }
+    //   }
+    // },
 
   {
     label: '到库区类型范围',
@@ -443,92 +475,92 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       width: 100
     },
   },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择包装号',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalanceItemPage,
-      searchCondition: [
-      //   {
-      //   key:'customerCode', // 查询列表中字段
-      //   value:'customerCode', // 指主表某字段 
-      //   message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
-      //   isMainValue: true // 表示查询条件是主表的字段的值
-      // }
-    ]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择包装号',
-        searchField: 'packingNumber',
-        searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalanceItemPage,
-        searchCondition: [
-        //   {
-        //   key:'customerCode', // 查询列表中字段
-        //   value:'customerCode', // 指主表某字段 
-        //   message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
-        //   isMainValue: true // 表示查询条件是主表的字段的值
-        // }
-      ]
-      }
-    }
-  },
-  {
-    label: '器具号',
-    field: 'containerNumber',
-    sort: 'custom',
-    table: {
-      width: 100
-    },
-    isSearch: true,
-  },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    isSearch: true,
-    tableForm: {
-      disabled: true,
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 120
-    },
-    tableForm: {
-      disabled: true,
-      type: 'Select'
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '包装号',
+  //   field: 'packingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm:{
+  //     isInpuFocusShow: true, // 开启查询弹窗
+  //     searchListPlaceholder: '请选择包装号',
+  //     searchField: 'packingNumber',
+  //     searchTitle: '库存余额信息',
+  //     searchAllSchemas: Balance.allSchemas,
+  //     searchPage: BalanceApi.getBalanceItemPage,
+  //     searchCondition: [
+  //     //   {
+  //     //   key:'customerCode', // 查询列表中字段
+  //     //   value:'customerCode', // 指主表某字段 
+  //     //   message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
+  //     //   isMainValue: true // 表示查询条件是主表的字段的值
+  //     // }
+  //   ]
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择包装号',
+  //       searchField: 'packingNumber',
+  //       searchTitle: '库存余额信息',
+  //       searchAllSchemas: Balance.allSchemas,
+  //       searchPage: BalanceApi.getBalanceItemPage,
+  //       searchCondition: [
+  //       //   {
+  //       //   key:'customerCode', // 查询列表中字段
+  //       //   value:'customerCode', // 指主表某字段 
+  //       //   message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
+  //       //   isMainValue: true // 表示查询条件是主表的字段的值
+  //       // }
+  //     ]
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '器具号',
+  //   field: 'containerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 100
+  //   },
+  //   isSearch: true,
+  // },
+  // {
+  //   label: '批次',
+  //   field: 'batch',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   tableForm: {
+  //     disabled: true,
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '库存状态',
+  //   field: 'inventoryStatus',
+  //   dictType: DICT_TYPE.INVENTORY_STATUS,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 120
+  //   },
+  //   tableForm: {
+  //     disabled: true,
+  //     type: 'Select'
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '物品代码',
     field: 'itemCode',

From 051330940e8dbeb973c62b47a9e4d1b95562e14f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Wed, 20 Mar 2024 14:05:52 +0800
Subject: [PATCH 06/65] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=A1=A8=E5=8D=95=20?=
 =?UTF-8?q?=E9=81=AE=E7=BD=A9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 3a5aa7429..4c96ef8e5 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -4,12 +4,12 @@
     v-model="dialogVisible"
     :width="dialogWidth"
     :close-on-click-modal="false"
+    v-loading="formLoading"
   >
   <div 
     style="max-height: 60vh;overflow-y: auto;">
     <Form
       ref="formRef"
-      v-loading="formLoading"
       :rules="rules"
       :schema="formSchema"
       :is-col="true"

From 3b6c504ac0071a09599aa81c9752f79602c5277f Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 20 Mar 2024 14:56:32 +0800
Subject: [PATCH 07/65] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchasePlanMain/index.vue         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 157816868..8d4556556 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -441,6 +441,7 @@
   // 主子数据 提交
   const submitForm = async (formType, data) => {
     data.subList = []
+    let flag = false
     for (let item of tableData.value) {
       await PurchaseDetailApi.getPurchaseDetailPageCheckData({
         number: item.poNumber,
@@ -449,13 +450,20 @@
         console.log("【要货计划】-每条数据结果",item)
         if(res.list[0].type == 'DISCRETE'){//只有离散单需要这个校验
           if (item.planQty > res.list[0].orderQty - res.list[0].plannedQty) {
+            flag = true;
             message.error('要货计划数量不得大于订单数量-已计划数量')
             return
+          }else{
+            data.subList.push(item) // 拼接子表数据参数
           }
+        }else{
+          data.subList.push(item) // 拼接子表数据参数
         }
-        data.subList.push(item) // 拼接子表数据参数
       })
     }
+    if(flag){
+      return;
+    }
     if (data.subList.length == tableData.value.length) {
       try {
         if (formType === 'create') {

From ee9a4a9506a87b2928ca04fa6560151ca3b83f76 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 20 Mar 2024 16:09:28 +0800
Subject: [PATCH 08/65] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierManage/supplieritem/supplieritem.data.ts            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
index 2395499b8..1e891afbf 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
@@ -319,7 +319,7 @@ export const SupplieritemRules = reactive({
   ],
   supplierItemCode: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+    // { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
   ],
   // packUnit: [
   //   { required: true, message: '请选择供应商包装单位', trigger: 'change' }

From cf1ea7f3930c1e7c042b38bcd535fe1fa516c5e2 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 20 Mar 2024 16:12:24 +0800
Subject: [PATCH 09/65] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=9B=E5=BB=BA=E8=80=85=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/itembasic/index.ts                               | 2 +-
 src/api/wms/itempackage/index.ts                             | 2 +-
 .../stockup/stockupMainJob/stockupMainJob.data.ts            | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts
index 52a8dec1b..20f58f85c 100644
--- a/src/api/wms/itembasic/index.ts
+++ b/src/api/wms/itembasic/index.ts
@@ -34,7 +34,7 @@ export const getItembasicPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return request.post({ url: '/wms/itembasic/senior', data })
+    return await request.post({ url: '/wms/itembasic/senior', data })
   } else {
     return await request.get({ url: `/wms/itembasic/page`, params })
   }
diff --git a/src/api/wms/itempackage/index.ts b/src/api/wms/itempackage/index.ts
index 5d4a850fa..5270dbc2f 100644
--- a/src/api/wms/itempackage/index.ts
+++ b/src/api/wms/itempackage/index.ts
@@ -24,7 +24,7 @@ export const getItempackagingPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return request.post({ url: '/wms/itempackage/senior', data })
+    return await request.post({ url: '/wms/itempackage/senior', data })
   } else {
     return await request.get({ url: `/wms/itempackage/page`, params })
   }
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
index 2ef94ee4b..c8aca1d29 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
@@ -284,6 +284,11 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'outInventoryStatuses',
     sort: 'custom',
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+  },
   {
     label: '创建时间',
     field: 'createTime',

From 78a11a28687a5c7f79b84072a308e36fc4604fee Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 20 Mar 2024 16:24:14 +0800
Subject: [PATCH 10/65] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8C=85=E8=A3=85?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=B0=83=E7=94=A8api=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicDataManage/itemManage/itempackage/itempackage.data.ts  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
index 87c40736f..f1ca43fe7 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
@@ -32,8 +32,6 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-          action: '==',
-          isSearch: true,
           isMainValue: false
         }]
       }

From 11fc5a4261bbcbcf8efe4b2dff4d2e79e0bffe97 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Wed, 20 Mar 2024 17:08:13 +0800
Subject: [PATCH 11/65] =?UTF-8?q?1=E3=80=81=E7=BB=91=E5=AE=9A=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/workstation/index.ts              | 12 ++-
 src/components/workstationBind/index.ts       |  3 +-
 .../src/{workstationBind.vue => Detail.vue}   | 81 +++++++++++--------
 src/views/mes/workstation/index.vue           | 61 ++++++++++----
 src/views/mes/workstation/workstation.data.ts | 16 ++++
 5 files changed, 119 insertions(+), 54 deletions(-)
 rename src/components/workstationBind/src/{workstationBind.vue => Detail.vue} (89%)

diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts
index 1e8e44a8f..d426cd3f4 100644
--- a/src/api/mes/workstation/index.ts
+++ b/src/api/mes/workstation/index.ts
@@ -46,4 +46,14 @@ export const exportWorkstation = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/mes/workstation/get-import-template' })
-}
\ No newline at end of file
+}
+// 查询班组列表
+export const getTeamPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/team/senior', data })
+  } else {
+    return await request.get({ url: `/wms/team/page`, params })
+  }
+}
diff --git a/src/components/workstationBind/index.ts b/src/components/workstationBind/index.ts
index bbab7d7c3..e7d199c89 100644
--- a/src/components/workstationBind/index.ts
+++ b/src/components/workstationBind/index.ts
@@ -1,3 +1,2 @@
-import workstationBind from './src/workstationBind.vue'
 import detail from './src/Detail.vue'
-export { workstationBind,detail }
+export {detail }
diff --git a/src/components/workstationBind/src/workstationBind.vue b/src/components/workstationBind/src/Detail.vue
similarity index 89%
rename from src/components/workstationBind/src/workstationBind.vue
rename to src/components/workstationBind/src/Detail.vue
index df08c7e94..5b39f255b 100644
--- a/src/components/workstationBind/src/workstationBind.vue
+++ b/src/components/workstationBind/src/Detail.vue
@@ -15,7 +15,6 @@
       <ContentWrap>
         <!-- 默认单表展现 -->
         <Descriptions
-          v-if="isBasic && !tabsExtend"
           :data="detailData"
           :schema="allSchemas.detailSchema"
           :columns="2"
@@ -29,12 +28,12 @@
           <!-- 单表切换tabs 展现table -->
           <Table
             v-if="isBasic && tabsExtend"
-            :columns="detailAllSchemasRef.tableColumns"
-            :data="tableObjectRef.tableList"
-            :loading="tableObjectRef.loading"
-            :pagination="{ total: tableObjectRef.total }"
-            v-model:pageSize="tableObjectRef.pageSize"
-            v-model:currentPage="tableObjectRef.currentPage"
+            :columns="teamSchemasRef.tableColumns"
+            :data="teamObjectRef.tableList"
+            :loading="teamObjectRef.loading"
+            :pagination="{ total: teamObjectRef.total }"
+            v-model:pageSize="teamObjectRef.pageSize"
+            v-model:currentPage="teamObjectRef.currentPage"
           >
             <template>
               <div>1</div>
@@ -42,12 +41,12 @@
           </Table>
           <Table
             v-if="!isBasic && fromeWhere != 'Equipment'"
-            :columns="detailAllSchemasRef.tableColumns"
-            :data="tableObjectRef.tableList"
-            :loading="tableObjectRef.loading"
-            :pagination="{ total: tableObjectRef.total }"
-            v-model:pageSize="tableObjectRef.pageSize"
-            v-model:currentPage="tableObjectRef.currentPage"
+            :columns="teamSchemasRef.tableColumns"
+            :data="teamObjectRef.tableList"
+            :loading="teamObjectRef.loading"
+            :pagination="{ total: teamObjectRef.total }"
+            v-model:pageSize="teamObjectRef.pageSize"
+            v-model:currentPage="teamObjectRef.currentPage"
           >
             <template>
               <div>1</div>
@@ -55,12 +54,12 @@
           </Table>
           <Table
             v-if="!isBasic && fromeWhere != 'Process'"
-            :columns="detailAllSchemasRef.tableColumns"
-            :data="tableObjectRef.tableList"
-            :loading="tableObjectRef.loading"
-            :pagination="{ total: tableObjectRef.total }"
-            v-model:pageSize="tableObjectRef.pageSize"
-            v-model:currentPage="tableObjectRef.currentPage"
+            :columns="teamSchemasRef.tableColumns"
+            :data="teamObjectRef.tableList"
+            :loading="teamObjectRef.loading"
+            :pagination="{ total: teamObjectRef.total }"
+            v-model:pageSize="teamObjectRef.pageSize"
+            v-model:currentPage="teamObjectRef.currentPage"
           >
             <template>
               <div>1</div>
@@ -68,8 +67,8 @@
           </Table>
           <DetailTable
             v-if="!isBasic && fromeWhere == 'Production' && isShowDrawer"
-            :columns="detailAllSchemasRef.tableColumns"
-            :data="tableObjectRef.tableList"
+            :columns="teamSchemasRef.tableColumns"
+            :data="teamObjectRef.tableList"
             :allList="allList"
             :countScopeType="countScopeType"
             :key="updateKey"
@@ -120,7 +119,7 @@ import TableHead from "@/components/TableHead/src/TableHead.vue";
 import ChangeRecord from "@/components/ChangeRecord/src/ChangeRecord.vue";
 import {Team} from "@/utils/disposition/formFields";
 
-defineOptions({ name: 'BindDetail' })
+defineOptions({ name: 'Detail' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -144,6 +143,12 @@ const props = defineProps({
     required: false,
     default: false
   },
+  // 列表 相关信息
+  tableAllSchemas: {
+    type: Array,
+    required: true,
+    default: null
+  },
   // 表单，列表 相关信息
   allSchemas: {
     type: Object,
@@ -265,6 +270,11 @@ const props = defineProps({
     type: Boolean,
     required: false,
     default: true
+  },
+  teamSchemas:{
+    type: Boolean,
+    required: false,
+    default: true
   }
 })
 const isShowDrawer = ref(false)
@@ -364,7 +374,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
     masterParmas.value.masterId = row.id
     masterParmas.value.number = row.number
     masterParmas.value.status = row.status
-    tableObjectRef.value.params = {
+    teamObjectRef.value.params = {
       masterId: row.id
     }
     await getList()
@@ -452,18 +462,19 @@ const remarksSubmitScuess = async (remark) => {
 const getChangeRecordList = async () => {
   changeRecordData.changeRecordList = await RemarkApi.getChangeRecordPage(remarksData.data)
 }
-
-const tableObjectRef = ref()
-const tableMethodsRef = ref()
 const detailAllSchemasRef = ref()
+detailAllSchemasRef.value = props.detailAllSchemas
+const teamObjectRef = ref()
+const teamMethodsRef = ref()
+const teamSchemasRef = ref()
 
 const { tableObject, tableMethods } = useTable({
   getListApi: props.apiPage // 分页接口
 })
 
-tableObjectRef.value = tableObject
-tableMethodsRef.value = tableMethods
-detailAllSchemasRef.value = props.detailAllSchemas
+teamObjectRef.value = tableObject
+teamMethodsRef.value = tableMethods
+teamSchemasRef.value = props.teamSchemas
 
 // 根据状态返回该按钮是否显示
 const isShowMainButton = (row, val) => {
@@ -475,7 +486,7 @@ const isShowMainButton = (row, val) => {
 }
 
 // 获得表格的各种操作
-const { getList } = tableMethodsRef.value
+const { getList } = teamMethodsRef.value
 
 
 // 字段设置 更新主列表字段
@@ -565,9 +576,9 @@ const searchFormClick = async (searchData) => {
       : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
   }
   detailAllSchemasRef.value = props.detailAllSchemas
-  tableObjectRef.value = tableObject
-  tableMethodsRef.value = tableMethods
-  tableObjectRef.value.tableList = []
+  teamObjectRef.value = tableObject
+  teamMethodsRef.value = tableMethods
+  teamObjectRef.value.tableList = []
   const { getList } = tableMethods
   await getList()
   updateKey.value += 1
@@ -623,8 +634,8 @@ watch(
         tableObject.params[item.key] = item.value
       })
     }
-    tableObjectRef.value = tableObject
-    tableMethodsRef.value = tableMethods
+    teamObjectRef.value = tableObject
+    teamMethodsRef.value = tableMethods
     const { getList } = tableMethods
     getList()
   }
diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue
index 83f02b07f..f734dd0ab 100644
--- a/src/views/mes/workstation/index.vue
+++ b/src/views/mes/workstation/index.vue
@@ -51,22 +51,33 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="Workstation.allSchemas" />
-  <!-- 绑定 -->
-  <BindDetail ref="bindDetailRef" :isBasic="true" :allSchemas="Workstation.allSchemas" />
+  <Detail ref="detailRef"
+          :isBasic="false"
+          :allSchemas="Workstation.allSchemas"
+          :detailAllSchemas="detailAllSchemas"
+          :detailAllSchemasRules="WorkstationRules"
+          :apiPage="apiPage"
+          :tabs="TabsList"
+          @changeTabs="changeTabs"
+          />
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/workstation/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { Workstation,WorkstationRules } from './workstation.data'
+import {TabsList, Team, Workstation, WorkstationRules} from './workstation.data'
 import * as WorkstationApi from '@/api/mes/workstation'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
-import BindDetail from '@/components/workstationBind/src/workstationBind.vue'
+import {
+  PurchasereceiptRecordDetail,
+  PurchasereceiptRecordDetailRules,
+  PurchasereceiptRecordMain
+} from "@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data";
+import {PurchasereceiptRequestTabsList} from "@/utils/disposition/tabsList";
+import * as PurchasereceiptRecordDetailApi from "@/api/wms/purchasereceiptRecordDetail";
 defineOptions({ name: 'Workstation' })
 
 const message = useMessage() // 消息弹窗
@@ -136,7 +147,6 @@ const buttonBaseClick = (val, item) => {
 const butttondata = [
   defaultButtons.mainListEditBtn({hasPermi:'wms:workstation:update'}), // 编辑
   defaultButtons.mainListDeleteBtn({hasPermi:'wms:workstation:delete'}), // 删除
-  defaultButtons.mainListBindBtn({hasPermi:'wms:workstation:update'}), // 绑定
 ]
 
 // 列表-操作按钮事件
@@ -145,8 +155,6 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     await handleDelete(row.id)
-  }else if (val == 'bind') { // 绑定
-    openBindDetail(row,row.name,row.code)
   }
 }
 /** 添加/修改操作 */
@@ -179,16 +187,11 @@ const formsSuccess = async (formType,data) => {
   getList()
 }
 
-/** 详情操作 */
+/** 绑定操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkstation')
 }
-/** 绑定操作 */
-const bindDetailRef = ref()
-const openBindDetail = (row: any, titleName: any, titleValue: any) => {
-  bindDetailRef.value.openDetail(row, titleName, titleValue, 'basicWorkstation')
-}
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -248,5 +251,31 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await WorkstationApi.importTemplate()
 })
-
+// 子包装数据
+const teamRef = ref()
+const { tableObject: teamData, tableMethods: teamMethods } = useTable({
+  getListApi: WorkstationApi.getTeamPage
+})
+const { getList:teamList } = teamMethods
+const detailAllSchemas = ref(Team.allSchemas)
+const apiPage = ref(WorkstationApi.getTeamPage)
+const tabeKey = ref("workstationDetail");
+// tabs 切换事件
+const changeTabs = (data) =>{
+  if(data.prop == 'Team'){
+    console.log(data)
+    apiPage.value = WorkstationApi.getTeamPage
+    detailAllSchemas.value = Team.allSchemas
+  }else if(data.prop == 'Equipment'){
+    apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+  }else if(data.prop == 'Process'){
+    apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+  }else if(data.prop == 'Production'){
+    apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+  }
+  tabeKey.value = data.prop
+}
 </script>
diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts
index b4e7b8f1a..9fdb28f31 100644
--- a/src/views/mes/workstation/workstation.data.ts
+++ b/src/views/mes/workstation/workstation.data.ts
@@ -104,3 +104,19 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     }
   }
 ]))
+export const Team = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  }
+]))

From 65ee27e41e91896332b145e3a5fe38392b255673 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Wed, 20 Mar 2024 17:19:04 +0800
Subject: [PATCH 12/65] =?UTF-8?q?1=E3=80=81=E7=BB=91=E5=AE=9A=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/workstation/index.ts              | 27 +++++++++++
 src/views/mes/workstation/index.vue           |  7 +--
 src/views/mes/workstation/workstation.data.ts | 48 +++++++++++++++++++
 3 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts
index d426cd3f4..cc75e6142 100644
--- a/src/api/mes/workstation/index.ts
+++ b/src/api/mes/workstation/index.ts
@@ -57,3 +57,30 @@ export const getTeamPage = async (params) => {
     return await request.get({ url: `/wms/team/page`, params })
   }
 }
+export const getEquipmentPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/equipment/senior', data })
+  } else {
+    return await request.get({ url: `/mes/equipment/page`, params })
+  }
+}
+export const getProcessPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/process/senior', data })
+  } else {
+    return await request.get({ url: `/wms/process/page`, params })
+  }
+}
+export const getProductionPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/production/senior', data })
+  } else {
+    return await request.get({ url: `/wms/production/page`, params })
+  }
+}
diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue
index f734dd0ab..0f84fe596 100644
--- a/src/views/mes/workstation/index.vue
+++ b/src/views/mes/workstation/index.vue
@@ -78,6 +78,7 @@ import {
 } from "@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data";
 import {PurchasereceiptRequestTabsList} from "@/utils/disposition/tabsList";
 import * as PurchasereceiptRecordDetailApi from "@/api/wms/purchasereceiptRecordDetail";
+import {getEquipmentPage, getProcessPage, getProductionPage} from "@/api/mes/workstation";
 defineOptions({ name: 'Workstation' })
 
 const message = useMessage() // 消息弹窗
@@ -267,13 +268,13 @@ const changeTabs = (data) =>{
     apiPage.value = WorkstationApi.getTeamPage
     detailAllSchemas.value = Team.allSchemas
   }else if(data.prop == 'Equipment'){
-    apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage
+    apiPage.value = WorkstationApi.getEquipmentPage
     detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
   }else if(data.prop == 'Process'){
-    apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage
+    apiPage.value = WorkstationApi.getProcessPage
     detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
   }else if(data.prop == 'Production'){
-    apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage
+    apiPage.value = WorkstationApi.getProductionPage
     detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
   }
   tabeKey.value = data.prop
diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts
index 9fdb28f31..fc98d70f5 100644
--- a/src/views/mes/workstation/workstation.data.ts
+++ b/src/views/mes/workstation/workstation.data.ts
@@ -120,3 +120,51 @@ export const Team = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   }
 ]))
+export const Equipment = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  }
+]))
+export const Process = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  }
+]))
+export const Production = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  }
+]))

From ed6f45c1d2264b0c41d865f3c9665f8c81bf2709 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Wed, 20 Mar 2024 17:26:47 +0800
Subject: [PATCH 13/65] =?UTF-8?q?1=E3=80=81=E7=BB=91=E5=AE=9A=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/workstation/workstation.data.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts
index fc98d70f5..baf468591 100644
--- a/src/views/mes/workstation/workstation.data.ts
+++ b/src/views/mes/workstation/workstation.data.ts
@@ -6,7 +6,7 @@ export const WorkstationRules = reactive({
   code: [required]
 })
 export const TabsList = [{
-  label: "工组",
+  label: "班组",
   prop: 'Team',
 },
   {

From 0076db342be986957d94666bb7adb89e95760f2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Wed, 20 Mar 2024 17:54:41 +0800
Subject: [PATCH 14/65] =?UTF-8?q?dialog=20=E9=81=AE=E7=BD=A9=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue |  4 ++-
 src/components/Dialog/src/Dialog.vue       | 31 +++++++++++++++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 4c96ef8e5..70695a55e 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -4,8 +4,9 @@
     v-model="dialogVisible"
     :width="dialogWidth"
     :close-on-click-modal="false"
-    v-loading="formLoading"
+    :vLoading="formLoading"
   >
+  
   <div 
     style="max-height: 60vh;overflow-y: auto;">
     <Form
@@ -106,6 +107,7 @@
     <template #footer>
       <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
     </template>
+  
   </Dialog>
   <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
 </template>
diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue
index a1eb550c8..69aba1b11 100644
--- a/src/components/Dialog/src/Dialog.vue
+++ b/src/components/Dialog/src/Dialog.vue
@@ -11,7 +11,8 @@ const props = defineProps({
   fullscreen: propTypes.bool.def(true),
   width: propTypes.oneOfType([String, Number]).def('40%'),
   scroll: propTypes.bool.def(false), // 是否开启滚动条。如果是的话，按照 maxHeight 设置最大高度
-  maxHeight: propTypes.oneOfType([String, Number]).def('400px')
+  maxHeight: propTypes.oneOfType([String, Number]).def('400px'),
+  vLoading:propTypes.bool.def(false)
 })
 
 const getBindValue = computed(() => {
@@ -50,11 +51,38 @@ watch(
   }
 )
 
+const demo = ref()
+watch(
+  () => props.vLoading,
+  async (val: boolean) => {
+    await nextTick()
+    if (val) {
+      initDialog()
+    } else {
+      demo.close()
+    }
+  },
+  {
+    immediate: true
+  }
+)
+
 const dialogStyle = computed(() => {
   return {
     height: unref(dialogHeight)
   }
 })
+
+
+const initDialog = () => {
+  // 用服务生成一个el-loading实例，包括了自定义svg的指令如何在服务中使用
+  demo.value = ElLoading.service({ target: '.loading', text: '加载中...', background: 'rgba(246, 246, 246, 0.8)' })
+  // setTimeout(() => {
+  //   // 延时执行关闭，对应dom清除，如要再使用loading，需重新生成新实例
+  //   demo.close()
+  // }, 5000)
+}
+
 </script>
 
 <template>
@@ -68,6 +96,7 @@ const dialogStyle = computed(() => {
     draggable
     class="com-dialog"
     :show-close="false"
+    custom-class="loading"
   >
     <template #header="{ close }">
       <div class="relative h-54px flex items-center justify-between pl-15px pr-15px">

From 59784804ee3282dc4e9d473bbca677bc451a5a16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Wed, 20 Mar 2024 18:00:09 +0800
Subject: [PATCH 15/65] =?UTF-8?q?dialog=20=E9=81=AE=E7=BD=A9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialog/src/Dialog.vue | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue
index 69aba1b11..a7d75553a 100644
--- a/src/components/Dialog/src/Dialog.vue
+++ b/src/components/Dialog/src/Dialog.vue
@@ -51,7 +51,7 @@ watch(
   }
 )
 
-const demo = ref()
+let demo = null
 watch(
   () => props.vLoading,
   async (val: boolean) => {
@@ -59,7 +59,7 @@ watch(
     if (val) {
       initDialog()
     } else {
-      demo.close()
+      if (demo !== null) demo.close()
     }
   },
   {
@@ -76,11 +76,7 @@ const dialogStyle = computed(() => {
 
 const initDialog = () => {
   // 用服务生成一个el-loading实例，包括了自定义svg的指令如何在服务中使用
-  demo.value = ElLoading.service({ target: '.loading', text: '加载中...', background: 'rgba(246, 246, 246, 0.8)' })
-  // setTimeout(() => {
-  //   // 延时执行关闭，对应dom清除，如要再使用loading，需重新生成新实例
-  //   demo.close()
-  // }, 5000)
+  demo = ElLoading.service({ target: '.loading', text: '加载中...', background: 'rgba(246, 246, 246, 0.8)' })
 }
 
 </script>

From 70fd83bcd28f8ff0b81527dca616cf466553cfac Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 20 Mar 2024 18:03:17 +0800
Subject: [PATCH 16/65] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E9=81=AE=E7=BD=A9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchasePlanMain/index.vue                   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 8d4556556..74d52a09b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -462,6 +462,7 @@
       })
     }
     if(flag){
+      formRef.value.formLoading = false
       return;
     }
     if (data.subList.length == tableData.value.length) {

From 6391f7879218391c3f5119b312ee7b5fcf5f9981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Wed, 20 Mar 2024 18:49:48 +0800
Subject: [PATCH 17/65] =?UTF-8?q?=E8=A1=A5=E6=96=99=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repleinshJobMain/repleinshJobMain.data.ts | 304 +++++++++---------
 1 file changed, 155 insertions(+), 149 deletions(-)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
index 19db4a15a..3d305e1a0 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
@@ -25,8 +25,12 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -100,46 +104,6 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '最后更新者',
-    field: 'update',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '优先级',
     field: 'priority',
@@ -149,7 +113,8 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    isTable:false
   },
   {
     label: '优先级增量',
@@ -160,71 +125,42 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
-    }
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
     },
+    isTable:false
   },
   {
-    label: '承接人用户名',
-    field: 'acceptUserId',
+    label: '业务类型',
+    field: 'businessType',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '承接时间',
-    field: 'acceptTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
+      width: 150
     },
   },
   {
-    label: '完成人用户名',
-    field: 'completeUserId',
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false
   },
   {
-    label: '完成时间',
-    field: 'completeTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
     sort: 'custom',
     table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
+      width: 150
     },
+    isTable: false
   },
   {
     label: '从库区类型范围',
@@ -232,7 +168,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -243,59 +179,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -308,6 +192,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '到库区代码范围',
@@ -316,13 +201,14 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '自动完成',
     field: 'autoComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -341,7 +227,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -360,7 +246,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -379,7 +265,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowBiggerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -398,7 +284,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowSmallerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -417,7 +303,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyInventoryStatus',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -436,7 +322,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowContinuousScanning',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -455,7 +341,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowPartialComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -474,7 +360,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyBatch',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -493,7 +379,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyPackingNumber',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -507,6 +393,126 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人用户名',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人用户名',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'update',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
   // {
   //   label: '操作',
   //   field: 'action',

From 83c639fac06ae34c8941ce9920b4c8f9194cdcdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Wed, 20 Mar 2024 19:49:17 +0800
Subject: [PATCH 18/65] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceipt/productreceiptRequestMain/index.vue     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 97ae909a5..7c91ed6ed 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -579,6 +579,9 @@ const searchFormClick = (searchData) => {
 const submitFormLabel = async (formType, data) => {
   try {
     detatableData.tableList.forEach(async (item) => {
+      // 创建标签 要物料库区配置表中 入库包装规格
+      item.packUnit = null
+      item.inOfOut = 'in'
       await PackageApi.createPackageLabel(item).then(res => {
         isCreateLabel.value = true
         message.success('创建标签成功')
@@ -643,10 +646,10 @@ const handlePoint = async (row) => {
   // 判断是采购还是制造
   if (isCreateLabel.value) {
     if (labelType.value == 'cg') {
-      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
       window.open(src.value+'&request_number='+row.number)
     } else {
-      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
       window.open(src.value+'&request_number='+row.number)
     }
   } else {

From d2c5466aee53410d1ffd370397cfab5384055772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Wed, 20 Mar 2024 19:49:29 +0800
Subject: [PATCH 19/65] =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC=20?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=94=B9=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerManage/customeritem/customeritem.data.ts   |  4 ++--
 .../manufacturePackage/manufacturePackage.data.ts      |  4 ++--
 .../purchasePackage/purchasePackage.data.ts            |  4 ++--
 .../deliverplan/saleMain/saleMain.data.ts              |  4 ++--
 src/views/wms/inventoryManage/package/package.data.ts  | 10 +++++-----
 .../inventoryinitRecordMain.data.ts                    |  4 ++--
 .../inventoryinitRequestMain.data.ts                   |  4 ++--
 .../productdismantleJobMain.data.ts                    |  4 ++--
 .../productdismantleRequestMain.data.ts                |  4 ++--
 .../productreceiptJobMain.data.ts                      |  4 ++--
 .../productreceiptRecordMain.data.ts                   |  4 ++--
 .../productreceiptRequestMain.data.ts                  |  4 ++--
 .../supplierdeliver/purchaseMain/purchaseMain.data.ts  |  4 ++--
 .../supplierPackage/supplierPackage.data.ts            | 10 +++++-----
 14 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
index 21b99adbc..9fb22e6ec 100644
--- a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
@@ -109,8 +109,8 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '客户包装单位',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
index 83827af3a..0e2e2c11e 100644
--- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
@@ -343,8 +343,8 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     label: '包装规格',
     field: 'packUnit',
     sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     table: {
       width: 150,
     },
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
index 0a3b05e3a..b841eb41f 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
@@ -352,8 +352,8 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     label: '包装规格',
     field: 'packUnit',
     sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     table: {
       width: 150,
     },
diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
index af229740a..3e52a8b61 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
@@ -357,8 +357,8 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryManage/package/package.data.ts b/src/views/wms/inventoryManage/package/package.data.ts
index 8c17ada82..b48aba3c8 100644
--- a/src/views/wms/inventoryManage/package/package.data.ts
+++ b/src/views/wms/inventoryManage/package/package.data.ts
@@ -207,11 +207,11 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     label: '包装规格',
     field: 'packUnit',
     sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
-      component: 'SelectV2'
-    },
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    // form: {
+    //   component: 'SelectV2'
+    // },
     table: {
       width: 150,
     },
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts
index 85ce87c2a..e7efd47fb 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts
@@ -369,8 +369,8 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
index 1b69b58fa..34d919c7c 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@@ -529,8 +529,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts
index abb006371..2cdff47aa 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts
@@ -697,8 +697,8 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index 8dd8e6cc5..427ef8e02 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -779,8 +779,8 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
index 75fb6eb02..fe47f40c5 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
@@ -729,8 +729,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
index 58cb84811..cbea20d07 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
@@ -498,8 +498,8 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 528f14956..fe14b5697 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -675,8 +675,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index 2bb831a34..91536f1c1 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -513,8 +513,8 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
     isTable: true,
     table: {
       width: 150
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts
index 2db26ae20..4e83aa894 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts
@@ -211,11 +211,11 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     label: '包装规格',
     field: 'packUnit',
     sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
-      component: 'SelectV2'
-    },
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    // form: {
+    //   component: 'SelectV2'
+    // },
     table: {
       width: 150,
     },

From eb3e519ac245292bae6b96cdd7bc841c84a58de4 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 20 Mar 2024 19:53:53 +0800
Subject: [PATCH 20/65] =?UTF-8?q?=E6=B3=A8=E9=87=8A=20=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AE=B0=E5=BD=95=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countRequestMain/countRequestMain.data.ts | 40 +++++++++----------
 .../countadjustRequestMain.data.ts            | 40 +++++++++----------
 .../customerreceiptRequestMain.data.ts        | 40 +++++++++----------
 .../customerreturnRequestMain.data.ts         | 40 +++++++++----------
 .../customersettleRequestMain.data.ts         | 40 +++++++++----------
 .../deliverRequestMain.data.ts                | 40 +++++++++----------
 .../inventoryinitRequestMain.data.ts          | 40 +++++++++----------
 .../packageoverRequestMain.data.ts            | 40 +++++++++----------
 .../scrapRequestMain/scrapRequestMain.data.ts | 40 +++++++++----------
 .../transferissueRequestMain.data.ts          | 40 +++++++++----------
 .../transferreceiptRequestMain.data.ts        | 40 +++++++++----------
 11 files changed, 220 insertions(+), 220 deletions(-)

diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
index 201dcc6dc..7bfa3a0d2 100644
--- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
+++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
@@ -263,26 +263,26 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    },
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index 5844be0b9..42308b97e 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -249,26 +249,26 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    },
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
index 003c57b0e..515f1011a 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
@@ -314,26 +314,26 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index 99cc9edeb..b24a7391f 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -431,26 +431,26 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
index 033784997..57fd1d15b 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
@@ -260,26 +260,26 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index acf947fee..cd3e5fc2f 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -418,26 +418,26 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
index 1b69b58fa..4245674bf 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@@ -233,26 +233,26 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '备注',
     field: 'remark',
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 9d89efee6..eaba5263d 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
@@ -302,26 +302,26 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 7246c6242..c5cba29f8 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -262,26 +262,26 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disable: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disable: true
+  //     }
+  //   }
+  // },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
index d078cc6ab..3b715f341 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -390,26 +390,26 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
index 4b3a27e5b..faf50ed0a 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
@@ -288,26 +288,26 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '创建时间',
     field: 'createTime',

From 8fe6322e7928975cfd5f820f7f7a180227ff06b0 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 20 Mar 2024 20:01:17 +0800
Subject: [PATCH 21/65] =?UTF-8?q?=E6=B3=A8=E9=87=8A=20=20=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E7=94=9F=E6=88=90=E8=AE=B0=E5=BD=95=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unplannedissueRequestMain.data.ts         | 40 +++++++++----------
 .../unplannedreceiptRequestMain.data.ts       | 40 +++++++++----------
 .../issueRequestMain/issueRequestMain.data.ts | 40 +++++++++----------
 .../onlinesettlementRequestMain.data.ts       | 40 +++++++++----------
 .../pickRequestMain/pickRequestMain.data.ts   | 40 +++++++++----------
 .../productionreturnRequestMain.data.ts       | 40 +++++++++----------
 .../repleinshRequestMain.data.ts              | 40 +++++++++----------
 .../inventorychangeRequestMain.data.ts        | 40 +++++++++----------
 .../inventorymoveRequestMain.data.ts          | 40 +++++++++----------
 .../offlinesettlementRequestMain.data.ts      | 40 +++++++++----------
 .../productdismantleRequestMain.data.ts       | 40 +++++++++----------
 .../productputawayRequestMain.data.ts         | 40 +++++++++----------
 .../productreceiptRequestMain.data.ts         | 40 +++++++++----------
 .../productrepairRequestMain.data.ts          | 40 +++++++++----------
 .../productscrapRequestMain.data.ts           | 40 +++++++++----------
 .../inspectRequestMain.data.ts                | 40 +++++++++----------
 .../purchasereceiptRequestMain.data.ts        | 40 +++++++++----------
 .../purchasereturnRequestMain.data.ts         | 40 +++++++++----------
 .../putawayRequestMain.data.ts                | 40 +++++++++----------
 .../sparereceiptRequestMain.data.ts           | 40 +++++++++----------
 .../supplierdeliverRequestMain.data.ts        | 40 +++++++++----------
 .../purchaseclaimRequestMain.data.ts          | 40 +++++++++----------
 22 files changed, 440 insertions(+), 440 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
index e12e112c3..461f78535 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@@ -230,26 +230,26 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index 902bad166..cef5aef6e 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -270,26 +270,26 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index d0c63ed67..68e20f58d 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -346,26 +346,26 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
index 06de51f55..ff38a7753 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
@@ -286,26 +286,26 @@ export const OnlinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
index ca6888846..4e54d9cf0 100644
--- a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
+++ b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
@@ -317,26 +317,26 @@ export const PickRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index 952bb2142..758234cd3 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -305,26 +305,26 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true,
+  //     }
+  //   }
+  // },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index 1d8f06239..ec3e1b9f5 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -294,26 +294,26 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
index 345f37a76..ab80dd53e 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
@@ -215,26 +215,26 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index 2e4996055..401c0d175 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -303,26 +303,26 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '使用在途库',
     field: 'useOnTheWayLocation',
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
index ae32ed00d..3fb298350 100644
--- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
@@ -271,26 +271,26 @@ export const OfflinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index 427ef8e02..7a87392e6 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -394,26 +394,26 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
index 23af73565..8490c6406 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
@@ -339,26 +339,26 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index fe14b5697..577c5d964 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -404,26 +404,26 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index fe3434f49..2bc1e6b1b 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -394,26 +394,26 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index b40f61bb4..91929fcaf 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -397,26 +397,26 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
index 1075e5de4..17c905852 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
@@ -433,26 +433,26 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 5f4fc56ce..529bef44b 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -425,26 +425,26 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true,
+  //     }
+  //   }
+  // },
   {
     label: '标签状态',
     field: 'labelStatus',
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index e5741f422..3266eff03 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -405,26 +405,26 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index e88e41646..fcdb38ced 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -393,26 +393,26 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
index 3f212e558..8cadff24c 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -426,26 +426,26 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true,
+  //     }
+  //   }
+  // },
   {
     label: '标签状态',
     field: 'labelStatus',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index a858281dd..17752d791 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -454,26 +454,26 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true,
+  //     }
+  //   }
+  // },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
index 091e6f024..37bb36bc7 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
@@ -244,26 +244,26 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isSearch: false,
-    isTable: true,
-    table: {
-      width: 120
-    },
-    form:{
-      component:'Switch',
-      value:requestsettingData.available,
-      componentProps:{
-        disabled:true,
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    }
-  },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isSearch: false,
+  //   isTable: true,
+  //   table: {
+  //     width: 120
+  //   },
+  //   form:{
+  //     component:'Switch',
+  //     value:requestsettingData.available,
+  //     componentProps:{
+  //       disabled:true,
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE'
+  //     }
+  //   }
+  // },
   {
     label: '创建者',
     field: 'creator',

From 29692de19ef41e0f925922355575fdb7f75bb3dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Thu, 21 Mar 2024 08:48:47 +0800
Subject: [PATCH 22/65] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=AD=90=E5=AD=90=E8=A1=A8api=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/backflushRequestDetailb/index.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/api/wms/backflushRequestDetailb/index.ts b/src/api/wms/backflushRequestDetailb/index.ts
index 9e4d26df0..7e67a0989 100644
--- a/src/api/wms/backflushRequestDetailb/index.ts
+++ b/src/api/wms/backflushRequestDetailb/index.ts
@@ -23,38 +23,38 @@ export const getBackflushRequestDetailbPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/backflush-request-detailb/senior', data })
+    return await request.post({ url: '/wms/productreceipt-request-detailb/senior', data })
   } else {
-    return await request.get({ url: `/wms/backflush-request-detailb/page`, params })
+    return await request.get({ url: `/wms/productreceipt-request-detailb/page`, params })
   }
 }
 
 // 查询制品收货申请子详情
 export const getBackflushRequestDetailb = async (id: number) => {
-  return await request.get({ url: `/wms/backflush-request-detailb/get?id=` + id })
+  return await request.get({ url: `/wms/productreceipt-request-detailb/get?id=` + id })
 }
 
 // 新增制品收货申请子
 export const createBackflushRequestDetailb = async (data: BackflushRequestDetailbVO) => {
-  return await request.post({ url: `/wms/backflush-request-detailb/create`, data })
+  return await request.post({ url: `/wms/productreceipt-request-detailb/create`, data })
 }
 
 // 修改制品收货申请子
 export const updateBackflushRequestDetailb = async (data: BackflushRequestDetailbVO) => {
-  return await request.put({ url: `/wms/backflush-request-detailb/update`, data })
+  return await request.put({ url: `/wms/productreceipt-request-detailb/update`, data })
 }
 
 // 删除制品收货申请子
 export const deleteBackflushRequestDetailb = async (id: number) => {
-  return await request.delete({ url: `/wms/backflush-request-detailb/delete?id=` + id })
+  return await request.delete({ url: `/wms/productreceipt-request-detailb/delete?id=` + id })
 }
 
 // 导出制品收货申请子 Excel
 export const exportBackflushRequestDetailb = async (params) => {
-  return await request.download({ url: `/wms/backflush-request-detailb/export-excel`, params })
+  return await request.download({ url: `/wms/productreceipt-request-detailb/export-excel`, params })
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/wms/backflush-request-detailb/get-import-template' })
+  return request.download({ url: '/wms/productreceipt-request-detailb/get-import-template' })
 }
\ No newline at end of file

From 9f50d9b00f7787570717e8f7551577d1be8e1da7 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 21 Mar 2024 09:46:19 +0800
Subject: [PATCH 23/65] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockupMainJob/stockupMainJob.data.ts     | 202 ++++++++++---
 .../stockupMainRecord.data.ts                 | 284 +++++++++---------
 .../stockupMainRequest.data.ts                |   8 +-
 3 files changed, 314 insertions(+), 180 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
index c8aca1d29..9bb38ab9e 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
@@ -12,42 +12,58 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isForm: false,
+    table: {
+      width: 180
+    },
   },
   {
     label: '申请单号',
     field: 'requestNumber',
     sort: 'custom',
     isForm: false,
+    table: {
+      width: 180
+    },
   },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',
     sort: 'custom',
     isForm: false,
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
     sort: 'custom',
     isForm: false,
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '状态',
     field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
-
-    form: {
-      component: 'Radio'
+    table: {
+      width: 150
     },
+    isForm: false,
   },
   {
     label: '申请时间',
     field: 'requestTime',
     sort: 'custom',
     formatter: dateFormatter,
-
+    table: {
+      width: 180
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -69,6 +85,9 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestDueTime',
     sort: 'custom',
     formatter: dateFormatter,
+    table: {
+      width: 180
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -91,7 +110,9 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'expiredTime',
     sort: 'custom',
     formatter: dateFormatter,
-
+    table: {
+      width: 180
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -112,20 +133,23 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
-
   },
   {
     label: '承接人用户名',
     field: 'acceptUserName',
     sort: 'custom',
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '承接时间',
     field: 'acceptTime',
     sort: 'custom',
     formatter: dateFormatter,
-
+    table: {
+      width: 180
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -146,12 +170,18 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     label: '完成人用户名',
     field: 'completeUserName',
     sort: 'custom',
+    table: {
+      width: 150
+    },
   },
   {
     label: '完成时间',
     field: 'completeTime',
     sort: 'custom',
     formatter: dateFormatter,
+    table: {
+      width: 180
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -171,12 +201,26 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
   },
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
   },
   {
     label: '业务类型',
@@ -185,48 +229,62 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
                 form: {
                   component: 'SelectV2'
                 },
+                table: {
+                  width: 120
+                },
   },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
-
   },
   {
     label: '自动完成',
     field: 'autoComplete',
     sort: 'custom',
-
+    table: {
+      width: 120
+    },
   },
   {
     label: '允许修改库位',
     field: 'allowModifyLocation',
     sort: 'custom',
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '允许修改数量',
     field: 'allowModifyQty',
     sort: 'custom',
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '允许大于推荐数量',
     field: 'allowBiggerQty',
     sort: 'custom',
-
+    table: {
+      width: 180
+    },
   },
   {
     label: '允许小于推荐数量',
     field: 'allowSmallerQty',
     sort: 'custom',
-
+    table: {
+      width: 180
+    },
   },
   {
     label: '允许修改库存状态',
     field: 'allowModifyInventoryStatus',
     sort: 'custom',
-
+    table: {
+      width: 180
+    },
     form: {
       component: 'Radio'
     },
@@ -235,66 +293,82 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     label: '允许连续扫描',
     field: 'allowContinuousScanning',
     sort: 'custom',
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '允许部分完成',
     field: 'allowPartialComplete',
     sort: 'custom',
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '允许修改批次',
     field: 'allowModifyBatch',
     sort: 'custom',
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '允许修改箱码',
     field: 'allowModifyPackingNumber',
     sort: 'custom',
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '从库区代码范围',
     field: 'fromAreaCodes',
     sort: 'custom',
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '到库区代码范围',
     field: 'toAreaCodes',
     sort: 'custom',
-
-  },
-  {
-    label: '工作流流水号',
-    field: 'serialNumber',
-    sort: 'custom',
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '入库库存状态范围',
     field: 'inInventoryStatuses',
     sort: 'custom',
-
+    table: {
+      width: 180
+    },
   },
   {
     label: '出库库存状态范围',
     field: 'outInventoryStatuses',
     sort: 'custom',
+    table: {
+      width: 180
+    },
   },
   {
     label: '创建者',
     field: 'creator',
     sort: 'custom',
+    table: {
+      width: 120
+    },
   },
   {
     label: '创建时间',
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-
+    table: {
+      width: 180
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -326,18 +400,27 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '包装号',
     field: 'packingNumber',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '批次',
     field: 'batch',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '库存状态',
@@ -347,60 +430,90 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'Radio'
     },
+    table: {
+      width: 120
+    },
   },
   {
     label: '货主代码',
     field: 'ownerCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 120
+    },
   },
   {
     label: '器具号',
     field: 'containerNumber',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 120
+    },
   },
   {
     label: '从库位代码',
     field: 'fromLocationCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 120
+    },
   },
   {
     label: '到库位代码',
     field: 'toLocationCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 120
+    },
   },
   {
     label: '物品代码',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '物品名称',
     field: 'itemName',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '物品描述1',
     field: 'itemDesc1',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 120
+    },
   },
   {
     label: '物品描述2',
     field: 'itemDesc2',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 120
+    },
   },
   {
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 120
+    },
   },
   {
     label: '数量',
@@ -411,18 +524,22 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '计量单位',
     field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '主表ID',
-    field: 'masterId',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
     },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
     label: '备注',
@@ -444,6 +561,9 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    table: {
+      width: 180
+    },
     isForm: false,
   },
   {
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
index 81b6e81b3..87ea3475c 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
@@ -54,17 +54,64 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '出库事务类型',
     field: 'outTransactionType',
     sort: 'custom',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '入库事务类型',
     field: 'inTransactionType',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    isForm: false,
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
   },
   {
     label: '执行时间',
@@ -152,23 +199,22 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
+    label: '创建时间',
+    field: 'createTime',
     sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
       componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
-    }
+    },
+    table: {
+      width: 180
+    },
+    isForm: false,
   },
   {
     label: '部门',
@@ -198,64 +244,32 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 100
-    },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    table: {
-      width: 180
-    },
-    isForm: false,
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
-    dictClass: 'string',
-    isTable: true,
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
-      width: 180
+      width: 100
     },
   },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-  },
   {
     label: '操作',
     field: 'action',
@@ -299,26 +313,6 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 150
-    },
-  },
   {
     label: '从器具号',
     field: 'fromContainerNumber',
@@ -329,8 +323,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '物品代码',
+    field: 'itemCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -338,8 +332,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位组代码',
-    field: 'fromLocationGroupCode',
+    label: '物品名称',
+    field: 'itemName',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -347,8 +341,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库区代码',
-    field: 'fromAreaCode',
+    label: '物品描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -356,8 +350,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到货主代码',
-    field: 'toOwnerCode',
+    label: '物品描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -365,8 +359,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到器具号',
-    field: 'toContainerNumber',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -374,8 +368,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位代码',
-    field: 'toLocationCode',
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -383,26 +377,30 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位组代码',
-    field: 'toLocationGroupCode',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 150
     },
   },
   {
-    label: '到库区代码',
-    field: 'toAreaCode',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 150
     },
   },
   {
-    label: '单价',
-    field: 'singlePrice',
+    label: '从货主代码',
+    field: 'fromOwnerCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -410,8 +408,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '金额',
-    field: 'amount',
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -419,8 +417,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -428,27 +426,17 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '创建时间',
-    field: 'createTime',
+    label: '从库区代码',
+    field: 'fromAreaCode',
     sort: 'custom',
-    formatter: dateFormatter,
     isSearch: true,
     table: {
-      width: 180
-    },
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
+      width: 150
     },
-    isForm: false,
   },
   {
-    label: '物品代码',
-    field: 'itemCode',
+    label: '到货主代码',
+    field: 'toOwnerCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -456,8 +444,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品名称',
-    field: 'itemName',
+    label: '到器具号',
+    field: 'toContainerNumber',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -465,8 +453,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品描述1',
-    field: 'itemDesc1',
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -474,8 +462,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品描述2',
-    field: 'itemDesc2',
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -483,8 +471,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '到库区代码',
+    field: 'toAreaCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -492,8 +480,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '单价',
+    field: 'singlePrice',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -501,12 +489,10 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
+    label: '金额',
+    field: 'amount',
     sort: 'custom',
+    isSearch: true,
     table: {
       width: 150
     },
@@ -542,6 +528,34 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    table: {
+      width: 180
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index d0241eb88..6f2281d3b 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -389,7 +389,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: false,
     table: {
-      width: 120
+      width: 150
     },
     isForm: false
   },
@@ -472,7 +472,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isTableForm: false,
     table: {
-      width: 100
+      width: 180
     },
   },
   // {
@@ -567,7 +567,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 120
+      width: 150
     },
     tableForm: {
       disabled: true
@@ -585,7 +585,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isTableForm: false,
     table: {
-      width: 120
+      width: 150
     },
   },
   {

From c7be9e729d72547b76fb2206f1edba509b4c3d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Thu, 21 Mar 2024 12:05:16 +0800
Subject: [PATCH 24/65] =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SearchTable/src/SearchTable.vue           | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index 299c1070b..011ff68f4 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -98,27 +98,37 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
 
 // 筛选提交
 const searchFormClick = (searchData) => {
-  // console.log(99, rowRef.value)
-  // console.log(100, searchData)
-  // console.log(101, searchConditionRef.value)
+  console.log(99, rowRef.value)
+  console.log(100, searchData)
+  console.log(101, searchConditionRef.value)
   // 20240104 修改 判断 当前弹窗 是否有条件 如果有条件 需拼接到 筛选中 searchData.filters 
-  if (searchConditionRef.value) {
-    Object.keys(searchConditionRef.value).forEach(key => {
-      if (searchData.filters) {
-          searchData.filters.push({
-            action: "==",
-            column: key,
-            value: searchConditionRef.value[key]
-          })
-        // }
-      } else {
+  // 20240321 修改 判断 searchData 是否有条件 如果有 拼接
+  if (searchData.filters) {
+    if (searchConditionRef.value.filters) {
+      Object.keys(searchConditionRef.value.filters).forEach(key => {
+        searchData.filters.push(searchConditionRef.value.filters[key])
+      });
+    } else {
+      Object.keys(searchConditionRef.value).forEach(key => {
+        searchData.filters.push({
+          action: "==",
+          column: key,
+          value: searchConditionRef.value[key]
+        })
+      });
+    }
+  } else {
+    if (searchConditionRef.value.filters) {
+      searchData.filters = searchConditionRef.value.filters
+    } else {
+      Object.keys(searchConditionRef.value).forEach(key => {
         searchData.filters = [{
           action: "==",
           column: key,
           value: searchConditionRef.value[key]
         }]
-      }
-    });
+      });
+    }
   }
   tableObjectRef.value.params = {
     isSearch: true,

From c0431773d59e5ec7c3d7ac37164e68a0d290454c Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 21 Mar 2024 13:00:48 +0800
Subject: [PATCH 25/65] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8E=E5=BA=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../businesstype/businesstype.data.ts                | 12 ++++++------
 .../factoryModeling/workstation/index.vue            |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
index c50ffcadc..71710f119 100644
--- a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
+++ b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
@@ -361,12 +361,12 @@ export const BusinesstypeRules = reactive({
   itemStatuses: [
     { required: true, message: '请选择可用物料状态范围', trigger: 'change' }
   ],
-  outTransactionType: [
-    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
-  ],
-  inTransactionType: [
-    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
-  ],
+  // outTransactionType: [
+  //   { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  // ],
+  // inTransactionType: [
+  //   { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  // ],
   useOnTheWay: [
     { required: true, message: '请输入使用在途库', trigger: 'blur' }
   ],
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
index 7002ebef5..96151f4ec 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
@@ -212,7 +212,7 @@ Workstation.allSchemas.tableFormColumns.map(item => {
       item.form.componentProps.searchCondition = [
       {
         key: 'areaType',
-        value: 'RAW',
+        value: 'WIP',
       },
       {
           key: 'available',
@@ -224,7 +224,7 @@ Workstation.allSchemas.tableFormColumns.map(item => {
       item.form.componentProps.searchCondition = [
       {
         key: 'areaType',
-        value: 'FG',
+        value: 'WIP',
       },
       {
           key: 'available',

From 12dd83dd16123e5036a1e3312435a3b46dffe9c0 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 21 Mar 2024 14:02:58 +0800
Subject: [PATCH 26/65] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customeritem/customeritem.data.ts              |  4 ++--
 .../itemManage/packageunit/packageunit.data.ts     | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
index 9fb22e6ec..21b99adbc 100644
--- a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
@@ -109,8 +109,8 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '客户包装单位',
     field: 'packUnit',
-    // dictType: DICT_TYPE.PACK_UNIT,
-    // dictClass: 'string',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
index 6e3fd6394..879b6f278 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
@@ -2,7 +2,9 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import { fa } from 'element-plus/es/locale'
 import * as PackageunitApi from '@/api/wms/packageunit'
+import { Select } from '@element-plus/icons-vue/dist/types'
 
+//新增时针对父包装代码copy出的实体
 export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装代码',
@@ -81,6 +83,12 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
     label: '单位',
     field: 'unit',
     sort: 'custom',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string',
+    isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '是否可用',
@@ -363,6 +371,12 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     label: '单位',
     field: 'unit',
     sort: 'custom',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string',
+    isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '是否可用',

From adff006db0fa27f5505abcdbc189d1b26de10453 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 21 Mar 2024 14:28:29 +0800
Subject: [PATCH 27/65] =?UTF-8?q?bom=E9=80=89=E6=8B=A9=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrapRequestMain/index.vue         | 23 +++++++++++----
 .../productscrapRequestMain.data.ts           | 28 +++++++++++--------
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 4d69cba21..d7687ae8a 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -94,6 +94,7 @@
     <template #footer>
       <ButtonBase :Butttondata="ButttondataBom" @button-base-click="buttonBaseClickBom" />
     </template>
+    <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
   </Dialog>
 
   <!-- 导入 -->
@@ -104,14 +105,15 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import { ProductscrapRequestMain,ProductscrapRequestMainRules,ProductscrapRequestDetail,ProductscrapRequestDetailRules,ProdcutscrapBomDismantle } from './productscrapRequestMain.data'
+import { ProductscrapRequestMain,
+  ProductscrapRequestMainRules,
+  ProductscrapRequestDetail,
+  ProductscrapRequestDetailRules,
+  ProdcutscrapBomDismantle } from './productscrapRequestMain.data'
 import * as ProductscrapRequestMainApi from '@/api/wms/productscrapRequestMain'
 import * as ProductscrapRequestDetailApi from '@/api/wms/productscrapRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import * as BomDismantleApi from "@/api/wms/bomDismantle";
-import {getProductscrapBomDismantlePage} from "@/api/wms/bomDismantle";
-import * as dismantleRequestDetailbApi from "@/api/wms/dismantleRequestDetailb";
-import {updateProductscrapDetailRequestBom} from "@/api/wms/productscrapRequestMain";
+import * as BomDismantleApi from "@/api/wms/bomDismantle"
 
 // 制品报废申请
 defineOptions({ name: 'ProductscrapRequestMain' })
@@ -209,7 +211,18 @@ const buttonOperationClick = async (row, label, index)=> {
   detailQty.value = row.qty
   bomModelVisible.value = true
   await getDetailListBom()
+
   detatableDataBom.tableList.forEach(item => {
+    // ProdcutscrapBomDismantle.allSchemas.tableFormColumns.forEach((bomItem) => {
+    //   if (bomItem.field == 'batch') {
+    //     let condition = {
+    //       'key':'locationCode',
+    //       'value': row.fromLocationCode,
+    //       'isMainValue':'false'
+    //     }
+    //     bomItem.searchCondition.push(condition)
+    //   }
+    // })
     item.rowId = index
     if(tableData.value[index].childList.length > 0) {
       tableData.value[index].childList.forEach(itemChild => {
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 91929fcaf..e29ece33e 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -1047,6 +1047,22 @@ export const ProdcutscrapBomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 6
     }
   },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择批次',
+      searchField: 'batch',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePage,
+    }
+  },
   {
     label: 'Bom版本',
     field: 'bomVersion',
@@ -1098,17 +1114,7 @@ export const ProdcutscrapBomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
       disabled: true
     }
   },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      disabled: true
-    }
-  },
+  
   {
     label: '从库位代码',
     field: 'fromLocationCode',

From a5d566ef084659ed30f12ad205fc581ed6282912 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 21 Mar 2024 16:41:48 +0800
Subject: [PATCH 28/65] =?UTF-8?q?=E6=89=80=E6=9C=89=E7=94=B3=E8=AF=B7=20?=
 =?UTF-8?q?=20=E7=9B=B4=E6=8E=A5=E7=94=9F=E6=88=90=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E9=9A=90=E8=97=8FisTable=E8=AE=BE=E7=BD=AE=E4=B8=BAfalse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countRequestMain/countRequestMain.data.ts | 40 +++++++++----------
 .../packageoverRequestMain.data.ts            | 40 +++++++++----------
 .../scrapRequestMain/scrapRequestMain.data.ts | 40 +++++++++----------
 .../transferissueRequestMain.data.ts          | 40 +++++++++----------
 .../transferreceiptRequestMain.data.ts        | 40 +++++++++----------
 .../unplannedissueRequestMain.data.ts         | 40 +++++++++----------
 .../unplannedreceiptRequestMain.data.ts       | 40 +++++++++----------
 .../issueRequestMain/issueRequestMain.data.ts | 40 +++++++++----------
 .../onlinesettlementRequestMain.data.ts       | 40 +++++++++----------
 .../pickRequestMain/pickRequestMain.data.ts   | 40 +++++++++----------
 .../productionreturnRequestMain.data.ts       | 40 +++++++++----------
 .../inventorychangeRequestMain.data.ts        | 40 +++++++++----------
 .../inventorymoveRequestMain.data.ts          | 40 +++++++++----------
 .../offlinesettlementRequestMain.data.ts      | 40 +++++++++----------
 .../productdismantleRequestMain.data.ts       | 40 +++++++++----------
 .../productputawayRequestMain.data.ts         | 40 +++++++++----------
 .../productreceiptRequestMain.data.ts         | 40 +++++++++----------
 .../productrepairRequestMain.data.ts          | 40 +++++++++----------
 .../productscrapRequestMain.data.ts           | 40 +++++++++----------
 .../inspectRequestMain.data.ts                | 40 +++++++++----------
 .../purchasereceiptRequestMain.data.ts        | 40 +++++++++----------
 .../purchasereturnRequestMain.data.ts         | 40 +++++++++----------
 .../putawayRequestMain.data.ts                | 40 +++++++++----------
 .../sparereceiptRequestMain.data.ts           | 40 +++++++++----------
 .../supplierdeliverRequestMain.data.ts        | 40 +++++++++----------
 .../purchaseclaimRequestMain.data.ts          | 40 +++++++++----------
 .../supplierinvoiceRequestMain.data.ts        |  2 +-
 27 files changed, 521 insertions(+), 521 deletions(-)

diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
index 7bfa3a0d2..81f3fe3a7 100644
--- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
+++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
@@ -263,26 +263,26 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
       width: 150
     },
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   },
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '创建时间',
     field: 'createTime',
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 eaba5263d..4c8a5411a 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
@@ -302,26 +302,26 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index c5cba29f8..da1f498d4 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -262,26 +262,26 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disable: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disable: true
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
index 3b715f341..a0bfbb3d1 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -390,26 +390,26 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
index faf50ed0a..95a051c46 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
@@ -288,26 +288,26 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
index 461f78535..bb579b5f0 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@@ -230,26 +230,26 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index cef5aef6e..ae6a278b8 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -270,26 +270,26 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 68e20f58d..6da200a2f 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -346,26 +346,26 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
index ff38a7753..f35ade83e 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
@@ -286,26 +286,26 @@ export const OnlinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
index 4e54d9cf0..fa550e33d 100644
--- a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
+++ b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
@@ -317,26 +317,26 @@ export const PickRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index 758234cd3..cbe054bdc 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -305,26 +305,26 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true,
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
index ab80dd53e..25f1efbea 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
@@ -215,26 +215,26 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index 401c0d175..f1739c2ed 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -303,26 +303,26 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '使用在途库',
     field: 'useOnTheWayLocation',
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
index 3fb298350..498011f55 100644
--- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
@@ -271,26 +271,26 @@ export const OfflinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index 7a87392e6..204a4aae4 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -394,26 +394,26 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
index 8490c6406..17c7587e1 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
@@ -339,26 +339,26 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 577c5d964..617f9c7cb 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -404,26 +404,26 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index 2bc1e6b1b..cae44bc7a 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -394,26 +394,26 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index e29ece33e..0a4f795a0 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -397,26 +397,26 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
index 17c905852..cfee6ab70 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
@@ -433,26 +433,26 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 529bef44b..9c51ae59c 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -425,26 +425,26 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true,
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
   {
     label: '标签状态',
     field: 'labelStatus',
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 3266eff03..6cabf554e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -405,26 +405,26 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index fcdb38ced..0384bbea6 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -393,26 +393,26 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
index 8cadff24c..7f836ea17 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -426,26 +426,26 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true,
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
   {
     label: '标签状态',
     field: 'labelStatus',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 17752d791..d0005069a 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -454,26 +454,26 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true,
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
index 37bb36bc7..be1394183 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
@@ -244,26 +244,26 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isSearch: false,
-  //   isTable: true,
-  //   table: {
-  //     width: 120
-  //   },
-  //   form:{
-  //     component:'Switch',
-  //     value:requestsettingData.available,
-  //     componentProps:{
-  //       disabled:true,
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE'
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: false,
+    table: {
+      width: 120
+    },
+    form:{
+      component:'Switch',
+      value:requestsettingData.available,
+      componentProps:{
+        disabled:true,
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
   {
     label: '创建者',
     field: 'creator',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index adcfbaf70..625fed5e9 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -296,7 +296,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150

From 6cfce7e0086f1f2fe08fbb7bf8588cc6266b598f Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 21 Mar 2024 16:43:05 +0800
Subject: [PATCH 29/65] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8A=9F=E8=83=BD=20?=
 =?UTF-8?q?=20=E7=9B=B4=E6=8E=A5=E7=94=9F=E6=88=90=E8=AE=B0=E5=BD=95isTabl?=
 =?UTF-8?q?e=E8=AE=BE=E7=BD=AE=E4=B8=BAfalse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countadjustRequestMain.data.ts            | 40 +++++++++---------
 .../customerreceiptRequestMain.data.ts        | 40 +++++++++---------
 .../customerreturnRequestMain.data.ts         | 40 +++++++++---------
 .../customersettleRequestMain.data.ts         | 40 +++++++++---------
 .../deliverRequestMain.data.ts                | 40 +++++++++---------
 .../stockupMainRequest.data.ts                | 41 +++++++++----------
 .../inventoryinitRequestMain.data.ts          | 40 +++++++++---------
 7 files changed, 140 insertions(+), 141 deletions(-)

diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index 42308b97e..1e27c9497 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -249,26 +249,26 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
       width: 150
     },
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   },
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
index 515f1011a..833fec8bb 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
@@ -314,26 +314,26 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index b24a7391f..3e024dcc9 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -431,26 +431,26 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
index 57fd1d15b..07f3a3dae 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
@@ -260,26 +260,26 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index cd3e5fc2f..8d47784cd 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -418,26 +418,26 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index 6f2281d3b..d6146359e 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -350,27 +350,26 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
         }
       }
     },
-    // {
-    //   label: '直接生成记录',
-    //   field: 'directCreateRecord',
-    //   dictType: DICT_TYPE.TRUE_FALSE,
-    //   dictClass: 'string',
-    //   isTable: true,
-    //   sort: 'custom',
-    //   table: {
-    //     width: 150
-    //   },
-    //   form: {
-    //     component: 'Switch',
-    //     value: requestsettingData.directCreateRecord,
-    //     componentProps: {
-    //       inactiveValue: 'FALSE',
-    //       activeValue: 'TRUE',
-    //       disabled: true
-    //     }
-    //   }
-    // },
-
+    {
+      label: '直接生成记录',
+      field: 'directCreateRecord',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.directCreateRecord,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
+      }
+    },
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
index 2c1eb8ed1..4d49c8b98 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@@ -233,26 +233,26 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '直接生成记录',
-  //   field: 'directCreateRecord',
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'Switch',
-  //     value: requestsettingData.directCreateRecord,
-  //     componentProps: {
-  //       inactiveValue: 'FALSE',
-  //       activeValue: 'TRUE',
-  //       disabled: true
-  //     }
-  //   }
-  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',

From a11944b69b8c312a021807de8662fd4d8acce4cb Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 21 Mar 2024 18:10:17 +0800
Subject: [PATCH 30/65] =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=B8=8E=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A1=86=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packageunit/packageunit.data.ts           |  14 +--
 .../stockup/stockupMainJob/index.vue          | 103 +-----------------
 .../stockupMainJob/stockupMainJob.data.ts     |   9 ++
 .../stockupMainRecord.data.ts                 |   9 ++
 4 files changed, 30 insertions(+), 105 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
index 879b6f278..5775eec34 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
@@ -112,7 +112,7 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
     label: '包装描述',
     field: 'desc',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     table: {
       width: 150
     },
@@ -123,7 +123,7 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -142,7 +142,7 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -373,7 +373,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     table: {
       width: 150
     },
@@ -400,7 +400,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     label: '包装描述',
     field: 'desc',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     table: {
       width: 150
     },
@@ -411,7 +411,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -430,7 +430,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
index a43277b5e..c1425e150 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
@@ -180,110 +180,17 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
-    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
    if (val == 'mainJobExe') { // 执行
-    let aaa = {
-  "id": 6,
-  "requestNumber": "REQ4520240313-0003",
-  "deliverPlanNumber": null,
-  "fromWarehouseCode": "CKV",
-  "toWarehouseCode": "CKV",
-  "details": null,
-  "requestTime": null,
-  "requestDueTime": null,
-  "status": "1",
-  "expiredTime": null,
-  "concurrencyStamp": "1",
-  "jobStageStatus": null,
-  "priority": null,
-  "priorityincrement": null,
-  "departmentCode": null,
-  "userGroupCode": null,
-  "acceptUserId": null,
-  "acceptUserName": null,
-  "acceptTime": null,
-  "completeUserId": null,
-  "completeUserName": null,
-  "completeTime": null,
-  "fromAreaTypes": "FG",
-  "toAreaTypes": "CUST",
-  "number": "JOB3220240314-0006",
-  "businessType": "Stockup",
-  "remark": null,
-  "extraProperties": null,
-  "siteId": null,
-  "autoComplete": "FALSE",
-  "allowModifyLocation": "FALSE",
-  "allowModifyQty": "TRUE",
-  "allowBiggerQty": "TRUE",
-  "allowSmallerQty": "TRUE",
-  "allowModifyInventoryStatus": "TRUE",
-  "allowContinuousScanning": "TRUE",
-  "allowPartialComplete": "TRUE",
-  "ruleUserId": null,
-  "allowModifyBatch": "FALSE",
-  "allowModifyPackingNumber": "FALSE",
-  "fromAreaCodes": "KQV2",
-  "toAreaCodes": "CUST",
-  "serialNumber": "0",
-  "inInventoryStatuses": "OK",
-  "outInventoryStatuses": "OK",
-  "createTime": null,
-    "subList": [{
-  "id": 1,
-  "packingNumber": null,
-  "batch": "2024021801",
-  "inventoryStatus": "OK",
-  "ownerCode": null,
-  "containerNumber": null,
-  "fromLocationCode": "FG",
-  "toLocationCode": "RAW",
-  "itemCode": "FOG-LAMP-RIGHT",
-  "itemName": "HL后雾灯（新）-右\r\n",
-  "itemDesc1": "HL后雾灯（新）-右\r\n",
-  "itemDesc2": "HL后雾灯（新）-右\r\n",
-  "projectCode": "PJ001",
-  "qty": 1,
-  "uom": "EA",
-  "masterId": 6,
-  "number": "JOB3220240314-0006",
-  "remark": null,
-  "siteId": "",
-  "createTime": null,
-    "toPackingNumber": null,
-    "toContainerNumber": null,
-    "toBatch": null,
-    "handleQty": null,
-    "toInventoryStatus": null,
-        recordList: [{
-            handleQty: 10,
-            toPackingNumber: '12',
-            toContainerNumber: '001',
-            toBatch: '21',
-            toInventoryStatus: 'OK',
-            toLocationCode: 'WIP',
-            supplierCode: '31213',
-          },{
-            handleQty: 22,
-            toPackingNumber: 'M20230421000005',
-            toContainerNumber: '001',
-            toBatch: '20230808',
-            toInventoryStatus: 'OK',
-            toLocationCode: 'FG',
-            supplierCode: '31213',
-          }]
-      }]
-}
-    handleHandle(aaa)
-    console.log('列表-操作按钮事件-执行')
+    handleHandle
   } else if (val == 'mainJobAba') { // 放弃
     StockupJobMainApi.abandonStockupMainJob(row.id)
   } else if (val == 'mainJobClo') { // 关闭
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
index 9bb38ab9e..b1b118996 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
@@ -16,6 +16,15 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
+  {
+    label: '发货记录单号',
+    field: 'deliverPlanNumber',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180
+    },
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
index 87ea3475c..0ea16712f 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
@@ -16,6 +16,15 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
+  {
+    label: '发货记录单号',
+    field: 'deliverPlanNumber',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180
+    },
+  },
   {
     label: '申请单号',
     field: 'requestNumber',

From 2ffeff734df960b2f33ce49d1523fa1b9ded7cd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Thu, 21 Mar 2024 18:40:00 +0800
Subject: [PATCH 31/65] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=20=E5=88=9B=E5=BB=BA=E5=8C=85=E8=A3=85?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/itempackage/index.ts              |  11 +
 .../productreceiptRequestMain/index.vue       |  21 +-
 .../productreceiptRequestMain.data.ts         | 370 ++++++++++++++++++
 3 files changed, 394 insertions(+), 8 deletions(-)

diff --git a/src/api/wms/itempackage/index.ts b/src/api/wms/itempackage/index.ts
index 5270dbc2f..97eb8348e 100644
--- a/src/api/wms/itempackage/index.ts
+++ b/src/api/wms/itempackage/index.ts
@@ -41,6 +41,17 @@ export const getItempackagingPageBySupplierdeliver = async (params) => {
   }
 }
 
+// 查询物料包装信息 列表--制品收货申请
+export const getItempackagingPageByProductreceipt = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/itempackage/seniorByProductreceipt', data })
+  } else {
+    return await request.get({ url: `/wms/itempackage/pageByProductreceipt`, params })
+  }
+}
+
 
 // 查询物料包装信息 详情
 export const getItempackaging = async (id: number) => {
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 7c91ed6ed..69bb3cd76 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -78,7 +78,7 @@
       ref="formLabelRef"
       @success="getList"
       :tableAllSchemas="detailListTableColumns"
-      :tableFormRules="ProductionreturnRequestDetailLabelRules"
+      :tableFormRules="ProductreceiptRequestLabelRules"
       :tableData="detatableData.tableList"
       :isBusiness="true"
       :isShowButton="false"
@@ -117,8 +117,9 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import { ProductreceiptRequestMain,ProductreceiptRequestMainRules,ProductreceiptRequestDetail,ProductreceiptRequestDetailRules, BackflushDetailRequest } from './productreceiptRequestMain.data'
-import {ProductionreturnRequestDetailLabel,ProductionreturnRequestDetailLabelRules} from '../../../issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data'
+import { ProductreceiptRequestMain,ProductreceiptRequestMainRules,ProductreceiptRequestDetail,
+  ProductreceiptRequestDetailRules, BackflushDetailRequest,
+  ProductreceiptRequestLabel,ProductreceiptRequestLabelRules } from './productreceiptRequestMain.data'
 import * as ProductreceiptRequestMainApi from '@/api/wms/productreceiptRequestMain'
 import * as ProductreceiptRequestDetailApi from '@/api/wms/productreceiptRequestDetail'
 import * as BackflushRequestDetailbApi from '@/api/wms/backflushRequestDetailb'
@@ -151,7 +152,7 @@ const buttondataTable = ref([{
   }])
 
 //创建标签
-const detailListTableColumns = ProductionreturnRequestDetailLabel.allSchemas
+const detailListTableColumns = ProductreceiptRequestLabel.allSchemas
 const isCreateLabel = ref(false)
 const formLabelRef = ref()
 const labelType = ref('') // 标签类别 采购还是制造等 
@@ -178,6 +179,10 @@ const updataTableColumns = (val) => {
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
     if (type == 'tableForm') {
+      if (formField == 'secondPackUnit') {
+        row['secondPackUnit'] = val[0]['packUnit']
+        row['secondPackQty'] = val[0]['packQty']
+      }
       // 明细查询页赋值
       row[formField] = val[0][searchField]
     } else {
@@ -375,12 +380,12 @@ const buttonTableClick = async (val, row) => {
             if(itemColumns.field == 'productionLineCodePackage') {
               // itemColumns.tableForm.isInpuFocusShow = false
               // itemColumns.tableForm.disabled = true
-              ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = false
+              ProductreceiptRequestLabelRules.productionLineCodePackage[0].required = false
             }
             if(itemColumns.field == 'supplierItemCode') {
               itemColumns.tableForm.isInpuFocusShow = true
               itemColumns.tableForm.disabled = false
-              ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = true
+              ProductreceiptRequestLabelRules.supplierItemCode[0].required = true
             }
           })
           } else {
@@ -389,13 +394,13 @@ const buttonTableClick = async (val, row) => {
             if(itemColumns.field == 'supplierItemCode') {
               itemColumns.tableForm.isInpuFocusShow = false
               itemColumns.tableForm.disabled = true
-              ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = false
+              ProductreceiptRequestLabelRules.supplierItemCode[0].required = false
             }
             if(itemColumns.field == 'productionLineCodePackage') {
               item.productionLineCodePackage = item.productionLineCode
               // itemColumns.tableForm.isInpuFocusShow = true
               // itemColumns.tableForm.disabled = false
-              ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = true
+              ProductreceiptRequestLabelRules.productionLineCodePackage[0].required = true
             }
           })
           }
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 577c5d964..ef5a3c8f8 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -26,6 +26,12 @@ import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/prod
 import * as BomApi from '@/api/wms/bom'
 import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
 
+import * as SupplieritemApi  from '@/api/wms/supplieritem'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -884,6 +890,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     tableForm: {
       type: 'Select'
     }
+    
   },
   {
     label: '生产日期',
@@ -1390,3 +1397,366 @@ export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
 ]))
+
+
+/**
+ * @returns {Array} 制品收货申请创建标签
+ */
+export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCodePackage',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+      // isInpuFocusShow: true,
+      // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      // searchField: 'productionLineCode', // 查询弹窗赋值字段
+      // searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      // searchCondition:[{
+      //   key: 'itemCode',
+      //   value: 'itemCode',
+      //   isMainValue: true
+      // }]
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+      searchField: 'supplierCode', // 查询弹窗赋值字段
+      searchTitle: '供应商信息', // 查询弹窗标题
+      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装规格1',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      disabled: true
+    },
+  },
+  {
+    label: '包装数量1',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '包装规格2',
+    field: 'secondPackUnit',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packUnit',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '包装数量2',
+    field: 'secondPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+]))
+
+//表单校验
+export const ProductreceiptRequestLabelRules = reactive({
+  supplierItemCode: [
+    { required: true, message: '请选择供应商', trigger: 'change' }
+  ],
+  productionLineCodePackage: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ]
+})
+

From 9a4900624b9fe748c9b1214136fe11b795b54a15 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 21 Mar 2024 19:06:12 +0800
Subject: [PATCH 32/65] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E4=BB=B7=E5=92=8C=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/stdcostprice/index.ts             |   6 +
 src/components/BasicForm/src/BasicForm.vue    |  22 ++-
 .../productscrapRequestMain/index.vue         | 131 +++++++++++++-----
 .../productscrapRequestMain.data.ts           |  52 ++++++-
 4 files changed, 167 insertions(+), 44 deletions(-)

diff --git a/src/api/wms/stdcostprice/index.ts b/src/api/wms/stdcostprice/index.ts
index b7e3be15a..3ec273f8e 100644
--- a/src/api/wms/stdcostprice/index.ts
+++ b/src/api/wms/stdcostprice/index.ts
@@ -56,3 +56,9 @@ export const exportStdcostprice = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/stdcostprice/get-import-template' })
 }
+
+
+// 查询标准成本价格单列表
+export const queryStdcostpriceByItemCode = async (data: StdcostpriceVO) => {
+  return await request.post({ url: `/wms/stdcostprice/queryStdcostpriceByItemCode`, data })
+}
\ No newline at end of file
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 70695a55e..2566aaf6c 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -242,7 +242,7 @@ const props = defineProps({
     required: false,
     default: null
   },
-  // 窗体底部按钮：保存，关闭
+  // 窗体底部按钮 显示or隐藏：保存，关闭
   isShowFooterButtton: {
     type: Boolean,
     required: false,
@@ -253,6 +253,12 @@ const props = defineProps({
     type: Boolean,
     required: false,
     default: true
+  },
+  // 底部按钮集合
+  footButttondata: {
+    type: Array,
+    required: false,
+    default: null
   }
 })
 
@@ -412,11 +418,18 @@ if (props.isShowFooterButtton) {
     defaultButtons.formCloseBtn(null) // 关闭
   ]
 }
+if (props.footButttondata) {
+  Butttondata = props.footButttondata
+}
 
 /** 按钮事件 */
 const buttonBaseClick = (val) => {
-  // 保存
-  if (val == 'save') {
+  // 扩展 按钮事件回调
+  if (props.footButttondata) {
+    emit('footButtonClick',val)
+  } 
+   // 保存
+  else if (val == 'save') {
     submitForm()
   }
   // 关闭
@@ -505,7 +518,8 @@ const emit = defineEmits([
   'onChange',
   'onBlur',
   'inputNumberChange',
-  'formFormDateChange'
+  'formFormDateChange',
+  'footButtonClick'
 ])
 //普通下拉改变事件
 const formSelectChange = (field, val, row) => {
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index d7687ae8a..03c3535ba 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -53,6 +53,7 @@
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
+    @inputNumberChange="inputNumberChange"
     @submitForm="submitForm"
     @buttonOperationClick="buttonOperationClick"
   />
@@ -70,32 +71,28 @@
     :apiDelete="ProductscrapRequestDetailApi.deleteProductscrapRequestDetail"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
+    @detailBasicFormOnChange="qtyOnChange"
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
     :detailValidate="detailValidate"
   />
 
-  <!-- bom列表 -->
-  <Dialog
-    :title="DialogTitle"
-    v-model="bomModelVisible"
-    width="80%"
-    :scroll="true"
-    max-height="450px"
-  >
-    <TableForm
-      ref="tableFormRef"
-      class="w-[100%]"
-      :tableFields="ProdcutscrapBomDismantle.allSchemas.tableColumns"
-      :tableData="detatableDataBom.tableList"
-      :isShowButton="false"
-      :isShowReduceButton="false"
-    />
-    <template #footer>
-      <ButtonBase :Butttondata="ButttondataBom" @button-base-click="buttonBaseClickBom" />
-    </template>
-    <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
-  </Dialog>
+ <!-- BOM弹窗列表 -->
+ <BasicForm
+    ref="detailBomRef"
+    @success="getList"
+    :tableAllSchemas="ProdcutscrapBomScrap.allSchemas"
+    :tableFormRules="ProdcutscrapBomScrapRules"
+    :tableData="detatableDataBom.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="true"
+    :Butttondata="ButttondataBom"
+    @searchTableSuccess="searchTableBomSuccess"
+    :footButttondata="footButttondata"
+    @footButtonClick="buttonBaseClickBom"
+  />
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/productscrap-request-main/import" :importTemplateData="importTemplateData" 
@@ -109,9 +106,11 @@ import { ProductscrapRequestMain,
   ProductscrapRequestMainRules,
   ProductscrapRequestDetail,
   ProductscrapRequestDetailRules,
-  ProdcutscrapBomDismantle } from './productscrapRequestMain.data'
+  ProdcutscrapBomScrap,
+  ProdcutscrapBomScrapRules } from './productscrapRequestMain.data'
 import * as ProductscrapRequestMainApi from '@/api/wms/productscrapRequestMain'
 import * as ProductscrapRequestDetailApi from '@/api/wms/productscrapRequestDetail'
+import * as StdcostpriceApi from '@/api/wms/stdcostprice'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from "@/api/wms/bomDismantle"
 
@@ -139,12 +138,18 @@ const buttondataTable = ref([{
 }])
 
 // Bom 窗口
-const DialogTitle = ref('Bom信息')
+
 const bomModelVisible = ref(false)
 const tableListBom = ref()
 const lsBomSave = ref()
 const rowId = ref()
 const detailQty = ref()
+const footButttondata = ref([
+  defaultButtons.formSaveBtn(null), // BOM保存
+  defaultButtons.formCloseBtn(null) // BOM关闭
+])
+// 子包装数据
+const detailBomRef = ref()
 const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
   getListApi: BomDismantleApi.getProductscrapBomDismantlePage
 })
@@ -176,6 +181,7 @@ const buttonBaseClickBom = (val) => {
     console.log("tableListBom",tableListBom.value)
     console.log("lsBomSave",lsBomSave.value)
     if (lsBomSave.value) {
+
       tableData.value.forEach((item, index) => {
         if(tableListBom.value[0].rowId == index) {
           item.childList = tableListBom.value
@@ -192,11 +198,11 @@ const buttonBaseClickBom = (val) => {
         return
       }
     }
-    bomModelVisible.value = false
+    detailBomRef.value.dialogVisible = false
   }
   // 关闭
   else if (val == 'close') {
-    bomModelVisible.value = false
+    detailBomRef.value.dialogVisible = false
   }
 }
 // 新增 tableform 按钮
@@ -205,24 +211,35 @@ const buttonOperationClick = async (row, label, index)=> {
     message.warning('请选择物料代码！')
     return
   }
+  if(row.qty <= 0){
+    message.warning('数量需要大于0！')
+    return
+  }
   detatableDataBom.params.itemCode = row.itemCode
   detatableDataBom.params.bomVersion =  row.bomVersion
-  DialogTitle.value = '物料代码:【' + row.itemCode + '】 Bom 信息'
   detailQty.value = row.qty
   bomModelVisible.value = true
   await getDetailListBom()
-
+  console.log(row.fromLocationCode);
   detatableDataBom.tableList.forEach(item => {
-    // ProdcutscrapBomDismantle.allSchemas.tableFormColumns.forEach((bomItem) => {
-    //   if (bomItem.field == 'batch') {
-    //     let condition = {
-    //       'key':'locationCode',
-    //       'value': row.fromLocationCode,
-    //       'isMainValue':'false'
-    //     }
-    //     bomItem.searchCondition.push(condition)
-    //   }
-    // })
+    ProdcutscrapBomScrap.allSchemas.tableFormColumns.map((bomItem) => {
+      if (bomItem.field == 'batch') {
+        let condition = [{
+          key:'location_code',
+          action: '==',
+          value: row.fromLocationCode,
+          isSearch: true,
+          isMainValue:false
+        },{
+          key:'item_code',
+          action: '==',
+          value:item.itemCode,
+          isSearch: true,
+          isMainValue: false
+        }]
+        bomItem.tableForm.searchCondition = condition
+      }
+    })
     item.rowId = index
     if(tableData.value[index].childList.length > 0) {
       tableData.value[index].childList.forEach(itemChild => {
@@ -234,13 +251,26 @@ const buttonOperationClick = async (row, label, index)=> {
       item.qty = item.bomQty * row.qty
     }
   })
+  detailBomRef.value.open('create', row, null,'viewDetail')//查看明细数据
+}
+
+// 查询页面返回
+const searchTableBomSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      if (formField == 'batch') {
+        row['batch'] = val[0]['batch']
+        row['packingNumber'] = val[0]['packingNumber']
+      }
+    } 
+  })
 }
 
 // 查看 Bom 按钮回调事件
 const tableFormButton = async (val , row) => {
   if (val == 'bom') { // 查看 bom
     bomModelVisible.value = true
-    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
       itemCode: row.itemCode,
       bomVersion: row.bomVersion,
@@ -249,6 +279,7 @@ const tableFormButton = async (val , row) => {
     rowId.value =  row.id
     detailQty.value = row.qty
     await getDetailListBom()
+    detailBomRef.value.open('create', row, null,'viewDetail')//查看明细数据
   }
 }
 
@@ -273,6 +304,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['itemCode'] = val[0]['itemCode']
         row['bomVersion'] = ''
         row['childList'] = []
+      let param = {'itemCode':val[0]['itemCode'] as string}
+      StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
+        console.log(res)
+        row['uom'] = res.uom
+        row['singlePrice'] = res.price
+      })
       }else if(formField == 'bomVersion'){
         row['bomVersion'] = val[0]['version']
       }
@@ -300,6 +337,12 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
       setV['itemCode'] = val[0]['itemCode']
       setV['bomVersion'] = ''
       setV['childList'] = []
+      // 
+      let param = {'itemCode':val[0]['itemCode'] as string}
+      StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
+        console.log(res)
+      })
+
     }else if(formField == 'bomVersion'){
       setV['bomVersion'] = val[0]['version']
     }
@@ -650,6 +693,18 @@ const detailValidate = (data) => {
   }
 }
 
+const inputNumberChange = (field, index, row, val) => {
+  if(field == 'qty' || field == 'singlePrice'){
+    row.amount = row.qty * row.singlePrice
+  }
+}
+
+const qtyOnChange = (field,val) =>{
+  if(field == 'qty' || field == 'singlePrice'){
+    detailRef.value.formRef.formRef.formModel.amount = detailRef.value.formRef.formRef.formModel.qty * detailRef.value.formRef.formRef.formModel.singlePrice
+  }
+}
+
 /** 导入 */
 const importFormRef = ref()
 const handleImport = () => {
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index e29ece33e..03fc0334f 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -810,6 +810,50 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 6
     }
   },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 6
+      },
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      disabled:true,
+      min: 0,
+      precision: 6,
+    },
+  },
   {
     label: '项目代码',
     field: 'projectCode',
@@ -954,7 +998,6 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }]
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
@@ -1017,7 +1060,7 @@ export const ProductscrapRequestDetailRules = reactive({
 /**
  * @returns {Array} bom 拆解
  */
-export const ProdcutscrapBomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
+export const ProdcutscrapBomScrap = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '行标记',
     field: 'rowId',
@@ -1183,3 +1226,8 @@ export const ProdcutscrapBomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
     }
   }
 ]))
+
+//表单校验
+export const ProdcutscrapBomScrapRules = reactive({
+ 
+})

From 75d245b49f1ad31ca0803d465106425ba515fc78 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 21 Mar 2024 19:15:29 +0800
Subject: [PATCH 33/65] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrapRequestMain/scrapRequestMain.data.ts | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index da1f498d4..fd4b2414c 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -202,6 +202,15 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
   {
     label: '自动提交',
     field: 'autoCommit',
@@ -267,6 +276,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm:false,
     isTable: false,
     sort: 'custom',
     table: {
@@ -282,15 +292,6 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
   {
     label: '创建时间',
     field: 'createTime',

From 6a7574bd212508980813dfcd6da7764428ea0dc4 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 21 Mar 2024 19:21:08 +0800
Subject: [PATCH 34/65] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9=E6=88=90=E5=BA=93=E5=8C=BA?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E5=8F=8A=20=E9=83=A8=E9=97=A8=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factoryModeling/location/location.data.ts             | 2 +-
 .../countManage/count/countJobMain/countJobMain.data.ts   | 4 ++--
 .../customerreceiptRecordMain.data.ts                     | 4 ++--
 .../customerreceiptRequestMain.data.ts                    | 4 ++--
 .../customerreturnJobMain/customerreturnJobMain.data.ts   | 4 ++--
 .../customerreturnRecordMain.data.ts                      | 4 ++--
 .../customerreturnRequestMain.data.ts                     | 4 ++--
 .../customersettleRecordMain.data.ts                      | 2 +-
 .../customersettleRequestMain.data.ts                     | 2 +-
 .../deliver/deliverJobMain/deliverJobMain.data.ts         | 4 ++--
 .../deliver/deliverRecordMain/deliverRecordMain.data.ts   | 4 ++--
 .../deliver/deliverRequestMain/deliverRequestMain.data.ts | 4 ++--
 .../stockup/stockupMainJob/index.vue                      | 8 ++++++--
 .../stockup/stockupMainJob/stockupMainJob.data.ts         | 4 ++--
 .../stockup/stockupMainRecord/index.vue                   | 8 ++++++--
 .../stockup/stockupMainRecord/stockupMainRecord.data.ts   | 8 ++++----
 .../stockup/stockupMainRequest/stockupMainRequest.data.ts | 4 ++--
 .../scrap/scrapJobMain/scrapJobMain.data.ts               | 4 ++--
 .../scrap/scrapRecordMain/scrapRecordMain.data.ts         | 2 +-
 .../scrap/scrapRequestMain/scrapRequestMain.data.ts       | 2 +-
 .../transferissueJobMain/transferissueJobMain.data.ts     | 4 ++--
 .../transferissueRecordMain.data.ts                       | 4 ++--
 .../transferissueRequestMain.data.ts                      | 4 ++--
 .../transferreceiptJobMain/transferreceiptJobMain.data.ts | 4 ++--
 .../transferreceiptRecordMain.data.ts                     | 4 ++--
 .../transferreceiptRequestMain.data.ts                    | 4 ++--
 .../unplannedissueJobMain/unplannedissueJobMain.data.ts   | 4 ++--
 .../unplannedissueRecordMain.data.ts                      | 2 +-
 .../unplannedissueRequestMain.data.ts                     | 2 +-
 .../unplannedreceiptJobMain.data.ts                       | 4 ++--
 .../unplannedreceiptRecordMain.data.ts                    | 2 +-
 .../unplannedreceiptRequestMain.data.ts                   | 2 +-
 src/views/wms/issueManage/issue/issueJobMain/index.vue    | 7 +++++--
 .../issueManage/issue/issueJobMain/issueJobMain.data.ts   | 4 ++--
 src/views/wms/issueManage/issue/issueRecordMain/index.vue | 7 +++++--
 .../issue/issueRecordMain/issueRecordMain.data.ts         | 4 ++--
 .../onlinesettlement/onlinesettlementRecordMain/index.vue | 7 +++++--
 .../wms/issueManage/pick/pickJobMain/pickJobMain.data.ts  | 4 ++--
 .../pick/pickRecordMain/pickRecordMain.data.ts            | 4 ++--
 .../pick/pickRequestMain/pickRequestMain.data.ts          | 4 ++--
 .../productionreceipt/productionreceiptJobMain/index.vue  | 7 +++++--
 .../productionreceiptJobMain.data.ts                      | 4 ++--
 .../productionreceiptRecordMain/index.vue                 | 7 +++++--
 .../productionreceiptRecordMain.data.ts                   | 4 ++--
 .../productionreturn/productionreturnJobMain/index.vue    | 7 +++++--
 .../productionreturnJobMain.data.ts                       | 4 ++--
 .../productionreturn/productionreturnRecordMain/index.vue | 7 +++++--
 .../productionreturnRecordMain.data.ts                    | 4 ++--
 .../productionreturnRequestMain.data.ts                   | 4 ++--
 .../repleinsh/repleinshJobMain/repleinshJobMain.data.ts   | 4 ++--
 .../repleinshRecordMain/repleinshRecordMain.data.ts       | 4 ++--
 .../inventorymoveJobMain/inventorymoveJobMain.data.ts     | 4 ++--
 .../inventorymoveRecordMain.data.ts                       | 4 ++--
 .../inventorymoveRequestMain.data.ts                      | 4 ++--
 .../productdismantleJobMain.data.ts                       | 4 ++--
 .../productdismantleRecordMain.data.ts                    | 2 +-
 .../productdismantleRequestMain.data.ts                   | 2 +-
 .../productputawayJobMain/productputawayJobMain.data.ts   | 4 ++--
 .../productputawayRecordMain.data.ts                      | 4 ++--
 .../productputawayRequestMain.data.ts                     | 4 ++--
 .../productreceiptJobMain/productreceiptJobMain.data.ts   | 4 ++--
 .../productreceiptRecordMain.data.ts                      | 2 +-
 .../productreceiptRequestMain.data.ts                     | 2 +-
 .../productrepairRecordMain.data.ts                       | 2 +-
 .../productrepairRequestMain.data.ts                      | 2 +-
 .../productscrapJobMain/productscrapJobMain.data.ts       | 4 ++--
 .../productscrapRecordMain/productscrapRecordMain.data.ts | 2 +-
 .../productscrapRequestMain.data.ts                       | 2 +-
 .../inspect/inspectJobMain/index.vue                      | 7 +++++--
 .../inspect/inspectJobMain/inspectJobMain.data.ts         | 4 ++--
 .../inspect/inspectRecordMain/index.vue                   | 7 +++++--
 .../inspect/inspectRecordMain/inspectRecordMain.data.ts   | 2 +-
 .../inspect/inspectRequestMain/inspectRequestMain.data.ts | 4 ++--
 .../purchasereceipt/purchasereceiptJobMain/index.vue      | 7 +++++--
 .../purchasereceiptJobMain/purchasereceiptJobMain.data.ts | 4 ++--
 .../purchasereceipt/purchasereceiptRecordMain/index.vue   | 7 +++++--
 .../purchasereceiptRecordMain.data.ts                     | 4 ++--
 .../purchasereceiptRequestMain.data.ts                    | 6 ++++--
 .../purchasereturn/purchasereturnJobMain/index.vue        | 6 +++++-
 .../purchasereturnJobMain/purchasereturnJobMain.data.ts   | 4 ++--
 .../purchasereturn/purchasereturnRecordMain/index.vue     | 7 +++++--
 .../purchasereturnRecordMain.data.ts                      | 4 ++--
 .../purchasereturnRequestMain.data.ts                     | 4 ++--
 .../putaway/putawayJobMain/index.vue                      | 7 +++++--
 .../putaway/putawayRecordMain/index.vue                   | 7 +++++--
 .../putaway/putawayRecordMain/putawayRecordMain.data.ts   | 4 ++--
 .../putaway/putawayRequestMain/putawayRequestMain.data.ts | 2 +-
 .../sparereceipt/sparereceiptJobMain/index.vue            | 7 +++++--
 .../sparereceiptJobMain/sparereceiptJobMain.data.ts       | 4 ++--
 .../sparereceipt/sparereceiptRecordMain/index.vue         | 8 +++++---
 .../sparereceiptRecordMain/sparereceiptRecordMain.data.ts | 4 ++--
 .../sparereceiptRequestMain.data.ts                       | 6 ++++--
 .../supplierdeliver/purchasePlanMain/index.vue            | 6 +++++-
 .../supplierdeliver/supplierdeliverRecordMain/index.vue   | 7 +++++--
 .../purchaseclaim/purchaseclaimRecordMain/index.vue       | 7 +++++--
 .../supplierinvoice/supplierinvoiceRecordMain/index.vue   | 7 +++++--
 96 files changed, 250 insertions(+), 174 deletions(-)

diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
index 2765c0899..6bcc1d903 100644
--- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
@@ -133,7 +133,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
   // {
   //   label: '类型',
   //   field: 'type',
-  //   dictType: DICT_TYPE.LOCATION_TYPE,
+  //   dictType: DICT_TYPE.AREA_TYPE,
   //   dictClass: 'string',
   //   isSearch: true,
   //   isTable: true,
diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
index 27c00d765..edaecb60f 100644
--- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
+++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
@@ -143,7 +143,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -154,7 +154,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
index f566d2893..de3b7aadd 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
@@ -180,7 +180,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -199,7 +199,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
index 833fec8bb..40799c9a6 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
@@ -174,7 +174,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     isForm: false,
@@ -186,7 +186,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
index cd973da77..b2b761c6c 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
@@ -181,7 +181,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -192,7 +192,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
index aab1717c3..45e23fed6 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
@@ -189,7 +189,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -208,7 +208,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index 3e024dcc9..9c12565bb 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -285,7 +285,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -297,7 +297,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts
index 1480e7adc..c52dd9038 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts
@@ -141,7 +141,7 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
index 07f3a3dae..63dccc27b 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
@@ -134,7 +134,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
index 3a538b354..db84960d1 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
@@ -180,7 +180,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -191,7 +191,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
index d3927c830..a11a3c3f1 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
@@ -189,7 +189,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -200,7 +200,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index 8d47784cd..5ae9992d7 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -272,7 +272,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -284,7 +284,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
index c1425e150..6fceca776 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
@@ -71,6 +71,7 @@ import { StockupMainJob,StockupMainJobRules,StockupDetailJob,StockupDetailJobRul
 import * as StockupJobMainApi from '@/api/wms/stockupMainJob'
 import * as StockupJobDetailApi from '@/api/wms/stockupDetailJob'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 // 备货任务主
 defineOptions({ name: 'StockupJobMain' })
@@ -199,11 +200,14 @@ const buttonTableClick = async (val, row) => {
     StockupJobMainApi.acceptStockupMainJob(row.id)
   }
 }
-
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue,'jobStockupMain')
+  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,'stockupMainJob')
 }
 
 const handleHandle = async (data) => {
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
index b1b118996..ae116f734 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
@@ -210,7 +210,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -222,7 +222,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
index 168b9c9e1..6ba0203ae 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
@@ -66,6 +66,7 @@ import { StockupMainRecord,StockupMainRecordRules,StockupDetailRecord,StockupDet
 import * as StockupMainRecordApi from '@/api/wms/stockupMainRecord'
 import * as StockupDetailRecordApi from '@/api/wms/stockupDetailRecord'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 // 备货记录主
 defineOptions({ name: 'StockupMainRecord' })
@@ -132,11 +133,14 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
 }
-
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue,'recordDeliverMain')
+  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,'stockupMainRecord')
 }
 
 /** 导出按钮操作 */
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
index 0ea16712f..b44bd6867 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
@@ -63,7 +63,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '出库事务类型',
     field: 'outTransactionType',
     sort: 'custom',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     table: {
@@ -74,7 +74,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '入库事务类型',
     field: 'inTransactionType',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -86,7 +86,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -106,7 +106,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index d6146359e..d1f126201 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -119,7 +119,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -373,7 +373,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index c616db448..99effbbd7 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -116,7 +116,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -127,7 +127,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index 7d8ae6095..f75a7d2ba 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -126,7 +126,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index da1f498d4..1663c4e2c 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -145,7 +145,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts
index 8a96b382a..38d3fd546 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts
@@ -186,7 +186,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -198,7 +198,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
index 7e996b6eb..32a7ed2ee 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
@@ -158,7 +158,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -169,7 +169,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
index a0bfbb3d1..948b12065 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -228,7 +228,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -241,7 +241,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
index 7e5236aff..e11a049d3 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
@@ -141,7 +141,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -152,7 +152,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
index 290ae7d95..e9acb88d2 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
@@ -166,7 +166,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -177,7 +177,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
index 95a051c46..c8ea67d20 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
@@ -138,7 +138,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -149,7 +149,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
index 96c9e6e94..8609deee4 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
@@ -124,7 +124,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
@@ -136,7 +136,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
index 783a7594e..75c83ba26 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
@@ -126,7 +126,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
index bb579b5f0..2ead54f3f 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@@ -112,7 +112,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
index 167feec0e..1525201c3 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
@@ -124,7 +124,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
@@ -136,7 +136,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
index afcc31947..c875677b4 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
@@ -126,7 +126,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index ae6a278b8..f31cd9ecf 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -152,7 +152,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue
index 551c2f5d8..3133dcd36 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueJobMain/index.vue
@@ -72,7 +72,7 @@ import * as IssueJobMainApi from '@/api/wms/issueJobMain'
 import * as IssueJobDetailApi from '@/api/wms/issueJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { getDictLabel, DICT_TYPE } from '@/utils/dict'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 发料任务主
 defineOptions({ name: 'IssueJobMain' })
 
@@ -272,10 +272,13 @@ const buttonTableClick = async (val, row) => {
     IssueJobMainApi.acceptIssueMain(row.id)
   }
 }
-
+// 获取部门 用于详情 部门回显
+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)
 }
 
diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
index ee3014e28..6f4a919d9 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
@@ -236,7 +236,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
@@ -248,7 +248,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/issueManage/issue/issueRecordMain/index.vue b/src/views/wms/issueManage/issue/issueRecordMain/index.vue
index 8ab7a62b8..011761bd5 100644
--- a/src/views/wms/issueManage/issue/issueRecordMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRecordMain/index.vue
@@ -66,7 +66,7 @@ import { IssueRecordMain,IssueRecordMainRules,IssueRecordDetail,IssueRecordDetai
 import * as IssueRecordMainApi from '@/api/wms/issueRecordMain'
 import * as IssueRecordDetailApi from '@/api/wms/issueRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 发料记录主
 defineOptions({ name: 'IssueRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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)
 }
 
diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
index c232a91de..96b413cba 100644
--- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
@@ -220,7 +220,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -247,7 +247,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
index 64f13dd2d..4dc6976d5 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
@@ -66,7 +66,7 @@ import { OnlinesettlementRecordMain,OnlinesettlementRecordMainRules,Onlinesettle
 import * as OnlinesettlementRecordMainApi from '@/api/wms/onlinesettlementRecordMain'
 import * as OnlinesettlementRecordDetailApi from '@/api/wms/onlinesettlementRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 上线结算记录主
 defineOptions({ name: 'OnlinesettlementRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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)
 }
 
diff --git a/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts
index 04280cab4..0a50534e2 100644
--- a/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts
+++ b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts
@@ -229,7 +229,7 @@ export const PickJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
@@ -241,7 +241,7 @@ export const PickJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts b/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts
index 85ea5f5ac..c0fff1c77 100644
--- a/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts
+++ b/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts
@@ -220,7 +220,7 @@ export const PickRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -239,7 +239,7 @@ export const PickRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
index fa550e33d..450282624 100644
--- a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
+++ b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
@@ -48,7 +48,7 @@ export const PickRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -76,7 +76,7 @@ export const PickRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
index ff0b642a2..660119199 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
@@ -71,7 +71,7 @@ import { ProductionreceiptJobMain,ProductionreceiptJobMainRules,Productionreceip
 import * as ProductionreceiptJobMainApi from '@/api/wms/productionreceiptJobMain'
 import * as ProductionreceiptJobDetailApi from '@/api/wms/productionreceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 生产收料任务主
 defineOptions({ name: 'ProductionreceiptJobMain' })
 
@@ -273,10 +273,13 @@ const buttonTableClick = async (val, row) => {
     ProductionreceiptJobMainApi.acceptIssueMain(row.id)
   }
 }
-
+// 获取部门 用于详情 部门回显
+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)
 }
 
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
index d86bc636d..961dcab60 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
@@ -241,7 +241,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -252,7 +252,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
index ef050f101..fc1c8413c 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
@@ -66,7 +66,7 @@ import { ProductionreceiptRecordMain,ProductionreceiptRecordMainRules,Production
 import * as ProductionreceiptRecordMainApi from '@/api/wms/productionreceiptRecordMain'
 import * as ProductionreceiptRecordDetailApi from '@/api/wms/productionreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 生产收料记录主
 defineOptions({ name: 'ProductionreceiptRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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)
 }
 
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
index e4be38b7e..b1799c14d 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
@@ -212,7 +212,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -239,7 +239,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
index 9557fe216..1692e3476 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
@@ -71,7 +71,7 @@ import { ProductionreturnJobMain,ProductionreturnJobMainRules,ProductionreturnJo
 import * as ProductionreturnJobMainApi from '@/api/wms/productionreturnJobMain'
 import * as ProductionreturnJobDetailApi from '@/api/wms/productionreturnJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 生产退料任务主
 defineOptions({ name: 'ProductionreturnJobMain' })
 
@@ -245,10 +245,13 @@ const buttonTableClick = async (val, row) => {
     ProductionreturnJobMainApi.acceptProductionreturnMain(row.id)
   }
 }
-
+// 获取部门 用于详情 部门回显
+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)
 }
 
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
index f49676ca9..fb3413b72 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
@@ -245,7 +245,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -256,7 +256,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
index 8f430742b..1e9458787 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
@@ -66,7 +66,7 @@ import { ProductionreturnRecordMain,ProductionreturnRecordMainRules,Productionre
 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: 'ProductionreturnRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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)
 }
 
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
index c29c76ce7..10db40ece 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
@@ -220,7 +220,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -247,7 +247,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index cbe054bdc..edd1e9634 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -146,7 +146,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -158,7 +158,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
index 3d305e1a0..eddd68caa 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
@@ -165,7 +165,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: false,
@@ -177,7 +177,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: false,
     sort: 'custom',
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
index 663260573..3de9f2a92 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
@@ -220,7 +220,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -239,7 +239,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
index d0fda520b..c29587068 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
@@ -149,7 +149,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
@@ -161,7 +161,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
index d89084b67..28365764f 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
@@ -152,7 +152,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -163,7 +163,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index f1739c2ed..603e01210 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -147,7 +147,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    // dictType: DICT_TYPE.LOCATION_TYPE,
+    // dictType: DICT_TYPE.AREA_TYPE,
     // dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -177,7 +177,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    // dictType: DICT_TYPE.LOCATION_TYPE,
+    // dictType: DICT_TYPE.AREA_TYPE,
     // dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts
index 2cdff47aa..bdc4a04c4 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts
@@ -253,7 +253,7 @@ export const ProductdismantleJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -264,7 +264,7 @@ export const ProductdismantleJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
index c4aaa96ff..de6e44621 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
@@ -228,7 +228,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index 204a4aae4..615d80fb3 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -146,7 +146,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
index 904c49e0e..3cd26c74d 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
@@ -237,7 +237,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -248,7 +248,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
index f07a7dc7f..adecda095 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
@@ -228,7 +228,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -247,7 +247,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
index 17c7587e1..e7792a5fd 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
@@ -63,7 +63,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -260,7 +260,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
index fe47f40c5..d88c730ec 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
@@ -261,7 +261,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -272,7 +272,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
index cbea20d07..6c3fc3bcf 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
@@ -244,7 +244,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 928430024..8a81f8428 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -162,7 +162,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
index cf4468e48..19d07630a 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
@@ -229,7 +229,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index cae44bc7a..c16250fdb 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -146,7 +146,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
index 172a29b18..ad21962a7 100644
--- a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
@@ -229,7 +229,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -240,7 +240,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
index 198fd8d69..5fddad79c 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
@@ -258,7 +258,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 5f268e7db..a8590d18b 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -148,7 +148,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
index 5f76c6c08..182b008ee 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
@@ -71,7 +71,7 @@ import { InspectJobMain,InspectJobMainRules,InspectJobDetail,InspectJobDetailRul
 import * as InspectJobMainApi from '@/api/wms/inspectJobMain'
 import * as InspectJobDetailApi from '@/api/wms/inspectJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 检验任务主
 defineOptions({ name: 'InspectJobMain' })
 
@@ -209,10 +209,13 @@ const handleClose = async (id: number) => {
     await getList()
   } catch {}
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobInspectMain')
 }
 
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts
index 33d2defa1..5282de81f 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts
@@ -217,7 +217,7 @@ export const InspectJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -228,7 +228,7 @@ export const InspectJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
index 5f867c3e1..fa9cac48e 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
@@ -70,7 +70,7 @@ import * as InspectRecordMainApi from '@/api/wms/inspectRecordMain'
 import * as InspectRecordDetailApi from '@/api/wms/inspectRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import  Preview  from '@/components/UploadFile/src/Preview.vue'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 检验记录主
 defineOptions({ name: 'InspectRecordMain' })
 
@@ -155,10 +155,13 @@ const handlePutawayRequest = async (number:string) => {
     tableObject.loading = false
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'recordInspectMain')
 }
 
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts
index abe003386..a0928f3c5 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts
@@ -363,7 +363,7 @@ export const InspectRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '从库区类型范围',
     field: 'fromAreaTypes',
     isTable: true,
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
index cfee6ab70..ead937f80 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
@@ -184,7 +184,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -196,7 +196,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 2eb30d6e5..58a73593d 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -95,7 +95,7 @@ import { PurchasereceiptJobMain,
 import * as PurchasereceiptJobMainApi from '@/api/wms/purchasereceiptJobMain'
 import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 采购收货任务主
 defineOptions({ name: 'PurchasereceiptJobMain' })
 
@@ -241,10 +241,13 @@ const { tableObject: packingDetatableData, tableMethods: packDetatableMethods }
   getListApi: PurchasereceiptJobDetailApi.queryPurchaseceiptChildPackingNumber
 })
 const { getList:queryDetailList } = packDetatableMethods
-
+// 获取部门 用于详情 部门回显
+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,'jobPurchasereceiptMain')
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index e669ff514..02bec99c8 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -301,7 +301,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -312,7 +312,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index dfd32837e..5792a4069 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -102,7 +102,7 @@ import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMa
 import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 采购收货记录主
 defineOptions({ name: 'PurchasereceiptRecordMain' })
 
@@ -213,10 +213,13 @@ const { tableObject: outStockPackingDetatableData, tableMethods: outStockPackDet
   getListApi: PurchasereceiptRecordDetailApi.queryPurchaseshortageChildPackingNumber
 })
 const { getList:queryOutStockDetailList } = outStockPackDetatableMethods
-
+// 获取部门 用于详情 部门回显
+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,'recordPurchasereceiptMain')
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index 8197a8b6e..621efb7ce 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -125,7 +125,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -136,7 +136,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 9c51ae59c..b83102da5 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -178,7 +178,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -190,7 +190,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -449,6 +449,8 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '标签状态',
     field: 'labelStatus',
     sort: 'custom',
+    dictType: DICT_TYPE.LABEL_STATUS,
+    dictClass: 'string',
     table: {
       width: 150
     },
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
index 699c042ff..2fb352085 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
@@ -71,6 +71,7 @@ import { PurchasereturnJobMain,PurchasereturnJobMainRules,PurchasereturnJobDetai
 import * as PurchasereturnJobMainApi from '@/api/wms/purchasereturnJobMain'
 import * as PurchasereturnJobDetailApi from '@/api/wms/purchasereturnJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 // 采购退货任务主
 defineOptions({ name: 'PurchasereturnJobMain' })
@@ -209,10 +210,13 @@ const handleClose = async (id: number) => {
     await getList()
   } catch {}
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobPurchasereturnMain')
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
index be0ad7436..8d947536b 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
@@ -107,7 +107,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: false,
     isTable: true,
@@ -119,7 +119,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
index c1e88d93a..c4b1b8e00 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
@@ -67,7 +67,7 @@ import * as PurchasereturnRecordMainApi from '@/api/wms/purchasereturnRecordMain
 import * as PurchasereturnRecordDetailApi from '@/api/wms/purchasereturnRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { getAccessToken } from '@/utils/auth'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 采购退货记录主
 defineOptions({ name: 'PurchasereturnRecordMain' })
 
@@ -144,10 +144,13 @@ const documentSrc = ref(BASE_URL + '/jmreport/view/920874172025987072?token=' +
 const handleDocumentPrint = async (id) => {
   window.open(documentSrc.value + '&id=' + id)
 }
-
+// 获取部门 用于详情 部门回显
+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,'recordPurchasereturnMain')
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
index ad3562c9a..ee35586a8 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
@@ -132,7 +132,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -143,7 +143,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 6cabf554e..711063c0c 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -156,7 +156,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -168,7 +168,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index c63ba5643..9a39229a8 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -94,7 +94,7 @@ import { PutawayJobMain,
 import * as PutawayJobMainApi from '@/api/wms/putawayJobMain'
 import * as PutawayJobDetailApi from '@/api/wms/putawayJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 上架任务主
 defineOptions({ name: 'PutawayJobMain' })
 
@@ -229,10 +229,13 @@ const { tableObject: packingDetatableData, tableMethods: packDetatableMethods }
   getListApi: PutawayJobDetailApi.getPutawayJobDetailPageChildPackingNumber
 })
 const { getList:queryDetailList } = packDetatableMethods
-
+// 获取部门 用于详情 部门回显
+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,'jobPutawayMain')
 }
 
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
index 09a9480c7..c2cec817e 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
@@ -89,7 +89,7 @@ import { PutawayRecordMain,
 import * as PutawayRecordMainApi from '@/api/wms/putawayRecordMain'
 import * as PutawayRecordDetailApi from '@/api/wms/putawayRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 上架记录主
 defineOptions({ name: 'PutawayRecordMain' })
 
@@ -162,10 +162,13 @@ const { tableObject: packingDetatableData, tableMethods: packDetatableMethods }
   getListApi: PutawayRecordDetailApi.getPutawayJobDetailPageChildPackingNumber
 })
 const { getList:queryDetailList } = packDetatableMethods
-
+// 获取部门 用于详情 部门回显
+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,'recordPutawayMain')
 }
 
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
index 9f42208e2..6d3453d75 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
@@ -228,7 +228,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -247,7 +247,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index 0384bbea6..95304ad1b 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -315,7 +315,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
index cf4950cf8..e20fb51a8 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
@@ -71,7 +71,7 @@ import { PurchasereceiptJobMain,PurchasereceiptJobMainRules,PurchasereceiptJobDe
 import * as PurchasereceiptJobMainApi from '@/api/wms/purchasereceiptJobMain'
 import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 采购收货任务主
 defineOptions({ name: 'PurchasereceiptJobMain' })
 
@@ -234,10 +234,13 @@ const handleAccept = async (id: number) => {
     await getList()
   } catch {}
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobPurchasereceiptMain')
 }
 
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
index 1e5574de4..3ce781e10 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
@@ -301,7 +301,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -312,7 +312,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
index 67066e8ce..b28f7a874 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
@@ -69,7 +69,7 @@ import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMa
 import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 采购收货记录主
 defineOptions({ name: 'PurchasereceiptRecordMain' })
 
@@ -135,11 +135,13 @@ 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,'recordPurchasereceiptMain')
 }
 
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
index 71eb3ce79..fe4fc4ed0 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
@@ -125,7 +125,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -136,7 +136,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
index 7f836ea17..ddc626775 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -179,7 +179,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -191,7 +191,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -449,6 +449,8 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '标签状态',
     field: 'labelStatus',
+    dictType: DICT_TYPE.LABEL_STATUS,
+    dictClass: 'string',
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 74d52a09b..8330d5564 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -71,6 +71,7 @@
   import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
   import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+  import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
   // 要货计划
   defineOptions({ name: 'PurchasePlanMain' })
@@ -261,11 +262,14 @@
     tableData.value = [] // 重置明细数据
     formRef.value.open(type, row)
   }
-
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
   /** 详情操作 */
   const detailRef = ref()
   const openDetail = (row : any, titleName : any, titleValue : any) => {
     detailRef.value.openDetail(row, titleName, titleValue,'planPurchaseMain')
+    const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+    if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   }
 
   /** 删除按钮操作 */
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
index e030597c7..5e1b2a07e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
@@ -84,7 +84,7 @@ import * as SupplierdeliverRecordMainApi from '@/api/wms/supplierdeliverRecordMa
 import * as SupplierdeliverRecordDetailApi from '@/api/wms/supplierdeliverRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { getAccessToken } from '@/utils/auth'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 供应商发货记录主
 defineOptions({ name: 'SupplierdeliverRecordMain' })
 
@@ -187,10 +187,13 @@ const { tableObject: detatableData, tableMethods: detatableMethods } = useTable(
   getListApi: SupplierdeliverRecordDetailApi.queryChildPickingNumber
 })
 const { getList:getDetailList } = detatableMethods
-
+// 获取部门 用于详情 部门回显
+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,'recordSupplierdeliverMain')
 }
 
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
index 3074151eb..b7c14f4d9 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
@@ -66,7 +66,7 @@ import { PurchaseclaimRecordMain,PurchaseclaimRecordMainRules,PurchaseclaimRecor
 import * as PurchaseclaimRecordMainApi from '@/api/wms/purchaseclaimRecordMain'
 import * as PurchaseclaimRecordDetailApi from '@/api/wms/purchaseclaimRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 采购索赔记录主
 defineOptions({ name: 'PurchaseclaimRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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)
 }
 
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index b20a4b01c..64bc1145b 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -66,7 +66,7 @@ import { SupplierinvoiceRecordMain,SupplierinvoiceRecordMainRules,Supplierinvoic
 import * as SupplierinvoiceRecordMainApi from '@/api/wms/supplierinvoiceRecordMain'
 import * as SupplierinvoiceRecordDetailApi from '@/api/wms/supplierinvoiceRecordDeatil'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 供应商发票记录主
 defineOptions({ name: 'SupplierinvoiceRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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)
 }
 

From 83bcede53ce3266ed3c6cbf05f05d177ca95867d Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 21 Mar 2024 19:40:16 +0800
Subject: [PATCH 35/65] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=20=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/countManage/count/countJobMain/index.vue     | 7 +++++--
 src/views/wms/countManage/count/countRecordMain/index.vue  | 7 +++++--
 .../countadjust/countadjustRecordMain/index.vue            | 7 +++++--
 .../customerreceipt/customerreceiptRecordMain/index.vue    | 7 +++++--
 .../customerreturn/customerreturnJobMain/index.vue         | 7 +++++--
 .../customerreturn/customerreturnRecordMain/index.vue      | 7 +++++--
 .../customersettle/customersettleRecordMain/index.vue      | 7 +++++--
 .../deliver/deliverJobMain/index.vue                       | 7 +++++--
 .../deliver/deliverRecordMain/index.vue                    | 7 +++++--
 .../inventoryinitial/inventoryinitRecordMain/index.vue     | 7 +++++--
 .../packageoverMain/packageoverJobMain/index.vue           | 7 +++++--
 .../wms/inventoryjobManage/scrap/scrapJobMain/index.vue    | 7 +++++--
 .../wms/inventoryjobManage/scrap/scrapRecordMain/index.vue | 7 +++++--
 .../transferissue/transferissueJobMain/index.vue           | 6 +++++-
 .../transferissue/transferissueRecordMain/index.vue        | 7 +++++--
 .../transferreceipt/transferreceiptJobMain/index.vue       | 7 +++++--
 .../transferreceipt/transferreceiptRecordMain/index.vue    | 7 +++++--
 .../unplannedissue/unplannedissueJobMain/index.vue         | 7 +++++--
 .../unplannedissue/unplannedissueRecordMain/index.vue      | 7 +++++--
 .../unplannedreceipt/unplannedreceiptJobMain/index.vue     | 7 +++++--
 .../unplannedreceipt/unplannedreceiptRecordMain/index.vue  | 7 +++++--
 .../inventorychange/inventorychangeRecordMain/index.vue    | 7 +++++--
 .../inventorymove/inventorymoveJobMain/index.vue           | 7 +++++--
 .../inventorymove/inventorymoveRecordMain/index.vue        | 7 +++++--
 .../offlinesettlementRecordMain/index.vue                  | 7 +++++--
 .../productdismantle/productdismantleJobMain/index.vue     | 7 +++++--
 .../productdismantle/productdismantleRecordMain/index.vue  | 7 +++++--
 .../productputaway/productputawayJobMain/index.vue         | 7 +++++--
 .../productputaway/productputawayRecordMain/index.vue      | 7 +++++--
 .../productreceipt/productreceiptJobMain/index.vue         | 7 +++++--
 .../productreceipt/productreceiptRecordMain/index.vue      | 7 +++++--
 .../productrepair/productrepairRecordMain/index.vue        | 7 +++++--
 .../productscrap/productscrapJobMain/index.vue             | 7 +++++--
 .../productscrap/productscrapRecordMain/index.vue          | 7 +++++--
 34 files changed, 170 insertions(+), 67 deletions(-)

diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index 0be479c28..79a78d5cb 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -71,7 +71,7 @@ import { CountJobMain,CountJobMainRules,CountJobDetail,CountJobDetailRules } fro
 import * as CountJobMainApi from '@/api/wms/countJobMain'
 import * as CountJobDetailApi from '@/api/wms/countJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 盘点任务主
 defineOptions({ name: 'CountJobMain' })
 
@@ -209,10 +209,13 @@ const handleClose = async (id: number) => {
     await getList()
   } catch {}
 }
-
+// 获取部门 用于详情 部门回显
+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)
 }
 
diff --git a/src/views/wms/countManage/count/countRecordMain/index.vue b/src/views/wms/countManage/count/countRecordMain/index.vue
index 7916f6a69..1ad95828b 100644
--- a/src/views/wms/countManage/count/countRecordMain/index.vue
+++ b/src/views/wms/countManage/count/countRecordMain/index.vue
@@ -66,7 +66,7 @@ import { CountRecordMain,CountRecordMainRules,CountRecordDetail,CountRecordDetai
 import * as CountRecordMainApi from '@/api/wms/countRecordMain'
 import * as CountRecordDetailApi from '@/api/wms/countRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 盘点记录主
 defineOptions({ name: 'CountRecordMain' })
 
@@ -147,10 +147,13 @@ 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)
 }
 
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
index f9d58320c..bb6fa391e 100644
--- a/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
@@ -66,7 +66,7 @@ import { CountadjustRecordMain,CountadjustRecordMainRules,CountadjustRecordDetai
 import * as CountadjustRecordMainApi from '@/api/wms/countadjustRecordMain'
 import * as CountadjustRecordDetailApi from '@/api/wms/countadjustRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 盘点调整记录主
 defineOptions({ name: 'CountadjustRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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)
 }
 
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue
index 049df1d5f..4964594aa 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue
@@ -66,7 +66,7 @@ import { CustomerreceiptRecordMain,CustomerreceiptRecordMainRules,Customerreceip
 import * as CustomerreceiptRecordMainApi from '@/api/wms/customerreceiptRecordMain'
 import * as CustomerreceiptRecordDetailApi from '@/api/wms/customerreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 客户收货记录主
 defineOptions({ name: 'CustomerreceiptRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordCustomerreceiptMain')
 }
 
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
index e6470c66e..69ca394c1 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
@@ -71,7 +71,7 @@ import { CustomerreturnJobMain,CustomerreturnJobMainRules,CustomerreturnJobDetai
 import * as CustomerreturnJobMainApi from '@/api/wms/customerreturnJobMain'
 import * as CustomerreturnJobDetailApi from '@/api/wms/customerreturnJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 客户退货任务主
 defineOptions({ name: 'CustomerreturnJobMain' })
 
@@ -327,10 +327,13 @@ 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,'jobCustomerreturnMain')
 }
 
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
index ad56e650d..57d4645c8 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
@@ -67,7 +67,7 @@ import { CustomerreturnRecordMain,CustomerreturnRecordMainRules,CustomerreturnRe
 import * as CustomerreturnRecordMainApi from '@/api/wms/customerreturnRecordMain'
 import * as CustomerreturnRecordDetailApi from '@/api/wms/customerreturnRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 客户退货记录主
 defineOptions({ name: 'CustomerreturnRecordMain' })
 
@@ -136,10 +136,13 @@ const buttonTableClick = async (val, row) => {
     handlePoint(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,'recordCustomerreturnMain')
 }
 
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
index d61d9c871..cbec73363 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
@@ -66,7 +66,7 @@ import { CustomersettleRecordMain,CustomersettleRecordMainRules,CustomersettleRe
 import * as CustomersettleRecordMainApi from '@/api/wms/customersettleRecordMain'
 import * as CustomersettleRecordDetailApi from '@/api/wms/customersettleRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 客户结算记录主
 defineOptions({ name: 'CustomersettleRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordCustomersettleMain')
 }
 
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
index b013abb1d..a1bdacece 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
@@ -71,7 +71,7 @@ import { DeliverJobMain,DeliverJobMainRules,DeliverJobDetail,DeliverJobDetailRul
 import * as DeliverJobMainApi from '@/api/wms/deliverJobMain'
 import * as DeliverJobDetailApi from '@/api/wms/deliverJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 发货任务主
 defineOptions({ name: 'DeliverJobMain' })
 
@@ -297,10 +297,13 @@ const buttonTableClick = async (val, row) => {
     DeliverJobMainApi.acceptDeliverJobMain(row.id)
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobDeliverMain')
 }
 
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
index b30a36e8c..1677d269a 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
@@ -67,7 +67,7 @@ import { DeliverRecordMain,DeliverRecordMainRules,DeliverRecordDetail,DeliverRec
 import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain'
 import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 发货记录主
 defineOptions({ name: 'DeliverRecordMain' })
 
@@ -136,10 +136,13 @@ const buttonTableClick = async (val, row) => {
     handlePoint(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,'recordDeliverMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
index 9536bc4eb..d3f4a0c1f 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
@@ -66,7 +66,7 @@ import { InventoryinitRecordMain,InventoryinitRecordMainRules,InventoryinitRecor
 import * as InventoryinitRecordMainApi from '@/api/wms/inventoryinitRecordMain'
 import * as InventoryinitRecordDetailApi from '@/api/wms/inventoryinitRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 库存初始化记录主
 defineOptions({ name: 'InventoryinitRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordInventoryinitMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
index 014d06d9f..7bb7eb81b 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
@@ -72,7 +72,7 @@ import * as PackageoverJobDetailApi from '@/api/wms/packageoverJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 defineOptions({ name: 'PackageoverJobMain' })
 
 const message = useMessage() // 消息弹窗
@@ -182,10 +182,13 @@ const formsSuccess = async (formType,data) => {
   basicFormRef.value.dialogVisible = false
   getList()
 }
-
+// 获取部门 用于详情 部门回显
+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, 'basicPackageoverJobMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
index 71f0a1869..428ccc3a4 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
@@ -71,7 +71,7 @@ import { ScrapJobMain,ScrapJobMainRules,ScrapJobDetail,ScrapJobDetailRules } fro
 import * as ScrapJobMainApi from '@/api/wms/scrapJobMain'
 import * as ScrapJobDetailApi from '@/api/wms/scrapJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 报废出库任务主
 defineOptions({ name: 'ScrapJobMain' })
 
@@ -199,10 +199,13 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-承接')
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobScrapMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue
index 8536ada02..a0754c892 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue
@@ -66,7 +66,7 @@ import { ScrapRecordMain,ScrapRecordMainRules,ScrapRecordDetail,ScrapRecordDetai
 import * as ScrapRecordMainApi from '@/api/wms/scrapRecordMain'
 import * as ScrapRecordDetailApi from '@/api/wms/scrapRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 报废出库记录主
 defineOptions({ name: 'ScrapRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordScrapMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
index 5ee014895..cab328190 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
@@ -73,6 +73,7 @@ import * as TransferissueJobDetailApi from '@/api/wms/transferissueJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as PurchasereceiptJobMainApi from "@/api/wms/purchasereceiptJobMain";
 import {acceptTransferissueJobMain} from "@/api/wms/transferissueJobMain";
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 // 调拨出库任务主
 defineOptions({ name: 'TransferissueJobMain' })
@@ -240,10 +241,13 @@ const handleAccept = async (id: number) => {
     await getList()
   } catch {}
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobTransferissueMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue
index d70453032..f988040a9 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue
@@ -66,7 +66,7 @@ import { TransferissueRecordMain,TransferissueRecordMainRules,TransferissueRecor
 import * as TransferissueRecordMainApi from '@/api/wms/transferissueRecordMain'
 import * as TransferissueRecordDetailApi from '@/api/wms/transferissueRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 调拨出库记录主
 defineOptions({ name: 'TransferissueRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordTransferissueMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
index 1c70f815a..69c3480a6 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
@@ -71,7 +71,7 @@ import { TransferreceiptJobMain,TransferreceiptJobMainRules,TransferreceiptJobDe
 import * as TransferreceiptJobMainApi from '@/api/wms/transferreceiptJobMain'
 import * as TransferreceiptJobDetailApi from '@/api/wms/transferreceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 调拨入库任务主
 defineOptions({ name: 'TransferreceiptJobMain' })
 
@@ -199,10 +199,13 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-承接')
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobTransferreceiptMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue
index 2d7a2c1b7..b2b72f479 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue
@@ -66,7 +66,7 @@ import { TransferreceiptRecordMain,TransferreceiptRecordMainRules,Transferreceip
 import * as TransferreceiptRecordMainApi from '@/api/wms/transferreceiptRecordMain'
 import * as TransferreceiptRecordDetailApi from '@/api/wms/transferreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 调拨入库记录主
 defineOptions({ name: 'TransferreceiptRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordTransferreceiptMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue
index b2ea08566..5ee4577e8 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue
@@ -71,7 +71,7 @@ import { UnplannedissueJobMain,UnplannedissueJobMainRules,UnplannedissueJobDetai
 import * as UnplannedissueJobMainApi from '@/api/wms/unplannedissueJobMain'
 import * as UnplannedissueJobDetailApi from '@/api/wms/unplannedissueJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 计划外出库任务主
 defineOptions({ name: 'UnplannedissueJobMain' })
 
@@ -199,10 +199,13 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-承接')
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobUnplannedissueMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue
index 7d2685fca..d12357f4e 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue
@@ -66,7 +66,7 @@ import { UnplannedissueRecordMain,UnplannedissueRecordMainRules,UnplannedissueRe
 import * as UnplannedissueRecordMainApi from '@/api/wms/unplannedissueRecordMain'
 import * as UnplannedissueRecordDetailApi from '@/api/wms/unplannedissueRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 计划外出库记录主
 defineOptions({ name: 'UnplannedissueRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordUnplannedissueMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
index fbd2ba120..421138d93 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
@@ -71,7 +71,7 @@ import { UnplannedreceiptJobMain,UnplannedreceiptJobMainRules,UnplannedreceiptJo
 import * as UnplannedreceiptJobMainApi from '@/api/wms/unplannedreceiptJobMain'
 import * as UnplannedreceiptJobDetailApi from '@/api/wms/unplannedreceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 计划外入库任务主
 defineOptions({ name: 'UnplannedreceiptJobMain' })
 
@@ -199,10 +199,13 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-承接')
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobUnplannedreceiptMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
index 399ff529d..f368e8a5f 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
@@ -66,7 +66,7 @@ import { UnplannedreceiptRecordMain,UnplannedreceiptRecordMainRules,Unplannedrec
 import * as UnplannedreceiptRecordMainApi from '@/api/wms/unplannedreceiptRecordMain'
 import * as UnplannedreceiptRecordDetailApi from '@/api/wms/unplannedreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 调拨入库记录主
 defineOptions({ name: 'UnplannedreceiptRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordUnplannedreceiptMain')
 }
 
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
index c12678a18..310727855 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
@@ -66,7 +66,7 @@ import { InventorychangeRecordMain,InventorychangeRecordMainRules,Inventorychang
 import * as InventorychangeRecordMainApi from '@/api/wms/inventorychangeRecordMain'
 import * as InventorychangeRecordDetailApi from '@/api/wms/inventorychangeRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 库存修改记录主
 defineOptions({ name: 'InventorychangeRecordMain' })
 
@@ -178,10 +178,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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)
 }
 
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
index 2722e95a9..13ebfa2b4 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
@@ -71,7 +71,7 @@ import { InventorymoveJobMain,InventorymoveJobMainRules,InventorymoveJobDetail,I
 import * as InventorymoveJobMainApi from '@/api/wms/inventorymoveJobMain'
 import * as InventorymoveJobDetailApi from '@/api/wms/inventorymoveJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 库存转移任务主
 defineOptions({ name: 'InventorymoveJobMain' })
 
@@ -252,10 +252,13 @@ const buttonTableClick = async (val, row) => {
     InventorymoveJobMainApi.acceptInventorymoveMain(row.id)
   }
 }
-
+// 获取部门 用于详情 部门回显
+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)
 }
 
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
index ec381e60a..bff1e39f2 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
@@ -66,7 +66,7 @@ import { InventorymoveRecordMain,InventorymoveRecordMainRules,InventorymoveRecor
 import * as InventorymoveRecordMainApi from '@/api/wms/inventorymoveRecordMain'
 import * as InventorymoveRecordDetailApi from '@/api/wms/inventorymoveRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 库存转移记录主
 defineOptions({ name: 'InventorymoveRecordMain' })
 
@@ -187,10 +187,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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)
 }
 
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue
index e214dc716..0b705e2a4 100644
--- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue
@@ -66,7 +66,7 @@ import { OfflinesettlementRecordMain,OfflinesettlementRecordMainRules,Offlineset
 import * as OfflinesettlementRecordMainApi from '@/api/wms/offlinesettlementRecordMain'
 import * as OfflinesettlementRecordDetailApi from '@/api/wms/offlinesettlementRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 下线结算记录主
 defineOptions({ name: 'OfflinesettlementRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordOfflinesettlementMain')
 }
 
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
index f52e91bb8..2a3b4d72b 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
@@ -71,7 +71,7 @@ import { ProductdismantleJobMain,ProductdismantleJobMainRules,ProductdismantleJo
 import * as ProductdismantleJobMainApi from '@/api/wms/productdismantleJobMain'
 import * as ProductdismantleJobDetailApi from '@/api/wms/productdismantleJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 制品拆解任务主
 defineOptions({ name: 'ProductdismantleJobMain' })
 
@@ -199,10 +199,13 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-承接')
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobProductdismantleMain')
 }
 
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
index bf2ec862d..54daffa22 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
@@ -91,7 +91,7 @@ import * as ProductdismantleRecordMainApi from '@/api/wms/productdismantleRecord
 import * as ProductdismantleRecordDetailApi from '@/api/wms/productdismantleRecordDetaila'
 import * as DismantleRecordDetailbApi from '@/api/wms/dismantleRecordDetailb'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 制品拆解记录主
 defineOptions({ name: 'ProductdismantleRecordMain' })
 
@@ -202,10 +202,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordProductdismantleMain')
 }
 
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
index c519832a2..083052113 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@@ -71,7 +71,7 @@ import { ProductputawayJobMain,ProductputawayJobMainRules,ProductputawayJobDetai
 import * as ProductputawayJobMainApi from '@/api/wms/productputawayJobMain'
 import * as ProductputawayJobDetailApi from '@/api/wms/productputawayJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 制品上架任务主
 defineOptions({ name: 'ProductputawayJobMain' })
 
@@ -238,10 +238,13 @@ const buttonTableClick = async (val, row) => {
     ProductputawayJobMainApi.acceptProductputawayMain(row.id)
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobProductputawayMain')
 }
 
diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
index fc4433325..6b3c98003 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
@@ -66,7 +66,7 @@ import { ProductputawayRecordMain,ProductputawayRecordMainRules,ProductputawayRe
 import * as ProductputawayRecordMainApi from '@/api/wms/productputawayRecordMain'
 import * as ProductputawayRecordDetailApi from '@/api/wms/productputawayRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 制品上架记录主
 defineOptions({ name: 'ProductputawayRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordProductputawayMain')
 }
 
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
index 9d1068068..77a975dbc 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
@@ -71,7 +71,7 @@ import { ProductreceiptJobMain,ProductreceiptJobMainRules,ProductreceiptJobDetai
 import * as ProductreceiptJobMainApi from '@/api/wms/productreceiptJobMain'
 import * as ProductreceiptJobDetailApi from '@/api/wms/productreceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 制品收货任务主
 defineOptions({ name: 'ProductreceiptJobMain' })
 
@@ -259,10 +259,13 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptJobMainApi.acceptProductreceiptMain(row.id)
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobProductreceiptMain')
 }
 
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
index 64e1ae91f..fbdb61db4 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
@@ -90,7 +90,7 @@ import * as ProductreceiptRecordMainApi from '@/api/wms/productreceiptRecordMain
 import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BackflushRecordDetailbApi from '@/api/wms/backflushRecordDetailb'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 制品收货记录主
 defineOptions({ name: 'ProductreceiptRecordMain' })
 
@@ -175,10 +175,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordProductreceiptMain')
 }
 
diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
index f49c19b3a..5a9d88c7f 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
@@ -94,7 +94,7 @@ import * as ProductrepairRecordDetailApi from '@/api/wms/productrepairRecordDeta
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from "@/api/wms/bomDismantle";
 import {getBomDismantleRecordPage} from "@/api/wms/bomDismantle";
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 制品返修记录主
 defineOptions({ name: 'ProductrepairRecordMain' })
 
@@ -241,10 +241,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordProductrepairMain')
 }
 
diff --git a/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue
index 7e92a4e1d..197bf7cf8 100644
--- a/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue
@@ -71,7 +71,7 @@ import { ProductscrapJobMain,ProductscrapJobMainRules,ProductscrapJobDetail,Prod
 import * as ProductscrapJobMainApi from '@/api/wms/productscrapJobMain'
 import * as ProductscrapJobDetailApi from '@/api/wms/productscrapJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 制品报废任务主
 defineOptions({ name: 'ProductscrapJobMain' })
 
@@ -199,10 +199,13 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-承接')
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobProductscrapMain')
 }
 
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
index 7ae91324a..6b16ba8f9 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
@@ -93,7 +93,7 @@ import * as ProductscrapRecordDetailApi from '@/api/wms/productscrapRecordDetail
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from "@/api/wms/bomDismantle";
 import {getProductscrapBomDismantleRecordPage} from "@/api/wms/bomDismantle";
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 制品报废记录主
 defineOptions({ name: 'ProductscrapRecordMain' })
 
@@ -240,10 +240,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordProductscrapMain')
 }
 

From 8c6777cf57f27deff75991e55c077eb2a5f78a0d Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 21 Mar 2024 19:42:13 +0800
Subject: [PATCH 36/65] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E4=BB=B7=E5=92=8C=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrap/scrapRequestMain/index.vue          | 27 ++++++++++
 .../scrapRequestMain/scrapRequestMain.data.ts | 50 ++++++++++++++++++-
 .../productscrapRequestMain/index.vue         | 16 +++---
 3 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index aa9d8e2e9..76183c8cf 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -53,6 +53,7 @@
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
+    @inputNumberChange="inputNumberChange"
     @submitForm="submitForm"
     @tableFormSelectOnBlur="tableFormSelectOnBlur"
   />
@@ -70,6 +71,7 @@
     :apiDelete="ScrapRequestDetailApi.deleteScrapRequestDetail"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
+    @detailBasicFormOnChange="qtyOnChange"
     :detailValidate="detailValidate"
     @onBlur="onBlur"
   />
@@ -86,6 +88,7 @@ import { ScrapRequestMain,ScrapRequestMainRules,ScrapRequestDetail,ScrapRequestD
 import * as ScrapRequestMainApi from '@/api/wms/scrapRequestMain'
 import * as ScrapRequestDetailApi from '@/api/wms/scrapRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as StdcostpriceApi from '@/api/wms/stdcostprice'
 
 // 报废出库申请
 defineOptions({ name: 'ScrapRequestMain' })
@@ -113,6 +116,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       row['batch'] = val[0]['batch']
       row['fromLocationCode'] = val[0]['locationCode']
       row['itemCode'] = val[0]['itemCode']
+      row['uom'] = val[0]['uom']
+      // 查询标准价格
+      let param = {'itemCode':val[0]['itemCode'] as string}
+      StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
+        row['singlePrice'] = res.price
+      })
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
@@ -129,6 +138,12 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
     setV['batch'] = val[0]['batch']
     setV['fromLocationCode'] = val[0]['locationCode']
     setV['itemCode'] = val[0]['itemCode']
+    setV['uom'] = val[0]['uom']
+    // 查询标准价格
+    let param = {'itemCode':val[0]['itemCode'] as string}
+    StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
+        setV['singlePrice'] = res.price
+      })
     formRef.setValues(setV)
   })
 }
@@ -458,6 +473,18 @@ const tableFormSelectOnBlur = (field, val, row, index) => {
   }
 }
 
+const inputNumberChange = (field, index, row, val) => {
+  if(field == 'qty' || field == 'singlePrice'){
+    row.amount = row.qty * row.singlePrice
+  }
+}
+
+const qtyOnChange = (field,val) =>{
+  if(field == 'qty' || field == 'singlePrice'){
+    detailRef.value.formRef.formRef.formModel.amount = detailRef.value.formRef.formRef.formModel.qty * detailRef.value.formRef.formRef.formModel.singlePrice
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index fd4b2414c..435d7e11a 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -539,6 +539,50 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 6
     }
   },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 6
+      },
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      disabled:true,
+      min: 0,
+      precision: 6,
+    },
+  },
   {
     label: '计量单位',
     field: 'uom',
@@ -547,9 +591,13 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
+      componentProps:{
+        disabled:true,
+      }
     },
     tableForm: {
+      disabled:true,
       type: 'Select'
     }
   },
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 03c3535ba..94a03692a 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -304,12 +304,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['itemCode'] = val[0]['itemCode']
         row['bomVersion'] = ''
         row['childList'] = []
-      let param = {'itemCode':val[0]['itemCode'] as string}
-      StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
-        console.log(res)
-        row['uom'] = res.uom
-        row['singlePrice'] = res.price
-      })
+        // 查询标准价格
+        let param = {'itemCode':val[0]['itemCode'] as string}
+        StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
+          console.log(res)
+          row['uom'] = res.uom
+          row['singlePrice'] = res.price
+        })
       }else if(formField == 'bomVersion'){
         row['bomVersion'] = val[0]['version']
       }
@@ -337,12 +338,11 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
       setV['itemCode'] = val[0]['itemCode']
       setV['bomVersion'] = ''
       setV['childList'] = []
-      // 
+      // 查询标准价格
       let param = {'itemCode':val[0]['itemCode'] as string}
       StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
         console.log(res)
       })
-
     }else if(formField == 'bomVersion'){
       setV['bomVersion'] = val[0]['version']
     }

From 5bbffd18158a084209421bc5fad76704ee745569 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 21 Mar 2024 19:46:24 +0800
Subject: [PATCH 37/65] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=AE=BE=E7=BD=AEisForm:false?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../documentSetting/plansetting/plansetting.data.ts            | 3 ++-
 .../documentSetting/requestsetting/requestsetting.data.ts      | 1 +
 .../count/countRequestMain/countRequestMain.data.ts            | 1 +
 .../countadjustRequestMain/countadjustRequestMain.data.ts      | 1 +
 .../customerreceiptRequestMain.data.ts                         | 1 +
 .../customerreturnRequestMain.data.ts                          | 1 +
 .../customersettleRequestMain.data.ts                          | 1 +
 .../deliver/deliverRequestMain/deliverRequestMain.data.ts      | 1 +
 .../stockup/stockupMainRequest/stockupMainRequest.data.ts      | 1 +
 .../inventoryinitRequestMain/inventoryinitRequestMain.data.ts  | 1 +
 .../packageoverRequestMain/packageoverRequestMain.data.ts      | 1 +
 .../transferissueRequestMain/transferissueRequestMain.data.ts  | 1 +
 .../transferreceiptRequestMain.data.ts                         | 1 +
 .../unplannedissueRequestMain.data.ts                          | 1 +
 .../unplannedreceiptRequestMain.data.ts                        | 1 +
 .../issue/issueRequestMain/issueRequestMain.data.ts            | 1 +
 .../onlinesettlementRequestMain.data.ts                        | 1 +
 .../issueManage/pick/pickRequestMain/pickRequestMain.data.ts   | 1 +
 .../productionreturnRequestMain.data.ts                        | 1 +
 .../inventorychangeRequestMain.data.ts                         | 1 +
 .../inventorymoveRequestMain/inventorymoveRequestMain.data.ts  | 1 +
 .../offlinesettlementRequestMain.data.ts                       | 1 +
 .../productdismantleRequestMain.data.ts                        | 1 +
 .../productputawayRequestMain.data.ts                          | 1 +
 .../productreceiptRequestMain.data.ts                          | 1 +
 .../productrepairRequestMain/productrepairRequestMain.data.ts  | 1 +
 .../productscrapRequestMain/productscrapRequestMain.data.ts    | 1 +
 .../inspect/inspectRequestMain/inspectRequestMain.data.ts      | 1 +
 .../purchasereceiptRequestMain.data.ts                         | 1 +
 .../purchasereturnRequestMain.data.ts                          | 1 +
 .../putaway/putawayRequestMain/putawayRequestMain.data.ts      | 1 +
 .../sparereceiptRequestMain/sparereceiptRequestMain.data.ts    | 1 +
 .../supplierdeliverRequestMain.data.ts                         | 1 +
 .../purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts  | 1 +
 .../supplierinvoiceRequestMain.data.ts                         | 1 +
 35 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts b/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts
index 88e08994d..07ac11277 100644
--- a/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts
+++ b/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts
@@ -99,7 +99,8 @@ export const Plansetting = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isForm: false,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 180
diff --git a/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts
index 3c3468fa9..9d776a2de 100644
--- a/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts
+++ b/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts
@@ -99,6 +99,7 @@ export const Requestsetting = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
index 81f3fe3a7..64182f0a7 100644
--- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
+++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
@@ -268,6 +268,7 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     form: {
       component: 'Switch',
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index 1e27c9497..56d36cbc3 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -254,6 +254,7 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     form: {
       component: 'Switch',
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
index 40799c9a6..b76b727ed 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
@@ -319,6 +319,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index 9c12565bb..5ab8c3a1d 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -436,6 +436,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
index 63dccc27b..291efbddc 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
@@ -265,6 +265,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index 5ae9992d7..264b0aa1c 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -423,6 +423,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index d1f126201..89f3ebac7 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -355,6 +355,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
       field: 'directCreateRecord',
       dictType: DICT_TYPE.TRUE_FALSE,
       dictClass: 'string',
+      isForm: false,
       isTable: false,
       sort: 'custom',
       table: {
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
index 4d49c8b98..74b944bd9 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@@ -238,6 +238,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
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 4c8a5411a..3bf617148 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
@@ -307,6 +307,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
index 948b12065..8ecbc07aa 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -395,6 +395,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
index c8ea67d20..e8f6ee261 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
@@ -293,6 +293,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
index 2ead54f3f..2c0d3080f 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@@ -235,6 +235,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index f31cd9ecf..e102db256 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -275,6 +275,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 6da200a2f..f650a5238 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -351,6 +351,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
index f35ade83e..fc8df1334 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
@@ -291,6 +291,7 @@ export const OnlinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
index 450282624..6d58aa495 100644
--- a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
+++ b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
@@ -322,6 +322,7 @@ export const PickRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index edd1e9634..b52acb497 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -310,6 +310,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
index 25f1efbea..3b9d03647 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
@@ -220,6 +220,7 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index 603e01210..78fc398a4 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -308,6 +308,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
index 498011f55..df080e227 100644
--- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
@@ -276,6 +276,7 @@ export const OfflinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index 615d80fb3..42f93e103 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -399,6 +399,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
index e7792a5fd..f1bd40f28 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
@@ -344,6 +344,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 8a81f8428..ee5f02722 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -415,6 +415,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index c16250fdb..539b14b05 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -399,6 +399,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index a8590d18b..a59b9e10a 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -402,6 +402,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
index ead937f80..38787a872 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
@@ -438,6 +438,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index b83102da5..d9686d459 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -430,6 +430,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 711063c0c..91d87f30a 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -410,6 +410,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index 95304ad1b..dda309149 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -398,6 +398,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
index ddc626775..1a0cc7b73 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -431,6 +431,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index d0005069a..4e6aaa649 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -459,6 +459,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
index be1394183..410da7d8f 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
@@ -250,6 +250,7 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: false,
+    isForm: false,
     isTable: false,
     table: {
       width: 120
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 625fed5e9..7b2c83395 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -296,6 +296,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isForm: false,
     isTable: false,
     sort: 'custom',
     table: {

From 0c633763573c64d8e10a5e21c29731417925a4cb Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 22 Mar 2024 08:12:32 +0800
Subject: [PATCH 38/65] =?UTF-8?q?=E7=BC=BA=E5=B0=91=E9=80=97=E5=8F=B7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customersettleRecordMain/customersettleRecordMain.data.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts
index c52dd9038..5e36de08f 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts
@@ -141,7 +141,7 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

From c65aa6848f9befc3655c06dba99ca63dd62cc0c2 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 22 Mar 2024 08:20:27 +0800
Subject: [PATCH 39/65] =?UTF-8?q?=E7=BC=BA=E5=B0=91=E9=80=97=E5=8F=B7?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliver/deliverRequestMain/deliverRequestMain.data.ts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index 264b0aa1c..ae7805bab 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -272,7 +272,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

From 60a902eee3a35a15a68a70fe01c39f5346d6d954 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 22 Mar 2024 10:53:23 +0800
Subject: [PATCH 40/65] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=20=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BA=93=E5=8C=BA=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factoryModeling/workstation/index.vue     | 27 ----------------
 .../workstation/workstation.data.ts           | 31 +++++++++++++++++--
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
index 96151f4ec..406313909 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
@@ -206,33 +206,6 @@ const formsSuccess = async (formType,data) => {
       getList()
 }
 
-// 修改 tableform 属性
-Workstation.allSchemas.tableFormColumns.map(item => {
-  if(item.field == 'rawLocationCode') {
-      item.form.componentProps.searchCondition = [
-      {
-        key: 'areaType',
-        value: 'WIP',
-      },
-      {
-          key: 'available',
-          value: 'TRUE',
-        }
-      ]
-    }
-    if(item.field == 'fgLocationCode') {
-      item.form.componentProps.searchCondition = [
-      {
-        key: 'areaType',
-        value: 'WIP',
-      },
-      {
-          key: 'available',
-          value: 'TRUE',
-        }
-      ]
-    }
-  })
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
index bf6753484..6c6b6ee73 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
@@ -10,15 +10,20 @@ import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/prod
 import * as WorkshopApi from '@/api/wms/workshop'
 import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
 
+import * as getBusinesstypeApi  from '@/api/wms/businesstype/index'
 
 import * as WorkstationApi from '@/api/wms/workstation'
 
 import { validateYS } from '@/utils/validator'
-import {Team} from "@/views/wms/basicDataManage/orderManage/team/team.data";
-import * as TeamApi from "@/api/wms/team";
 
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'WorkStation'
+}
 const { t } = useI18n() // 国际化
-
+const data = await getBusinesstypeApi.getBusinesstypePage(queryParams)
+const businesstypeData =data?.list[0]||{}
 /**
  * @returns {Array} 工位
  */
@@ -125,6 +130,16 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '库位信息', // 查询弹窗标题
         searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
         searchPage: WorkstationApi.selectAreaTypeToLocation, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },
+        {
+          key: 'areaType',
+          value: businesstypeData.outAreaTypes,
+          isMainValue: false
+        }]
       }
     }
   },
@@ -144,6 +159,16 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '库位信息', // 查询弹窗标题
         searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
         searchPage: WorkstationApi.selectAreaTypeToLocation, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },
+        {
+          key: 'areaType',
+          value: businesstypeData.outAreaTypes,
+          isMainValue: false
+        }]
       }
     }
   },

From 256236f05b170bec0a3e374a75d620ab38ffec48 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 22 Mar 2024 11:11:46 +0800
Subject: [PATCH 41/65] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionlineitem.data.ts                | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
index 76960e963..15e0c440d 100644
--- a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
@@ -1,18 +1,21 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-
-import * as LocationApi from '@/api/wms/location'
-import { Location } from './../../factoryModeling/location/location.data'
-
 import * as ProductionLineCodeApi from '@/api/wms/productionline'
 import { Productionline } from './../../factoryModeling/productionline/productionline.data'
 
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from './../itembasic/itembasic.data'
-
-import { ElButton, ElInput } from 'element-plus'
+import * as getBusinesstypeApi  from '@/api/wms/businesstype/index'
 const { t } = useI18n() // 国际化
 
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'Productionlineitem'
+}
+const data = await getBusinesstypeApi.getBusinesstypePage(queryParams)
+const businesstypeData =data?.list[0]||{}
+
 /**
  * @returns {Array} 生产线物料关系
  */
@@ -112,15 +115,8 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
         },
         {
           key:'type',
-          value:'OTS',
-          action: '!=',
-          isSearch: true,
-          isMainValue: false
-        },
-        {
-          key:'type',
-          value:'RAW',
-          action: '!=',
+          value:businesstypeData.itemTypes,
+          action: 'notin',
           isSearch: true,
           isMainValue: false
         },

From a03fda7834bb8ff4d835f8ac9d9faa8f495e40e1 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 22 Mar 2024 13:21:44 +0800
Subject: [PATCH 42/65] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E7=94=B3=E8=AF=B7=20?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BB=A3=E7=A0=81=E6=90=9C=E7=B4=A2=E6=A1=86?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=83=85=E5=86=B5=E5=B1=95=E7=A4=BA/?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliver/deliverJobMain/index.vue          |  2 +-
 .../stockup/stockupMainRequest/index.vue      | 36 +++++++++----------
 .../stockupMainRequest.data.ts                | 33 +++++++++++++----
 3 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
index a1bdacece..8d5aeea6c 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
@@ -302,7 +302,7 @@ 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
+   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,'jobDeliverMain')
 }
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
index a0d1bca2c..21dcd5810 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
@@ -149,7 +149,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           })
           if (res) tableData.value = res
           // 修改 tableform 属性
-          DeliverRequestDetail.allSchemas.tableFormColumns.map(item => {
+          StockupDetailRequest.allSchemas.tableFormColumns.map(item => {
             if(item.field == 'itemCode') {
               item.isInpuFocusShow = false
               item.tableForm.isInpuFocusShow = false
@@ -423,24 +423,24 @@ const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
   let isExist = false
   tableData.value.forEach(item => {
-  //  let rs =  tableData.value.filter(filterItem => (filterItem.itemCode == item.itemCode))
-  //  if(rs.length > 1) isExist = true
-  // })
-  // if (isExist) {
-  //   formRef.value.formLoading = false
-  //   return message.warning('物料代码重复')
-  // }
-  // data.subList.forEach(obj => {
-  //   if(obj.qty == 0){
-  //     message.warning(`数量不能为0!`)
-  //     flag.value = true
-  //     return;
-  //   }
+   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode == item.itemCode))
+   if(rs.length > 1) isExist = true
   })
-  // if(flag.value){
-  //   formRef.value.formLoading = false
-  //   return
-  // }
+  if (isExist) {
+    formRef.value.formLoading = false
+    return message.warning('物料代码重复')
+  }
+  data.subList.forEach(obj => {
+    if(obj.qty == 0){
+      message.warning(`数量不能为0!`)
+      flag.value = true
+      return;
+    }
+  })
+  if(flag.value){
+    formRef.value.formLoading = false
+    return
+  }
   try {
     if (formType === 'create') {
       if(tableData.value.length <= 0){
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index 89f3ebac7..59c7b7997 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -4,15 +4,15 @@ import { TableColumn } from '@/types/table'
 import { dateFormatter } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
-import * as BalanceApi  from '@/api/wms/balance'
-import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
-
 import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain'
 import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMain.data'
 
 import * as  locationApi from '@/api/wms/location'
 import { Location } from '../../../basicDataManage/factoryModeling/location/location.data'
 
+import * as  ItemBasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '../../../basicDataManage/itemManage/itembasic/itembasic.data'
+
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -26,6 +26,7 @@ const queryParams = {
 
   // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
+import { ItemBasic } from '@/utils/disposition/formFields'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
  // id 转str 否则form回显匹配不到
@@ -569,12 +570,32 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '物料基础信息',
+      searchAllSchemas: Itembasic.allSchemas,
+      searchPage: ItemBasicApi.getItembasicPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
     },
     form: {
       componentProps: {
-        disabled: true
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '物料基础信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItemBasicApi.getItembasicPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
       }
     }
   },

From 085c894a019c02bb8a440286448450c1d9e6beef Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 22 Mar 2024 15:38:22 +0800
Subject: [PATCH 43/65] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/dict/dict.data.ts      |  7 ++++++-
 src/views/infra/config/ConfigForm.vue | 26 +++++++++++++++++++++++-
 src/views/infra/config/index.vue      | 29 ++++++++++++++++++++-------
 3 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/src/api/system/dict/dict.data.ts b/src/api/system/dict/dict.data.ts
index 87e7dce71..faa0dca0f 100644
--- a/src/api/system/dict/dict.data.ts
+++ b/src/api/system/dict/dict.data.ts
@@ -23,8 +23,13 @@ export const getDictDataPage = (params: PageParam) => {
   return request.get({ url: '/system/dict-data/page', params })
 }
 
+// 查询字典数据列表根据类型
+export const queryByDictType = (dictType: number) => {
+  return request.get({ url: '/system/dict-data/queryByDictType?dictType=' + dictType })
+}
+
 // 查询字典数据详情
-export const getDictData = (id: number) => {
+export const getDictData = (id: string) => {
   return request.get({ url: '/system/dict-data/get?id=' + id })
 }
 
diff --git a/src/views/infra/config/ConfigForm.vue b/src/views/infra/config/ConfigForm.vue
index 19b5bf1ea..e8a7bac26 100644
--- a/src/views/infra/config/ConfigForm.vue
+++ b/src/views/infra/config/ConfigForm.vue
@@ -19,6 +19,21 @@
       <el-form-item label="参数键值" prop="value">
         <el-input v-model="formData.value" placeholder="请输入参数键值" />
       </el-form-item>
+      <el-form-item label="物料类型">
+        <el-select v-model="formData.itemTypeList" multiple placeholder="配置物料类型">
+          <el-option v-for="item in getStrDictOptions(DICT_TYPE.ITEM_TYPE)" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="库区类型">
+        <el-select v-model="formData.areaTypeList" multiple placeholder="库区类型">
+          <el-option v-for="item in getStrDictOptions(DICT_TYPE.AREA_TYPE)" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="库存状态">
+        <el-select v-model="formData.inventoryStatusList" multiple placeholder="库存状态">
+          <el-option v-for="item in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="是否可见" prop="visible">
         <el-radio-group v-model="formData.visible">
           <el-radio
@@ -41,7 +56,7 @@
   </Dialog>
 </template>
 <script lang="ts" setup>
-import { DICT_TYPE, getBoolDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getBoolDictOptions,getStrDictOptions } from '@/utils/dict'
 import * as ConfigApi from '@/api/infra/config'
 
 defineOptions({ name: 'InfraConfigForm' })
@@ -59,6 +74,9 @@ const formData = ref({
   name: '',
   key: '',
   value: '',
+  itemTypeList:'',
+  areaTypeList:'',
+  inventoryStatusList:'',
   visible: true,
   remark: ''
 })
@@ -70,6 +88,9 @@ const formRules = reactive({
   visible: [{ required: true, message: '是否可见不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
+// const itemTypeList = ref([]) // 物料类型列表
+
+
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
@@ -123,6 +144,9 @@ const resetForm = () => {
     name: '',
     key: '',
     value: '',
+    itemTypeList:'',
+    areaTypeList:'',
+    inventoryStatusList:'',
     visible: true,
     remark: ''
   }
diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue
index 85b4fc991..c4835d17f 100644
--- a/src/views/infra/config/index.vue
+++ b/src/views/infra/config/index.vue
@@ -40,22 +40,37 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="参数主键" align="center" prop="id" />
-      <el-table-column label="参数分类" align="center" prop="category" />
-      <el-table-column label="参数名称" align="center" prop="name" :show-overflow-tooltip="true" />
-      <el-table-column label="参数键名" align="center" prop="key" :show-overflow-tooltip="true" />
-      <el-table-column label="参数键值" align="center" prop="value" />
+      <el-table-column label="参数主键" align="left" prop="id"  :width="100"/>
+      <el-table-column label="参数分类" align="left" prop="category" :width="150"/>
+      <el-table-column label="参数名称" align="left" prop="name" :show-overflow-tooltip="true" :width="200"/>
+      <el-table-column label="参数键名" align="left" prop="key" :show-overflow-tooltip="true" :width="250"/>
+      <el-table-column label="参数键值" align="left" prop="value" :width="200"/>
+      <el-table-column label="物料类型" align="left" prop="itemType" :width="250">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ITEM_TYPE" :value="scope.row.itemType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="库区类型" align="left" prop="areaType" :width="250">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.AREA_TYPE" :value="scope.row.areaType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="库存状态" align="left" prop="inventoryStatus" :width="250">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INVENTORY_STATUS" :value="scope.row.inventoryStatus" />
+        </template>
+      </el-table-column>  
       <el-table-column label="是否可见" align="center" prop="visible">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.visible" />
         </template>
       </el-table-column>
-      <el-table-column label="系统内置" align="center" prop="type">
+      <el-table-column label="系统内置" align="center" prop="type" :width="150">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.INFRA_CONFIG_TYPE" :value="scope.row.type" />
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" :width="150"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
       <el-table-column label="操作" align="center" fixed="right" width="180">
         <template #default="scope">

From 11165bba4919dfc98793b7df6e3bd6a98a389829 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Fri, 22 Mar 2024 15:40:57 +0800
Subject: [PATCH 44/65] =?UTF-8?q?1=E3=80=81=E7=BB=91=E5=AE=9A=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/workstation/index.ts              |  18 +-
 src/components/workstationBind/index.ts       |   5 +-
 src/components/workstationBind/src/Detail.vue | 202 +++++++++++-------
 3 files changed, 136 insertions(+), 89 deletions(-)

diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts
index cc75e6142..b950fd776 100644
--- a/src/api/mes/workstation/index.ts
+++ b/src/api/mes/workstation/index.ts
@@ -6,7 +6,9 @@ export interface WorkstationVO {
   expireTime: Date
   name: string
 }
-
+export const goalParams = {
+  workstationCode:null
+}
 // 查询工位列表
 export const getWorkstationPage = async (params) => {
   if (params.isSearch) {
@@ -49,21 +51,25 @@ export const importTemplate = () => {
 }
 // 查询班组列表
 export const getTeamPage = async (params) => {
+  console.log(goalParams.workstationCode)
+  params.workstationCode = goalParams.workstationCode
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/team/senior', data })
+    return await request.post({ url: '/mes/team/senior', data })
   } else {
-    return await request.get({ url: `/wms/team/page`, params })
+    return await request.get({ url: `/mes/team/pageListByWorkstationCode`, params })
   }
 }
 export const getEquipmentPage = async (params) => {
+  console.log(goalParams.workstationCode)
+  params.workstationCode = goalParams.workstationCode
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
     return await request.post({ url: '/mes/equipment/senior', data })
   } else {
-    return await request.get({ url: `/mes/equipment/page`, params })
+    return await request.get({ url: `/mes/equipment/pageListByWorkstationCode`, params })
   }
 }
 export const getProcessPage = async (params) => {
@@ -72,7 +78,7 @@ export const getProcessPage = async (params) => {
     const data = {...params}
     return await request.post({ url: '/wms/process/senior', data })
   } else {
-    return await request.get({ url: `/wms/process/page`, params })
+    return await request.get({ url: `/wms/process/pageListByWorkstationCode`, params })
   }
 }
 export const getProductionPage = async (params) => {
@@ -81,6 +87,6 @@ export const getProductionPage = async (params) => {
     const data = {...params}
     return await request.post({ url: '/wms/production/senior', data })
   } else {
-    return await request.get({ url: `/wms/production/page`, params })
+    return await request.get({ url: `/wms/production/pageListByWorkstationCode`, params })
   }
 }
diff --git a/src/components/workstationBind/index.ts b/src/components/workstationBind/index.ts
index e7d199c89..d3fcb5cad 100644
--- a/src/components/workstationBind/index.ts
+++ b/src/components/workstationBind/index.ts
@@ -1,2 +1,3 @@
-import detail from './src/Detail.vue'
-export {detail }
+import Detail from './src/Detail.vue'
+
+export { Detail }
diff --git a/src/components/workstationBind/src/Detail.vue b/src/components/workstationBind/src/Detail.vue
index 5b39f255b..899d5fc31 100644
--- a/src/components/workstationBind/src/Detail.vue
+++ b/src/components/workstationBind/src/Detail.vue
@@ -12,72 +12,109 @@
           {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
         </div>
       </template>
-      <ContentWrap>
-        <!-- 默认单表展现 -->
+      <ContentWrap v-if="!isBasic">
         <Descriptions
           :data="detailData"
+          labelClassName="label-class-name"
+          label-align="left"
+          direction="vertical"
+          :column="8"
           :schema="allSchemas.detailSchema"
           :columns="2"
+          width="200px"
         />
       </ContentWrap>
 
-      <Tabs :tabsList="TabsList" :current="current" @change="change" />
+      <Tabs :tabsList="tabsList" :current="current" @change="change" />
       <div class="flex">
         <!-- 详情 -->
-        <ContentWrap class="w-[100%]">
+        <ContentWrap class="w-[73%]">
+          <!-- 列表头部 -->
+          <TableHead
+            v-if="!isBasic"
+            :HeadButttondata="HeadButttondata"
+            :masterId="masterParmas.masterId"
+            @button-base-click="buttonBaseClick"
+            :routeName="routeName"
+            @searchFormClick="searchFormClick"
+            :allSchemas="detailAllSchemas"
+          />
+          <!-- 默认单表展现 -->
+          <Descriptions
+            v-if="isBasic && !tabsExtend"
+            :data="detailData"
+            :schema="allSchemas.detailSchema"
+            :columns="2"
+          />
           <!-- 单表切换tabs 展现table -->
           <Table
             v-if="isBasic && tabsExtend"
-            :columns="teamSchemasRef.tableColumns"
-            :data="teamObjectRef.tableList"
-            :loading="teamObjectRef.loading"
-            :pagination="{ total: teamObjectRef.total }"
-            v-model:pageSize="teamObjectRef.pageSize"
-            v-model:currentPage="teamObjectRef.currentPage"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :loading="tableObjectRef.loading"
+            :pagination="{ total: tableObjectRef.total }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
           >
-            <template>
-              <div>1</div>
-            </template>
+            <!-- <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template> -->
           </Table>
           <Table
-            v-if="!isBasic && fromeWhere != 'Equipment'"
-            :columns="teamSchemasRef.tableColumns"
-            :data="teamObjectRef.tableList"
-            :loading="teamObjectRef.loading"
-            :pagination="{ total: teamObjectRef.total }"
-            v-model:pageSize="teamObjectRef.pageSize"
-            v-model:currentPage="teamObjectRef.currentPage"
+            v-if="!isBasic && fromeWhere != 'countPlan'"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :loading="tableObjectRef.loading"
+            :pagination="{ total: tableObjectRef.total }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
           >
-            <template>
-              <div>1</div>
+          <template #photos="{ row }">
+             <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div>
             </template>
-          </Table>
-          <Table
-            v-if="!isBasic && fromeWhere != 'Process'"
-            :columns="teamSchemasRef.tableColumns"
-            :data="teamObjectRef.tableList"
-            :loading="teamObjectRef.loading"
-            :pagination="{ total: teamObjectRef.total }"
-            v-model:pageSize="teamObjectRef.pageSize"
-            v-model:currentPage="teamObjectRef.currentPage"
-          >
-            <template>
-              <div>1</div>
+            <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
             </template>
           </Table>
           <DetailTable
-            v-if="!isBasic && fromeWhere == 'Production' && isShowDrawer"
-            :columns="teamSchemasRef.tableColumns"
-            :data="teamObjectRef.tableList"
+            v-if="!isBasic && fromeWhere == 'countPlan' && isShowDrawer"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
             :allList="allList"
             :countScopeType="countScopeType"
             :key="updateKey"
           >
-            <template>
-              <div>1</div>
+            <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
             </template>
           </DetailTable>
         </ContentWrap>
+        <ContentWrap class="w-[27%] ml-16px">
+          <!-- 附件组件 -->
+          <Annex
+            :annexData="annexData"
+            @handleAnnexSuccess="handleAnnexSuccess"
+            @deleteAnnexSuccess="deleteAnnexSuccess"
+            :upData="remarksData.data"
+          />
+          <!-- 备注组件 -->
+          <Remarks
+            :remarksData="remarksData"
+            class="mt-20px"
+            @remarksSubmitScuess="remarksSubmitScuess"
+          />
+          <!-- 变更记录组件 -->
+          <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px" />
+        </ContentWrap>
       </div>
     </el-drawer>
     <!-- 表单弹窗：添加/修改 -->
@@ -105,19 +142,16 @@
 </template>
 
 <script lang="ts" setup>
+import Annex from '@/components/Annex/src/Annex.vue'
+import Remarks from '@/components/Remarks/src/Remarks.vue'
+import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
+import Tabs from '@/components/Tabs/src/Tabs.vue'
 import * as RemarkApi from '@/api/wms/remark'
 import * as FileApi from '@/api/wms/file'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import Detail from "@/components/workstationBind/src/Detail.vue";
-import {TabsList} from "@/views/mes/workstation/workstation.data";
-import DetailTable from "@/components/DetailTable/src/DetailTable.vue";
-import Tabs from "@/components/Tabs/src/Tabs.vue";
-import Annex from "@/components/Annex/src/Annex.vue";
-import Remarks from "@/components/Remarks/src/Remarks.vue";
-import BasicForm from "@/components/BasicForm/src/BasicForm.vue";
-import TableHead from "@/components/TableHead/src/TableHead.vue";
-import ChangeRecord from "@/components/ChangeRecord/src/ChangeRecord.vue";
-import {Team} from "@/utils/disposition/formFields";
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
 
 defineOptions({ name: 'Detail' })
 
@@ -143,12 +177,6 @@ const props = defineProps({
     required: false,
     default: false
   },
-  // 列表 相关信息
-  tableAllSchemas: {
-    type: Array,
-    required: true,
-    default: null
-  },
   // 表单，列表 相关信息
   allSchemas: {
     type: Object,
@@ -270,11 +298,6 @@ const props = defineProps({
     type: Boolean,
     required: false,
     default: true
-  },
-  teamSchemas:{
-    type: Boolean,
-    required: false,
-    default: true
   }
 })
 const isShowDrawer = ref(false)
@@ -374,7 +397,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
     masterParmas.value.masterId = row.id
     masterParmas.value.number = row.number
     masterParmas.value.status = row.status
-    teamObjectRef.value.params = {
+    tableObjectRef.value.params = {
       masterId: row.id
     }
     await getList()
@@ -439,10 +462,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
   }
 }
 defineExpose({ openDetail, formRef }) // 提供 open 方法，用于打开弹窗
-// tabs 切换事件
-const changeTabs = (item) => {
-  alert(item.value)
-}
+
 // 获取备注列表
 const getRemarkList = async () => {
   detailLoading.value = true
@@ -462,19 +482,18 @@ const remarksSubmitScuess = async (remark) => {
 const getChangeRecordList = async () => {
   changeRecordData.changeRecordList = await RemarkApi.getChangeRecordPage(remarksData.data)
 }
+
+const tableObjectRef = ref()
+const tableMethodsRef = ref()
 const detailAllSchemasRef = ref()
-detailAllSchemasRef.value = props.detailAllSchemas
-const teamObjectRef = ref()
-const teamMethodsRef = ref()
-const teamSchemasRef = ref()
 
 const { tableObject, tableMethods } = useTable({
   getListApi: props.apiPage // 分页接口
 })
 
-teamObjectRef.value = tableObject
-teamMethodsRef.value = tableMethods
-teamSchemasRef.value = props.teamSchemas
+tableObjectRef.value = tableObject
+tableMethodsRef.value = tableMethods
+detailAllSchemasRef.value = props.detailAllSchemas
 
 // 根据状态返回该按钮是否显示
 const isShowMainButton = (row, val) => {
@@ -486,8 +505,29 @@ const isShowMainButton = (row, val) => {
 }
 
 // 获得表格的各种操作
-const { getList } = teamMethodsRef.value
+const { getList } = tableMethodsRef.value
 
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
 
 // 字段设置 更新主列表字段
 // const updataTableColumns = (val) => {
@@ -576,9 +616,9 @@ const searchFormClick = async (searchData) => {
       : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
   }
   detailAllSchemasRef.value = props.detailAllSchemas
-  teamObjectRef.value = tableObject
-  teamMethodsRef.value = tableMethods
-  teamObjectRef.value.tableList = []
+  tableObjectRef.value = tableObject
+  tableMethodsRef.value = tableMethods
+  tableObjectRef.value.tableList = []
   const { getList } = tableMethods
   await getList()
   updateKey.value += 1
@@ -603,16 +643,16 @@ const openImage=(item)=>{
  * @param field 当前操作字段
  * @param cur 改变后值
  */
-const detailBasicFormOnChange = (field, cur) => {
+ const detailBasicFormOnChange = (field, cur) => {
   emit('detailBasicFormOnChange', field, cur)
 }
 
 /**
  * 监听失焦事件
  * @param field 当前操作字段
- * @param e
+ * @param e 
  */
-const onBlur = (field, e) => {
+ const onBlur = (field, e) => {
   emit('onBlur', field, e)
 }
 
@@ -634,8 +674,8 @@ watch(
         tableObject.params[item.key] = item.value
       })
     }
-    teamObjectRef.value = tableObject
-    teamMethodsRef.value = tableMethods
+    tableObjectRef.value = tableObject
+    tableMethodsRef.value = tableMethods
     const { getList } = tableMethods
     getList()
   }

From 853647367e3c321ccf5ea86e9a282e93a749098b Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Fri, 22 Mar 2024 15:50:26 +0800
Subject: [PATCH 45/65] =?UTF-8?q?1=E3=80=81=E7=BB=91=E5=AE=9A=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/workstation/index.vue | 71 +++++++++++++++--------------
 1 file changed, 37 insertions(+), 34 deletions(-)

diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue
index 0f84fe596..6cf463a0f 100644
--- a/src/views/mes/workstation/index.vue
+++ b/src/views/mes/workstation/index.vue
@@ -4,15 +4,15 @@
     <Search :schema="Workstation.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="Workstation.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Workstation.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -59,26 +59,34 @@
           :apiPage="apiPage"
           :tabs="TabsList"
           @changeTabs="changeTabs"
-          />
+  />
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/workstation/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import {TabsList, Team, Workstation, WorkstationRules} from './workstation.data'
+import {
+  Equipment,
+  Process,
+  Production,
+  TabsList,
+  Team,
+  Workstation,
+  WorkstationRules
+} from './workstation.data'
 import * as WorkstationApi from '@/api/mes/workstation'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import {
-  PurchasereceiptRecordDetail,
-  PurchasereceiptRecordDetailRules,
-  PurchasereceiptRecordMain
-} from "@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data";
-import {PurchasereceiptRequestTabsList} from "@/utils/disposition/tabsList";
 import * as PurchasereceiptRecordDetailApi from "@/api/wms/purchasereceiptRecordDetail";
-import {getEquipmentPage, getProcessPage, getProductionPage} from "@/api/mes/workstation";
+import {
+  getEquipmentPage,
+  getProcessPage,
+  getProductionPage,
+  goalParams,
+  params
+} from "@/api/mes/workstation";
 defineOptions({ name: 'Workstation' })
 
 const message = useMessage() // 消息弹窗
@@ -188,11 +196,6 @@ const formsSuccess = async (formType,data) => {
   getList()
 }
 
-/** 绑定操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkstation')
-}
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -252,31 +255,31 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await WorkstationApi.importTemplate()
 })
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  goalParams.workstationCode = row.code
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkstation')
+}
 // 子包装数据
-const teamRef = ref()
-const { tableObject: teamData, tableMethods: teamMethods } = useTable({
-  getListApi: WorkstationApi.getTeamPage
-})
-const { getList:teamList } = teamMethods
 const detailAllSchemas = ref(Team.allSchemas)
 const apiPage = ref(WorkstationApi.getTeamPage)
-const tabeKey = ref("workstationDetail");
+const tableKey = ref("workstationDetail");
 // tabs 切换事件
 const changeTabs = (data) =>{
+  tableKey.value = data.prop
   if(data.prop == 'Team'){
-    console.log(data)
     apiPage.value = WorkstationApi.getTeamPage
     detailAllSchemas.value = Team.allSchemas
   }else if(data.prop == 'Equipment'){
     apiPage.value = WorkstationApi.getEquipmentPage
-    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+    detailAllSchemas.value = Equipment.allSchemas
   }else if(data.prop == 'Process'){
     apiPage.value = WorkstationApi.getProcessPage
-    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+    detailAllSchemas.value = Process.allSchemas
   }else if(data.prop == 'Production'){
     apiPage.value = WorkstationApi.getProductionPage
-    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+    detailAllSchemas.value = Production.allSchemas
   }
-  tabeKey.value = data.prop
 }
 </script>

From d7ed368eb938bc5c189206b6cc064d493aa7ae66 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 22 Mar 2024 16:28:08 +0800
Subject: [PATCH 46/65] =?UTF-8?q?=E4=BB=8E=E9=85=8D=E7=BD=AE=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/infra/config/index.ts                  |  8 ++++++++
 .../workstation/workstation.data.ts            | 18 +++++++-----------
 .../productionlineitem.data.ts                 | 13 ++++---------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/api/infra/config/index.ts b/src/api/infra/config/index.ts
index 5ef59f33d..8942cde25 100644
--- a/src/api/infra/config/index.ts
+++ b/src/api/infra/config/index.ts
@@ -6,6 +6,9 @@ export interface ConfigVO {
   name: string
   key: string
   value: string
+  itemType: string
+  areaType: string
+  inventoryStatus: string
   type: number
   visible: boolean
   remark: string
@@ -27,6 +30,11 @@ export const getConfigKey = (configKey: string) => {
   return request.get({ url: '/infra/config/get-value-by-key?key=' + configKey })
 }
 
+// 根据参数键名查询参数值
+export const queryByKey = (configKey: string) => {
+  return request.get({ url: '/infra/config/queryByKey?key=' + configKey })
+}
+
 // 新增参数
 export const createConfig = (data: ConfigVO) => {
   return request.post({ url: '/infra/config/create', data })
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
index 6c6b6ee73..3b96a657c 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
@@ -1,7 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 
-import * as LocationApi from '@/api/wms/location'
 import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 
 import * as ProductionlineApi from '@/api/wms/productionline'
@@ -10,20 +9,17 @@ import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/prod
 import * as WorkshopApi from '@/api/wms/workshop'
 import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
 
-import * as getBusinesstypeApi  from '@/api/wms/businesstype/index'
+import * as confgiApi  from '@/api/infra/config'
 
 import * as WorkstationApi from '@/api/wms/workstation'
 
 import { validateYS } from '@/utils/validator'
 
-const queryParams = {
-  pageSize:10,
-  pageNo:1,
-  code:'WorkStation'
-}
+
 const { t } = useI18n() // 国际化
-const data = await getBusinesstypeApi.getBusinesstypePage(queryParams)
-const businesstypeData =data?.list[0]||{}
+const confgiDataOne = await confgiApi.queryByKey("WorkStation-IN")
+const confgiDataTwo = await confgiApi.queryByKey("WorkStation-OUT")
+
 /**
  * @returns {Array} 工位
  */
@@ -137,7 +133,7 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
         },
         {
           key: 'areaType',
-          value: businesstypeData.outAreaTypes,
+          value: confgiDataOne.areaType,
           isMainValue: false
         }]
       }
@@ -166,7 +162,7 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
         },
         {
           key: 'areaType',
-          value: businesstypeData.outAreaTypes,
+          value: confgiDataTwo.areaType,
           isMainValue: false
         }]
       }
diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
index 15e0c440d..1d3ce0f67 100644
--- a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
@@ -5,16 +5,11 @@ import { Productionline } from './../../factoryModeling/productionline/productio
 
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from './../itembasic/itembasic.data'
-import * as getBusinesstypeApi  from '@/api/wms/businesstype/index'
+import * as confgiApi  from '@/api/infra/config'
 const { t } = useI18n() // 国际化
 
-const queryParams = {
-  pageSize:10,
-  pageNo:1,
-  code:'Productionlineitem'
-}
-const data = await getBusinesstypeApi.getBusinesstypePage(queryParams)
-const businesstypeData =data?.list[0]||{}
+
+const confgiData = await confgiApi.queryByKey("Productionlineitem")
 
 /**
  * @returns {Array} 生产线物料关系
@@ -115,7 +110,7 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
         },
         {
           key:'type',
-          value:businesstypeData.itemTypes,
+          value:confgiData.itemType,
           action: 'notin',
           isSearch: true,
           isMainValue: false

From 479f3e2753f7aac89d152372486f13e06a211d53 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Fri, 22 Mar 2024 17:29:29 +0800
Subject: [PATCH 47/65] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E4=BD=8D=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=B7=A5=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/workstation/index.ts    | 8 ++++----
 src/views/mes/workstation/index.vue | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts
index b950fd776..7fe301a2d 100644
--- a/src/api/mes/workstation/index.ts
+++ b/src/api/mes/workstation/index.ts
@@ -76,17 +76,17 @@ export const getProcessPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/process/senior', data })
+    return await request.post({ url: '/mes/production-process/senior', data })
   } else {
-    return await request.get({ url: `/wms/process/pageListByWorkstationCode`, params })
+    return await request.get({ url: `/mes/production-process/pageListByWorkstationCode`, params })
   }
 }
 export const getProductionPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/production/senior', data })
+    return await request.post({ url: '/mes/production-process/senior', data })
   } else {
-    return await request.get({ url: `/wms/production/pageListByWorkstationCode`, params })
+    return await request.get({ url: `/mes/production-process/pageListByWorkstationCode`, params })
   }
 }
diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue
index 6cf463a0f..1aa880115 100644
--- a/src/views/mes/workstation/index.vue
+++ b/src/views/mes/workstation/index.vue
@@ -58,6 +58,8 @@
           :detailAllSchemasRules="WorkstationRules"
           :apiPage="apiPage"
           :tabs="TabsList"
+          :detailButtonIsShowAdd = "true"
+          :detailButtonIsShowDelete="true"
           @changeTabs="changeTabs"
   />
   <!-- 导入 -->
@@ -79,7 +81,6 @@ import * as WorkstationApi from '@/api/mes/workstation'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import * as PurchasereceiptRecordDetailApi from "@/api/wms/purchasereceiptRecordDetail";
 import {
   getEquipmentPage,
   getProcessPage,

From 5e7b7df95019f849523b52f8d3b341df10a9abad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 25 Mar 2024 10:18:12 +0800
Subject: [PATCH 48/65] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productionMain/index.ts           |  73 +-
 src/components/ImportForm/src/ImportForm.vue  |  11 +-
 src/utils/dict.ts                             |   1 +
 src/views/login/components/LoginForm.vue      |   3 +
 .../productionplan/productionMain/index.vue   |   5 +-
 .../productionMain/productionMain.data.ts     |  18 +
 .../productionMainAssemble/index.vue          | 492 ++++++++++
 .../productionMainAssemble.data.ts            | 894 ++++++++++++++++++
 .../productionMainAssembleSparePart/index.vue | 492 ++++++++++
 .../productionMainAssembleSparePart.data.ts   | 894 ++++++++++++++++++
 .../productionMainPredictSparePart/index.vue  | 492 ++++++++++
 .../productionMainPredictSparePart.data.ts    | 894 ++++++++++++++++++
 12 files changed, 4264 insertions(+), 5 deletions(-)
 create mode 100644 src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
 create mode 100644 src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
 create mode 100644 src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
 create mode 100644 src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
 create mode 100644 src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
 create mode 100644 src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts

diff --git a/src/api/wms/productionMain/index.ts b/src/api/wms/productionMain/index.ts
index a2e2fb76e..9e4fed120 100644
--- a/src/api/wms/productionMain/index.ts
+++ b/src/api/wms/productionMain/index.ts
@@ -24,6 +24,43 @@ export interface ProductionMainVO {
 
 // 查询生产计划主列表
 export const getProductionMainPage = async (params) => {
+  params.planType = 'predict'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/production-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/production-main/page`, params })
+  }
+}
+
+// 查询 —— 装配 主列表
+export const getProductionMainAssemblePage = async (params) => {
+  params.planType = 'assemble'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/production-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/production-main/page`, params })
+  }
+}
+
+// 查询 —— 预生产备件 主列表
+export const getProductionMainPredictSparePartPage = async (params) => {
+  params.planType = 'predictSparePart'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/production-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/production-main/page`, params })
+  }
+}
+
+// 查询 —— 装配备件 主列表
+export const getProductionMainASparePartPage = async (params) => {
+  params.planType = 'assembleSparePart'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
@@ -58,8 +95,42 @@ export const deleteProductionMain = async (id: number) => {
   return await request.delete({ url: `/wms/production-main/delete?id=` + id })
 }
 
-// 导出生产计划主 Excel
+// 导出预生产计划主 Excel
 export const exportProductionMain = async (params) => {
+  params.planType = 'predict'
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/production-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/production-main/export-excel`, params })
+  }
+}
+
+// 导出装配计划主 Excel
+export const exportProductionMainAssemble = async (params) => {
+  params.planType = 'assemble'
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/production-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/production-main/export-excel`, params })
+  }
+}
+
+// 导出装配备件计划主 Excel
+export const exportProductionMainPredictSparePart = async (params) => {
+  params.planType = 'predictSparePart'
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/production-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/production-main/export-excel`, params })
+  }
+}
+
+// 导出预生产备件计划主 Excel
+export const exportProductionMainAssembleSparePart = async (params) => {
+  params.planType = 'assembleSparePart'
   if (params.isSearch) {
     const data = {...params}
     return await request.downloadPost({ url: `/wms/production-main/export-excel-senior`, data })
diff --git a/src/components/ImportForm/src/ImportForm.vue b/src/components/ImportForm/src/ImportForm.vue
index d7dcd44d0..29ed5d067 100644
--- a/src/components/ImportForm/src/ImportForm.vue
+++ b/src/components/ImportForm/src/ImportForm.vue
@@ -14,6 +14,7 @@
         updatePart +
         '&outFile=' +
         outFile + 
+        '&extend=' + extend +
         '&fromInventoryStatus=' + fromInventoryStatus +
         '&toInventoryStatus=' + toInventoryStatus 
       "
@@ -171,13 +172,19 @@ const props = defineProps({
     required: false,
     default: false
   },
-  // 库存修改 扩展额外属性
+  // 扩展额外属性
+  extend: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  // 库存修改 扩展额外属性 TODO: 后续优化 业务限定属性应转为统一的额外扩展属性 此处不应该出现业务相关属性 cxm
   fromInventoryStatus: {
     type: String,
     required: false,
     default: ''
   },
-  // 库存修改 扩展额外属性
+  // 库存修改 扩展额外属性 TODO: 后续优化 业务限定属性应转为统一的额外扩展属性 此处不应该出现业务相关属性 cxm
   toInventoryStatus: {
     type: String,
     required: false,
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 4dc76cd96..a55244551 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -276,4 +276,5 @@ export enum DICT_TYPE {
   PACK_UNIT_TYPE = 'pack_unit_type', // 包装规格类型
   TRANSFER_REASON = 'transfer_reason', // 调拨出入库原因
   PURCHASERECEIPT_SOURCE_TYPE="purchasereceipt_source_type",//采购收货数据来源
+  PLAN_PRODUCTION_TYPE = "plan_production_type" // 生产计划类型
 }
diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index 6c235f45a..f442aaef1 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -182,6 +182,7 @@ const getCookie = () => {
 const loading = ref() // ElLoading.service 返回的实例
 // 登录
 const handleLogin = async (params) => {
+  console.log('登录-185')
   loginLoading.value = true
   try {
     await getTenantId()
@@ -191,6 +192,7 @@ const handleLogin = async (params) => {
     }
     const res = await LoginApi.login(loginData.loginForm)
     if (!res) {
+      console.log('登录-195')
       getCode()
       return
     }
@@ -219,6 +221,7 @@ const handleLogin = async (params) => {
     const { wsCache } = useCache()
     wsCache.set(CACHE_KEY.DEPT, await DeptApi.getSimpleDeptList())
   } finally {
+    console.log('登录-224')
     getCode()
     loginLoading.value = false
     loading.value.close()
diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index 088faf7b7..a622c2c4e 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -72,7 +72,7 @@
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/production-main/import" :importTemplateData="importTemplateData" 
-  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'predict'" />
 </template>
 
 <script setup lang="ts">
@@ -84,6 +84,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItemBasicApi from '@/api/wms/itembasic'
 
 // 生产计划主
+// 预生产计划
 defineOptions({ name: 'ProductionMain' })
 
 const message = useMessage() // 消息弹窗
@@ -409,7 +410,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionMainApi.exportProductionMain(tableObject.params)
-    download.excel(data, '生产计划.xlsx')
+    download.excel(data, '预生产计划.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index 4b65905b4..3b552367b 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -255,6 +255,24 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
+  {
+    label: '计划类型',
+    field: 'planType',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Select',
+      value: 'predict',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
new file mode 100644
index 000000000..fb0a7b699
--- /dev/null
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -0,0 +1,492 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductionMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductionMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :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 }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductionMainRules"
+    :formAllSchemas="ProductionMain.allSchemas"
+    :tableAllSchemas="ProductionDetail.allSchemas"
+    :tableFormRules="ProductionDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductionMainApi.updateProductionMain"
+    :apiCreate="ProductionMainApi.createProductionMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductionMain.allSchemas"
+    :detailAllSchemas="ProductionDetail.allSchemas"
+    :detailAllSchemasRules="ProductionDetailRules"
+    :apiCreate="ProductionDetailApi.createProductionDetail"
+    :apiUpdate="ProductionDetailApi.updateProductionDetail"
+    :apiPage="ProductionDetailApi.getProductionDetailPage"
+    :apiDelete="ProductionDetailApi.deleteProductionDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/production-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'assemble'"/>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductionMain,ProductionMainRules,ProductionDetail,ProductionDetailRules } from './productionMainAssemble.data'
+import * as ProductionMainApi from '@/api/wms/productionMain'
+import * as ProductionDetailApi from '@/api/wms/productionDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItemBasicApi from '@/api/wms/itembasic'
+
+// 装配计划
+defineOptions({ name: 'ProductionMainAssemble' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductionMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(async() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      await ItemBasicApi.getItembasicPage({
+        code: row['itemCode']
+      }).then(res => {
+        row['uom'] = res?.list[0].uom
+      }).catch(err =>{
+        console.log(err);
+      })
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      if(formField == 'workshop'){
+        setV['workshop'] = val[0]['code']
+        setV['productionLine'] = ''
+        if(tableData.value){
+          tableData.value.forEach(item => {
+            item.itemCode =''
+            item.bomVersion = ''
+            item.uom = ''
+          })
+        }
+      }else{
+        setV[formField] = val[0][searchField]
+      }
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(async() => {
+    const setV = {}
+    await ItemBasicApi.getItembasicPage({
+        code: setV['itemCode']
+      }).then(res => {
+        setV['uom'] = res.list[0].uom
+      }).catch(err =>{
+        console.log(err);
+      })
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionMainApi.getProductionMainAssemblePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:production-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:production-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:production-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 == '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) => {
+  return [
+    defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:production-main:open'}), // 打开
+    defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:production-main:close'}), // 关闭
+    defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:submit'}), // 提交审批
+    defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:production-main:reject'}), // 驳回
+    defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:production-main:agree'}), // 审批通过
+    defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:production-main:publish'}), // 发布
+    defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
+    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
+    // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
+    {
+      label: '生成备料计划/收货申请',
+      name: 'scbljh',
+      hide: isShowMainButton(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainPlanOpe') { // 打开
+    tableObject.loading = true
+    await ProductionMainApi.open(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanClo') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    await ProductionMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanSub') { // 提交审批
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    await ProductionMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanTur') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    await ProductionMainApi.reject(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanApp') { // 审批通过
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    await ProductionMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanPub') { // 发布
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要发布吗？')
+    // 物料含有不可用时 是否继续执行
+    let isAvailable = true
+    await ProductionMainApi.getProductionDetail(row.id).then(async res =>{
+      if (res.length > 0) {
+        let rs = ''
+        res.forEach(item => {
+          rs += item.itemCode + ','
+        })
+        await message.confirm('物料：【'+rs +'】目前为不可用状态，是否继续发布？').catch(() => {
+          isAvailable = false
+        })
+      }
+    })
+    if (!isAvailable) {
+      return
+    }
+    tableObject.loading = true
+    await ProductionMainApi.publish(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanRes') { // 重置
+    await message.confirm('确认要重置吗？')
+    tableObject.loading = true
+    await ProductionMainApi.resetting(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if(val == 'scbljh') {
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要生成备料计划/收货申请吗？')
+    tableObject.loading = true
+    await ProductionMainApi.generateRequest(row.number).then(() => {
+      message.success(t('common.createSuccess'))
+      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.id)
+  }
+  
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 新增与修改 修改车间和生产线的编辑属性
+  if(type == 'create'){
+    ProductionMain.allSchemas.formSchema.forEach((itemColumn) =>{
+      if(itemColumn.field == 'workshop'){
+        itemColumn.componentProps.isSearchList=true
+        itemColumn.componentProps.disabled=true
+      }
+      if(itemColumn.field == 'productionLine'){
+        itemColumn.componentProps.isSearchList=true
+        itemColumn.componentProps.disabled=true
+      }
+    })
+  }
+  if(type == 'update'){
+    ProductionMain.allSchemas.formSchema.forEach((itemColumn) =>{
+      if(itemColumn.field == 'workshop'){
+        itemColumn.componentProps.isSearchList=false
+        itemColumn.componentProps.disabled=true
+      }
+      if(itemColumn.field == 'productionLine'){
+        itemColumn.componentProps.isSearchList=false
+        itemColumn.componentProps.disabled=true
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'planProductionMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductionMainApi.deleteProductionMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+      tableObject.loading = false
+    }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionMainApi.exportProductionMainAssemble(tableObject.params)
+    download.excel(data, '装配计划.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductionDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  if(tableData.value.find(item => (item.planQty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      data.subList = tableData.value // 拼接子表数据参数
+      await ProductionMainApi.createProductionMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductionMainApi.updateProductionMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '装配计划导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductionMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
new file mode 100644
index 000000000..585255287
--- /dev/null
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -0,0 +1,894 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as WorkMainApi from '@/api/wms/workMain'
+import * as WorkDetailApi from '@/api/wms/workDetail'
+import { WorkDetail, WorkMain } from '../workMain/workMain.data'
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+import * as ShiftApi from '@/api/wms/shift'
+import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+import * as TeamApi from '@/api/wms/team'
+import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+import * as BomApi from '@/api/wms/bom'
+import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+
+import * as getPlansettingApi  from '@/api/wms/plansetting/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductionPlan'
+}
+ const data = await getPlansettingApi.getPlansettingPage(queryParams)
+ const plansettingData =data?.list[0]||{}
+
+/**
+ * @returns {Array} 生产计划主表
+ */
+export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.PLAN_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    // form: {
+    //   value: '1',
+    //   componentProps: {
+    //     disabled: true
+    //   }
+    // },
+    isForm:false,
+    isSearch: true,
+  },
+  {
+    label: '顺序',
+    field: 'displayOrder',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        maxlength: 50
+      }
+    }
+  },
+  {
+    label: '车间',
+    field: 'workshop',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择车间',
+        searchField: 'code',
+        searchTitle: '车间信息',
+        searchAllSchemas: Workshop.allSchemas,
+        searchPage: WorkshopApi.getWorkshopPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '生产线',
+    field: 'productionLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Productionline.allSchemas,
+        searchPage: ProductionlineApi.getProductionlinePage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshop',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班次',
+        searchField: 'code',
+        searchTitle: '班次信息',
+        searchAllSchemas: Shift.allSchemas,
+        searchPage: ShiftApi.getShiftPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班组',
+        searchField: 'code',
+        searchTitle: '班组信息',
+        searchAllSchemas: Team.allSchemas,
+        searchPage: TeamApi.getTeamPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ProductReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '计划类型',
+    field: 'planType',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Select',
+      value: 'assemble',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+
+  // {
+  //   label: '开始时间',
+  //   field: 'beginTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '结束时间',
+  //   field: 'endTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '订单号',
+  //   field: 'woNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择订单号',
+  //       searchField: 'number',
+  //       searchTitle: '生产订单信息',
+  //       searchAllSchemas: WorkMain.allSchemas,
+  //       searchPage: WorkMainApi.getWorkMainPage
+  //     }
+  //   },
+  //   isTable: false,
+  //   isForm: false,
+  // },
+  // {
+  //   label: '订单行',
+  //   field: 'woLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择订单行',
+  //       searchField: 'lineNumber',
+  //       searchTitle: '生产订单信息',
+  //       searchAllSchemas: WorkDetail.allSchemas,
+  //       searchPage: WorkDetailApi.getWorkDetailPage
+  //     }
+  //   },
+  //   isTable: false,
+  //   isForm: false,
+  // },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 220,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductionMainRules = reactive({
+  displayOrder: [
+    { required: true, message: '请输入顺序', trigger: 'blur' },
+    // { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  workshop: [
+    { required: true, message: '请选择车间', trigger: 'change' }
+  ],
+  productionLine: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ],
+  shift: [
+    { required: true, message: '请选择班次', trigger: 'change' }
+  ],
+  team: [
+    { required: true, message: '请选择班组', trigger: 'change' }
+  ],
+  planDate: [
+    { required: true, message: '请输入计划日期', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  beginTime: [
+    { required: true, message: '请输入开始时间', trigger: 'blur' }
+  ],
+  endTime: [
+    { required: true, message: '请输入结束时间', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 生产计划子表
+ */
+export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '生产线物料关系信息', // 查询弹窗标题
+        searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'productionLine',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productionLineCode',
+        value:'productionLine',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }], 
+    },
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+  },
+  {
+    label: '合格数量',
+    field: 'goodQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '不合格数量',
+    field: 'notGoodQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type: 'Select'
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      default: 'TRUE'
+    },
+    // isTableForm: false,
+    // isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductionDetailRules = reactive({
+  bomVersion: [
+    { required: true, message: '请输入Bom版本', trigger: 'blur' }
+  ],
+  // goodQty: [
+  //   { required: true, message: '请输入合格数量', trigger: 'blur' }
+  // ],
+  // notGoodQty: [
+  //   { required: true, message: '请输入不合格数量', trigger: 'blur' }
+  // ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  planQty: [
+    { required: true, message: '请输入计划数量', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
new file mode 100644
index 000000000..3f5092e1a
--- /dev/null
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@@ -0,0 +1,492 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductionMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductionMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :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 }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductionMainRules"
+    :formAllSchemas="ProductionMain.allSchemas"
+    :tableAllSchemas="ProductionDetail.allSchemas"
+    :tableFormRules="ProductionDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductionMainApi.updateProductionMain"
+    :apiCreate="ProductionMainApi.createProductionMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductionMain.allSchemas"
+    :detailAllSchemas="ProductionDetail.allSchemas"
+    :detailAllSchemasRules="ProductionDetailRules"
+    :apiCreate="ProductionDetailApi.createProductionDetail"
+    :apiUpdate="ProductionDetailApi.updateProductionDetail"
+    :apiPage="ProductionDetailApi.getProductionDetailPage"
+    :apiDelete="ProductionDetailApi.deleteProductionDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/production-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'assembleSparePart'"/>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductionMain,ProductionMainRules,ProductionDetail,ProductionDetailRules } from './productionMainAssembleSparePart.data'
+import * as ProductionMainApi from '@/api/wms/productionMain'
+import * as ProductionDetailApi from '@/api/wms/productionDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItemBasicApi from '@/api/wms/itembasic'
+
+// 装配备件计划
+defineOptions({ name: 'ProductionMainASparePart' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductionMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(async() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      await ItemBasicApi.getItembasicPage({
+        code: row['itemCode']
+      }).then(res => {
+        row['uom'] = res?.list[0].uom
+      }).catch(err =>{
+        console.log(err);
+      })
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      if(formField == 'workshop'){
+        setV['workshop'] = val[0]['code']
+        setV['productionLine'] = ''
+        if(tableData.value){
+          tableData.value.forEach(item => {
+            item.itemCode =''
+            item.bomVersion = ''
+            item.uom = ''
+          })
+        }
+      }else{
+        setV[formField] = val[0][searchField]
+      }
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(async() => {
+    const setV = {}
+    await ItemBasicApi.getItembasicPage({
+        code: setV['itemCode']
+      }).then(res => {
+        setV['uom'] = res.list[0].uom
+      }).catch(err =>{
+        console.log(err);
+      })
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionMainApi.getProductionMainASparePartPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:production-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:production-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:production-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 == '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) => {
+  return [
+    defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:production-main:open'}), // 打开
+    defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:production-main:close'}), // 关闭
+    defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:submit'}), // 提交审批
+    defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:production-main:reject'}), // 驳回
+    defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:production-main:agree'}), // 审批通过
+    defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:production-main:publish'}), // 发布
+    defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
+    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
+    // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
+    {
+      label: '生成备料计划/收货申请',
+      name: 'scbljh',
+      hide: isShowMainButton(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainPlanOpe') { // 打开
+    tableObject.loading = true
+    await ProductionMainApi.open(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanClo') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    await ProductionMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanSub') { // 提交审批
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    await ProductionMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanTur') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    await ProductionMainApi.reject(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanApp') { // 审批通过
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    await ProductionMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanPub') { // 发布
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要发布吗？')
+    // 物料含有不可用时 是否继续执行
+    let isAvailable = true
+    await ProductionMainApi.getProductionDetail(row.id).then(async res =>{
+      if (res.length > 0) {
+        let rs = ''
+        res.forEach(item => {
+          rs += item.itemCode + ','
+        })
+        await message.confirm('物料：【'+rs +'】目前为不可用状态，是否继续发布？').catch(() => {
+          isAvailable = false
+        })
+      }
+    })
+    if (!isAvailable) {
+      return
+    }
+    tableObject.loading = true
+    await ProductionMainApi.publish(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanRes') { // 重置
+    await message.confirm('确认要重置吗？')
+    tableObject.loading = true
+    await ProductionMainApi.resetting(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if(val == 'scbljh') {
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要生成备料计划/收货申请吗？')
+    tableObject.loading = true
+    await ProductionMainApi.generateRequest(row.number).then(() => {
+      message.success(t('common.createSuccess'))
+      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.id)
+  }
+  
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 新增与修改 修改车间和生产线的编辑属性
+  if(type == 'create'){
+    ProductionMain.allSchemas.formSchema.forEach((itemColumn) =>{
+      if(itemColumn.field == 'workshop'){
+        itemColumn.componentProps.isSearchList=true
+        itemColumn.componentProps.disabled=true
+      }
+      if(itemColumn.field == 'productionLine'){
+        itemColumn.componentProps.isSearchList=true
+        itemColumn.componentProps.disabled=true
+      }
+    })
+  }
+  if(type == 'update'){
+    ProductionMain.allSchemas.formSchema.forEach((itemColumn) =>{
+      if(itemColumn.field == 'workshop'){
+        itemColumn.componentProps.isSearchList=false
+        itemColumn.componentProps.disabled=true
+      }
+      if(itemColumn.field == 'productionLine'){
+        itemColumn.componentProps.isSearchList=false
+        itemColumn.componentProps.disabled=true
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'planProductionMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductionMainApi.deleteProductionMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+      tableObject.loading = false
+    }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionMainApi.exportProductionMainAssembleSparePart(tableObject.params)
+    download.excel(data, '装配备件计划.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductionDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  if(tableData.value.find(item => (item.planQty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      data.subList = tableData.value // 拼接子表数据参数
+      await ProductionMainApi.createProductionMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductionMainApi.updateProductionMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '装配备件计划导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductionMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
new file mode 100644
index 000000000..75a66d8d8
--- /dev/null
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@@ -0,0 +1,894 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as WorkMainApi from '@/api/wms/workMain'
+import * as WorkDetailApi from '@/api/wms/workDetail'
+import { WorkDetail, WorkMain } from '../workMain/workMain.data'
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+import * as ShiftApi from '@/api/wms/shift'
+import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+import * as TeamApi from '@/api/wms/team'
+import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+import * as BomApi from '@/api/wms/bom'
+import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+
+import * as getPlansettingApi  from '@/api/wms/plansetting/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductionPlan'
+}
+ const data = await getPlansettingApi.getPlansettingPage(queryParams)
+ const plansettingData =data?.list[0]||{}
+
+/**
+ * @returns {Array} 生产计划主表
+ */
+export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.PLAN_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    // form: {
+    //   value: '1',
+    //   componentProps: {
+    //     disabled: true
+    //   }
+    // },
+    isForm:false,
+    isSearch: true,
+  },
+  {
+    label: '顺序',
+    field: 'displayOrder',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        maxlength: 50
+      }
+    }
+  },
+  {
+    label: '车间',
+    field: 'workshop',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择车间',
+        searchField: 'code',
+        searchTitle: '车间信息',
+        searchAllSchemas: Workshop.allSchemas,
+        searchPage: WorkshopApi.getWorkshopPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '生产线',
+    field: 'productionLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Productionline.allSchemas,
+        searchPage: ProductionlineApi.getProductionlinePage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshop',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班次',
+        searchField: 'code',
+        searchTitle: '班次信息',
+        searchAllSchemas: Shift.allSchemas,
+        searchPage: ShiftApi.getShiftPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班组',
+        searchField: 'code',
+        searchTitle: '班组信息',
+        searchAllSchemas: Team.allSchemas,
+        searchPage: TeamApi.getTeamPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ProductReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '计划类型',
+    field: 'planType',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Select',
+      value: 'assembleSparePart',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+
+  // {
+  //   label: '开始时间',
+  //   field: 'beginTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '结束时间',
+  //   field: 'endTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '订单号',
+  //   field: 'woNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择订单号',
+  //       searchField: 'number',
+  //       searchTitle: '生产订单信息',
+  //       searchAllSchemas: WorkMain.allSchemas,
+  //       searchPage: WorkMainApi.getWorkMainPage
+  //     }
+  //   },
+  //   isTable: false,
+  //   isForm: false,
+  // },
+  // {
+  //   label: '订单行',
+  //   field: 'woLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择订单行',
+  //       searchField: 'lineNumber',
+  //       searchTitle: '生产订单信息',
+  //       searchAllSchemas: WorkDetail.allSchemas,
+  //       searchPage: WorkDetailApi.getWorkDetailPage
+  //     }
+  //   },
+  //   isTable: false,
+  //   isForm: false,
+  // },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 220,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductionMainRules = reactive({
+  displayOrder: [
+    { required: true, message: '请输入顺序', trigger: 'blur' },
+    // { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  workshop: [
+    { required: true, message: '请选择车间', trigger: 'change' }
+  ],
+  productionLine: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ],
+  shift: [
+    { required: true, message: '请选择班次', trigger: 'change' }
+  ],
+  team: [
+    { required: true, message: '请选择班组', trigger: 'change' }
+  ],
+  planDate: [
+    { required: true, message: '请输入计划日期', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  beginTime: [
+    { required: true, message: '请输入开始时间', trigger: 'blur' }
+  ],
+  endTime: [
+    { required: true, message: '请输入结束时间', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 生产计划子表
+ */
+export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '生产线物料关系信息', // 查询弹窗标题
+        searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'productionLine',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productionLineCode',
+        value:'productionLine',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }], 
+    },
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+  },
+  {
+    label: '合格数量',
+    field: 'goodQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '不合格数量',
+    field: 'notGoodQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type: 'Select'
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      default: 'TRUE'
+    },
+    // isTableForm: false,
+    // isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductionDetailRules = reactive({
+  bomVersion: [
+    { required: true, message: '请输入Bom版本', trigger: 'blur' }
+  ],
+  // goodQty: [
+  //   { required: true, message: '请输入合格数量', trigger: 'blur' }
+  // ],
+  // notGoodQty: [
+  //   { required: true, message: '请输入不合格数量', trigger: 'blur' }
+  // ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  planQty: [
+    { required: true, message: '请输入计划数量', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
new file mode 100644
index 000000000..c49c0cd21
--- /dev/null
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@@ -0,0 +1,492 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductionMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductionMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :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 }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductionMainRules"
+    :formAllSchemas="ProductionMain.allSchemas"
+    :tableAllSchemas="ProductionDetail.allSchemas"
+    :tableFormRules="ProductionDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductionMainApi.updateProductionMain"
+    :apiCreate="ProductionMainApi.createProductionMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductionMain.allSchemas"
+    :detailAllSchemas="ProductionDetail.allSchemas"
+    :detailAllSchemasRules="ProductionDetailRules"
+    :apiCreate="ProductionDetailApi.createProductionDetail"
+    :apiUpdate="ProductionDetailApi.updateProductionDetail"
+    :apiPage="ProductionDetailApi.getProductionDetailPage"
+    :apiDelete="ProductionDetailApi.deleteProductionDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/production-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2"  :extend="'assembleSparePart'"/>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductionMain,ProductionMainRules,ProductionDetail,ProductionDetailRules } from './productionMainPredictSparePart.data'
+import * as ProductionMainApi from '@/api/wms/productionMain'
+import * as ProductionDetailApi from '@/api/wms/productionDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItemBasicApi from '@/api/wms/itembasic'
+
+// 预生产备件计划
+defineOptions({ name: 'ProductionMainPredictSparePart' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductionMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(async() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      await ItemBasicApi.getItembasicPage({
+        code: row['itemCode']
+      }).then(res => {
+        row['uom'] = res?.list[0].uom
+      }).catch(err =>{
+        console.log(err);
+      })
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      if(formField == 'workshop'){
+        setV['workshop'] = val[0]['code']
+        setV['productionLine'] = ''
+        if(tableData.value){
+          tableData.value.forEach(item => {
+            item.itemCode =''
+            item.bomVersion = ''
+            item.uom = ''
+          })
+        }
+      }else{
+        setV[formField] = val[0][searchField]
+      }
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(async() => {
+    const setV = {}
+    await ItemBasicApi.getItembasicPage({
+        code: setV['itemCode']
+      }).then(res => {
+        setV['uom'] = res.list[0].uom
+      }).catch(err =>{
+        console.log(err);
+      })
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionMainApi.getProductionMainPredictSparePartPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:production-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:production-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:production-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 == '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) => {
+  return [
+    defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:production-main:open'}), // 打开
+    defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:production-main:close'}), // 关闭
+    defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:submit'}), // 提交审批
+    defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:production-main:reject'}), // 驳回
+    defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:production-main:agree'}), // 审批通过
+    defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:production-main:publish'}), // 发布
+    defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
+    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
+    // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
+    {
+      label: '生成备料计划/收货申请',
+      name: 'scbljh',
+      hide: isShowMainButton(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainPlanOpe') { // 打开
+    tableObject.loading = true
+    await ProductionMainApi.open(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanClo') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    await ProductionMainApi.close(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanSub') { // 提交审批
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    await ProductionMainApi.submit(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanTur') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    await ProductionMainApi.reject(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanApp') { // 审批通过
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    await ProductionMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanPub') { // 发布
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要发布吗？')
+    // 物料含有不可用时 是否继续执行
+    let isAvailable = true
+    await ProductionMainApi.getProductionDetail(row.id).then(async res =>{
+      if (res.length > 0) {
+        let rs = ''
+        res.forEach(item => {
+          rs += item.itemCode + ','
+        })
+        await message.confirm('物料：【'+rs +'】目前为不可用状态，是否继续发布？').catch(() => {
+          isAvailable = false
+        })
+      }
+    })
+    if (!isAvailable) {
+      return
+    }
+    tableObject.loading = true
+    await ProductionMainApi.publish(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainPlanRes') { // 重置
+    await message.confirm('确认要重置吗？')
+    tableObject.loading = true
+    await ProductionMainApi.resetting(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if(val == 'scbljh') {
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要生成备料计划/收货申请吗？')
+    tableObject.loading = true
+    await ProductionMainApi.generateRequest(row.number).then(() => {
+      message.success(t('common.createSuccess'))
+      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.id)
+  }
+  
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 新增与修改 修改车间和生产线的编辑属性
+  if(type == 'create'){
+    ProductionMain.allSchemas.formSchema.forEach((itemColumn) =>{
+      if(itemColumn.field == 'workshop'){
+        itemColumn.componentProps.isSearchList=true
+        itemColumn.componentProps.disabled=true
+      }
+      if(itemColumn.field == 'productionLine'){
+        itemColumn.componentProps.isSearchList=true
+        itemColumn.componentProps.disabled=true
+      }
+    })
+  }
+  if(type == 'update'){
+    ProductionMain.allSchemas.formSchema.forEach((itemColumn) =>{
+      if(itemColumn.field == 'workshop'){
+        itemColumn.componentProps.isSearchList=false
+        itemColumn.componentProps.disabled=true
+      }
+      if(itemColumn.field == 'productionLine'){
+        itemColumn.componentProps.isSearchList=false
+        itemColumn.componentProps.disabled=true
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'planProductionMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductionMainApi.deleteProductionMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+      tableObject.loading = false
+    }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionMainApi.exportProductionMainPredictSparePart(tableObject.params)
+    download.excel(data, '预生产备件计划.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductionDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  if(tableData.value.find(item => (item.planQty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      data.subList = tableData.value // 拼接子表数据参数
+      await ProductionMainApi.createProductionMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductionMainApi.updateProductionMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '预生产备件计划导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductionMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
new file mode 100644
index 000000000..1e21d37e5
--- /dev/null
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@@ -0,0 +1,894 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as WorkMainApi from '@/api/wms/workMain'
+import * as WorkDetailApi from '@/api/wms/workDetail'
+import { WorkDetail, WorkMain } from '../workMain/workMain.data'
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+import * as ShiftApi from '@/api/wms/shift'
+import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+import * as TeamApi from '@/api/wms/team'
+import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+import * as BomApi from '@/api/wms/bom'
+import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+
+import * as getPlansettingApi  from '@/api/wms/plansetting/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductionPlan'
+}
+ const data = await getPlansettingApi.getPlansettingPage(queryParams)
+ const plansettingData =data?.list[0]||{}
+
+/**
+ * @returns {Array} 生产计划主表
+ */
+export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.PLAN_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    // form: {
+    //   value: '1',
+    //   componentProps: {
+    //     disabled: true
+    //   }
+    // },
+    isForm:false,
+    isSearch: true,
+  },
+  {
+    label: '顺序',
+    field: 'displayOrder',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        maxlength: 50
+      }
+    }
+  },
+  {
+    label: '车间',
+    field: 'workshop',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择车间',
+        searchField: 'code',
+        searchTitle: '车间信息',
+        searchAllSchemas: Workshop.allSchemas,
+        searchPage: WorkshopApi.getWorkshopPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '生产线',
+    field: 'productionLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Productionline.allSchemas,
+        searchPage: ProductionlineApi.getProductionlinePage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshop',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班次',
+        searchField: 'code',
+        searchTitle: '班次信息',
+        searchAllSchemas: Shift.allSchemas,
+        searchPage: ShiftApi.getShiftPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班组',
+        searchField: 'code',
+        searchTitle: '班组信息',
+        searchAllSchemas: Team.allSchemas,
+        searchPage: TeamApi.getTeamPage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ProductReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '计划类型',
+    field: 'planType',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Select',
+      value: 'predictSparePart',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+
+  // {
+  //   label: '开始时间',
+  //   field: 'beginTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '结束时间',
+  //   field: 'endTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '订单号',
+  //   field: 'woNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择订单号',
+  //       searchField: 'number',
+  //       searchTitle: '生产订单信息',
+  //       searchAllSchemas: WorkMain.allSchemas,
+  //       searchPage: WorkMainApi.getWorkMainPage
+  //     }
+  //   },
+  //   isTable: false,
+  //   isForm: false,
+  // },
+  // {
+  //   label: '订单行',
+  //   field: 'woLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择订单行',
+  //       searchField: 'lineNumber',
+  //       searchTitle: '生产订单信息',
+  //       searchAllSchemas: WorkDetail.allSchemas,
+  //       searchPage: WorkDetailApi.getWorkDetailPage
+  //     }
+  //   },
+  //   isTable: false,
+  //   isForm: false,
+  // },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 220,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductionMainRules = reactive({
+  displayOrder: [
+    { required: true, message: '请输入顺序', trigger: 'blur' },
+    // { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  workshop: [
+    { required: true, message: '请选择车间', trigger: 'change' }
+  ],
+  productionLine: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ],
+  shift: [
+    { required: true, message: '请选择班次', trigger: 'change' }
+  ],
+  team: [
+    { required: true, message: '请选择班组', trigger: 'change' }
+  ],
+  planDate: [
+    { required: true, message: '请输入计划日期', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  beginTime: [
+    { required: true, message: '请输入开始时间', trigger: 'blur' }
+  ],
+  endTime: [
+    { required: true, message: '请输入结束时间', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 生产计划子表
+ */
+export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '生产线物料关系信息', // 查询弹窗标题
+        searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'productionLine',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productionLineCode',
+        value:'productionLine',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }], 
+    },
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+  },
+  {
+    label: '合格数量',
+    field: 'goodQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '不合格数量',
+    field: 'notGoodQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type: 'Select'
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      default: 'TRUE'
+    },
+    // isTableForm: false,
+    // isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductionDetailRules = reactive({
+  bomVersion: [
+    { required: true, message: '请输入Bom版本', trigger: 'blur' }
+  ],
+  // goodQty: [
+  //   { required: true, message: '请输入合格数量', trigger: 'blur' }
+  // ],
+  // notGoodQty: [
+  //   { required: true, message: '请输入不合格数量', trigger: 'blur' }
+  // ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  planQty: [
+    { required: true, message: '请输入计划数量', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})

From 635915b32568f64bc4cafe4c86734a03b4f888d0 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 25 Mar 2024 14:30:07 +0800
Subject: [PATCH 49/65] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/supplierdeliverRequestMain/index.vue         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index e1ef80cea..35dd36a73 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -180,6 +180,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
       setV['itemCode'] = val[0]['itemCode']
       setV['poLine'] = val[0]['poLine']
       setV['uom'] = val[0]['uom']
+      setV['orderQty'] = val[0]['orderQty']
     }
     formRef.setValues(setV)
   })

From f19a364694432afa0923c7b8cc6a94cd6fe5fe54 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 25 Mar 2024 15:20:23 +0800
Subject: [PATCH 50/65] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=B6=85=E6=94=B6?=
 =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchaseMain/purchaseMain.data.ts           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index 91536f1c1..e6c4a2185 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -719,6 +719,8 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
         min: 0
       }
     },
+    isTable:false,
+    isTableForm:false,
     tableForm: {
       type: 'InputNumber',
       min: 0

From 60df601b89b0cd652443779657871b8adfea2209 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 25 Mar 2024 15:32:09 +0800
Subject: [PATCH 51/65] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=AF=84=E5=AD=98=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchaseMain/purchaseMain.data.ts         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index e6c4a2185..023d6051e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -167,11 +167,12 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'isConsignment',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
     },
+    isForm:false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -191,6 +192,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm:false,
     form: {
       component: 'Switch',
       value: 'TRUE',

From 57223d8ec4b716a6c2b121c4d41558e8da97b5a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 25 Mar 2024 15:40:31 +0800
Subject: [PATCH 52/65] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=94=B6=E8=B4=A7=20?=
 =?UTF-8?q?=E6=8B=86=E5=88=86=20=E9=A2=84=E7=94=9F=E6=88=90=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=20=E5=92=8C=20=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productreceiptJobMain/index.ts    |   26 +
 src/api/wms/productreceiptRecordMain/index.ts |   26 +
 .../wms/productreceiptRequestMain/index.ts    |   25 +
 .../productreceiptJobMain/index.vue           |    2 +
 .../productreceiptJobMain.data.ts             |   11 +
 .../productreceiptRecordMain/index.vue        |    2 +
 .../productreceiptRecordMain.data.ts          |   11 +
 .../productreceiptRequestMain/index.vue       |    3 +-
 .../productreceiptRequestMain.data.ts         |   11 +
 .../productreceiptAssembleJobMain/index.vue   |  302 +++
 .../productreceiptAssembleJobMain.data.ts     |  917 +++++++++
 .../index.vue                                 |  230 +++
 .../productreceiptAssembleRecordMain.data.ts  |  959 +++++++++
 .../index.vue                                 |  670 +++++++
 .../productreceiptAssembleRequestMain.data.ts | 1774 +++++++++++++++++
 15 files changed, 4968 insertions(+), 1 deletion(-)
 create mode 100644 src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
 create mode 100644 src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
 create mode 100644 src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
 create mode 100644 src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
 create mode 100644 src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
 create mode 100644 src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts

diff --git a/src/api/wms/productreceiptJobMain/index.ts b/src/api/wms/productreceiptJobMain/index.ts
index 234af4f77..d52d825bb 100644
--- a/src/api/wms/productreceiptJobMain/index.ts
+++ b/src/api/wms/productreceiptJobMain/index.ts
@@ -44,6 +44,19 @@ export interface ProductreceiptJobMainVO {
 
 // 查询制品收货任务主列表
 export const getProductreceiptJobMainPage = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-job-main/page`, params })
+  }
+}
+
+// 查询装配收货任务主列表
+export const getProductreceiptJobMainAssemblePage = async (params) => {
+  params.type = 'assemble'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
@@ -75,6 +88,19 @@ export const deleteProductreceiptJobMain = async (id: number) => {
 
 // 导出制品收货任务主 Excel
 export const exportProductreceiptJobMain = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productreceipt-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productreceipt-job-main/export-excel`, params })
+  }
+}
+
+
+// 导出装配收货任务主 Excel
+export const exportProductreceiptJobMainAssemble = async (params) => {
+  params.type = 'assemble'
   if (params.isSearch) {
     const data = {...params}
     return await request.downloadPost({ url: `/wms/productreceipt-job-main/export-excel-senior`, data })
diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts
index cde04ee6b..1d71bfbd1 100644
--- a/src/api/wms/productreceiptRecordMain/index.ts
+++ b/src/api/wms/productreceiptRecordMain/index.ts
@@ -29,6 +29,19 @@ export interface ProductreceiptRecordMainVO {
 
 // 查询制品收货记录主列表
 export const getProductreceiptRecordMainPage = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-record-main/page`, params })
+  }
+}
+
+// 查询装配收货记录主列表
+export const getProductreceiptRecordMainAssemblePage = async (params) => {
+  params.type = 'assemble'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
@@ -60,6 +73,19 @@ export const deleteProductreceiptRecordMain = async (id: number) => {
 
 // 导出制品收货记录主 Excel
 export const exportProductreceiptRecordMain = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productreceipt-record-main/export-excel`, params })
+  }
+}
+
+// 导出装配收货记录主 Excel
+export const exportProductreceiptRecordAssembleMain = async (params) => {
+  params.type = 'assemble'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
diff --git a/src/api/wms/productreceiptRequestMain/index.ts b/src/api/wms/productreceiptRequestMain/index.ts
index dbb1cc187..d244cb3b5 100644
--- a/src/api/wms/productreceiptRequestMain/index.ts
+++ b/src/api/wms/productreceiptRequestMain/index.ts
@@ -27,6 +27,19 @@ export interface ProductreceiptRequestMainVO {
 
 // 查询制品收货申请主列表
 export const getProductreceiptRequestMainPage = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-request-main/page`, params })
+  }
+}
+
+// 查询制品收货申请主列表
+export const getProductreceiptRequestMainAssemblePage = async (params) => {
+  params.type = 'assemble'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
@@ -58,6 +71,18 @@ export const deleteProductreceiptRequestMain = async (id: number) => {
 
 // 导出制品收货申请主 Excel
 export const exportProductreceiptRequestMain = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productreceipt-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productreceipt-request-main/export-excel`, params })
+  }
+}
+
+// 导出制品收货申请主 Excel
+export const exportProductreceiptRequestMainAssemble = async (params) => {
+  params.type = 'assemble'
   if (params.isSearch) {
     const data = {...params}
     return await request.downloadPost({ url: `/wms/productreceipt-request-main/export-excel-senior`, data })
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
index 77a975dbc..e536108bd 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
@@ -72,7 +72,9 @@ import * as ProductreceiptJobMainApi from '@/api/wms/productreceiptJobMain'
 import * as ProductreceiptJobDetailApi from '@/api/wms/productreceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
 // 制品收货任务主
+// 预生产收货任务主
 defineOptions({ name: 'ProductreceiptJobMain' })
 
 const message = useMessage() // 消息弹窗
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
index d88c730ec..fabd59e4a 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
@@ -56,6 +56,17 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '收货类型',
+    field: 'type',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
index fbdb61db4..1c70fb43f 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
@@ -91,7 +91,9 @@ import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDe
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BackflushRecordDetailbApi from '@/api/wms/backflushRecordDetailb'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
 // 制品收货记录主
+// 预生产收货记录主
 defineOptions({ name: 'ProductreceiptRecordMain' })
 
 const message = useMessage() // 消息弹窗
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
index 6c3fc3bcf..b779fb084 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
@@ -65,6 +65,17 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '收货类型',
+    field: 'type',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
   {
     label: '出库事务类型',
     field: 'outTransactionType',
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 69bb3cd76..c94351527 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -111,7 +111,7 @@
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/productreceipt-request-main/import" :importTemplateData="importTemplateData" 
-  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'predict'"/>
 </template>
 
 <script setup lang="ts">
@@ -130,6 +130,7 @@ import { formatTime } from '@/utils/index'
 import { getAccessToken } from '@/utils/auth'
 
 // 制品收货申请
+// 预生产收货申请
 defineOptions({ name: 'ProductreceiptRequestMain' })
 
 const message = useMessage() // 消息弹窗
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index ee5f02722..e5926c672 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -150,6 +150,17 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '收货类型',
+    field: 'type',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
new file mode 100644
index 000000000..60a4a75ba
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
@@ -0,0 +1,302 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductreceiptJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductreceiptJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :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 }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductreceiptJobMainRules"
+    :formAllSchemas="ProductreceiptJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="ProductreceiptJobDetail.allSchemas"
+    :tableFormRules="ProductreceiptJobDetailRules"
+    :apiUpdate="ProductreceiptJobMainApi.updateProductreceiptJobMain"
+    :apiCreate="ProductreceiptJobMainApi.createProductreceiptJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductreceiptJobMain.allSchemas"
+    :detailAllSchemas="ProductreceiptJobDetail.allSchemas"
+    :detailAllSchemasRules="ProductreceiptJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="ProductreceiptJobDetailApi.getProductreceiptJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductreceiptJobMain,ProductreceiptJobMainRules,ProductreceiptJobDetail,ProductreceiptJobDetailRules } from './productreceiptAssembleJobMain.data'
+import * as ProductreceiptJobMainApi from '@/api/wms/productreceiptJobMain'
+import * as ProductreceiptJobDetailApi from '@/api/wms/productreceiptJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+// 装配收货任务主
+defineOptions({ name: 'ProductreceiptJobMainA' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductreceiptJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductreceiptJobMainApi.getProductreceiptJobMainAssemblePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-job-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 isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    let aaa = {
+    "id": "1809190001478278226",
+    "requestNumber": "REC4620231212-0011",
+    "productionPlanNumber": "WP20231212-0002",
+    "workShopCode": "work2",
+    "team": "7",
+    "shift": "8",
+    "details": null,
+    "requestTime": 1702376849000,
+    "requestDueTime": null,
+    "status": "2",
+    "expiredTime": null,
+    "updateTime": 1702376904000,
+    "updater": "超级管理员",
+    "jobStageStatus": null,
+    "priority": null,
+    "priorityIncrement": null,
+    "departmentCode": "103",
+    "acceptUserId": "1",
+    "acceptTime": 1702376913000,
+    "completeUserId": "1",
+    "completeTime": 1702377036000,
+    "toWarehouseCode": null,
+    "toAreaCodes": "",
+    "fromAreaTypes": "WIP",
+    "toAreaTypes": "WIP",
+    "number": "JOB2120231212-0001",
+    "businessType": "ProductReceipt",
+    "remark": null,
+    "createTime": 1702376904000,
+    "creator": "超级管理员",
+    "autoComplete": "FALSE",
+    "allowModifyLocation": "FALSE",
+    "allowModifyQty": "TRUE",
+    "allowBiggerQty": "TRUE",
+    "allowSmallerQty": "TRUE",
+    "allowModifyInventoryStatus": "TRUE",
+    "allowContinuousScanning": "TRUE",
+    "allowPartialComplete": "TRUE",
+    "allowModifyBatch": "FALSE",
+    "allowModifyPackingNumber": "FALSE",
+    "inInventoryStatuses": "OK",
+    "outInventoryStatuses": "OK",
+    "concurrencyStamp": null,
+      subList: [
+      {
+    "id": "1809190000003953999",
+    "productionLineCode": "line4",
+    "workStationCode": "station4",
+    "processCode": null,
+    "packingNumber": "PN-00113",
+    "containerNumber": null,
+    "batch": "20231212",
+    "produceDate": null,
+    "expireDate": null,
+    "inventoryStatus": "OK",
+    "woNumber": null,
+    "woLine": null,
+    "packQty": 8,
+    "packUnit": "BOX",
+    "itemCode": "item01",
+    "itemName": "物料01",
+    "itemDesc1": "",
+    "itemDesc2": "",
+    "projectCode": "xm01",
+    "qty": 2,
+    "uom": "EA",
+    "number": "JOB2120231212-0001",
+    "remark": null,
+    "createTime": 1702376904000,
+    "creator": "1",
+    "toOwnerCode": null,
+          handleQty: 10,
+          toPackingNumber: '12',
+          toContainerNumber: '001',
+          toBatch: '21',
+          toInventoryStatus: 'OK',
+          toLocationCode: 'H03',
+        }
+      ]
+    }
+    ProductreceiptJobMainApi.executeProductreceiptMain(aaa)
+  } else if (val == 'mainJobAba') { // 放弃
+    ProductreceiptJobMainApi.abandonProductreceiptMain(row.id)
+  } else if (val == 'mainJobClo') { // 关闭
+    ProductreceiptJobMainApi.closeProductreceiptMain(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    ProductreceiptJobMainApi.acceptProductreceiptMain(row.id)
+  }
+}
+// 获取部门 用于详情 部门回显
+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,'jobProductreceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductreceiptJobMainApi.exportProductreceiptJobMainAssemble(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>
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
new file mode 100644
index 000000000..e71496ba3
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
@@ -0,0 +1,917 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 制品收货任务主表
+ */
+export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '生产线代码',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '收货类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    isForm: false
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 120,
+  //     fixed: 'right'
+  //   },
+  // }
+]))
+
+//表单校验
+export const ProductreceiptJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  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 ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    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',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const ProductreceiptJobDetailRules = reactive({
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入过期日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  woNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  woLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { 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' }
+  ],
+})
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
new file mode 100644
index 000000000..f0b49ad0f
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
@@ -0,0 +1,230 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductreceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductreceiptRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :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 }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductreceiptRecordMainRules"
+    :formAllSchemas="ProductreceiptRecordMain.allSchemas"
+    :tableAllSchemas="ProductreceiptRecordDetail.allSchemas"
+    :tableFormRules="ProductreceiptRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductreceiptRecordMain.allSchemas"
+    :detailAllSchemas="ProductreceiptRecordDetail.allSchemas"
+    :detailAllSchemasRules="ProductreceiptRecordDetailRules"
+    :apiPage="ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPage"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- bom列表 -->
+  <Dialog
+      :title="DialogTitle"
+      v-model="bomModelVisible"
+      width="80%"
+      :scroll="true"
+      max-height="450px"
+    >
+      <Table
+        :columns="BackflushRecordDetailb.allSchemas.tableColumns"
+        :data="detatableDataBom.tableList"
+        :loading="detatableDataBom.loading"
+        :pagination="{
+          total: detatableDataBom.total
+        }"
+        v-model:pageSize="detatableDataBom.pageSize"
+        v-model:currentPage="detatableDataBom.currentPage"
+        v-model:sort="detatableDataBom.sort"
+      />
+    </Dialog>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, BackflushRecordDetailb } from './productreceiptAssembleRecordMain.data'
+import * as ProductreceiptRecordMainApi from '@/api/wms/productreceiptRecordMain'
+import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as BackflushRecordDetailbApi from '@/api/wms/backflushRecordDetailb'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+// 装配收货记录主
+defineOptions({ name: 'ProductreceiptRecordMainA' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductreceiptRecordMain.allSchemas.tableColumns)
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: 'Bom',
+    name: 'bom',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// Bom查看
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BackflushRecordDetailbApi.getBackflushRecordDetailbPage
+})
+const { getList:getDetailListBom } = detatableMethodsBom
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductreceiptRecordMainApi.getProductreceiptRecordMainAssemblePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-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) => {
+  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,'recordProductreceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordAssembleMain(tableObject.params)
+    download.excel(data, '装配收货记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+      masterId: row.id
+    }
+    await getDetailListBom()
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
new file mode 100644
index 000000000..17a217872
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
@@ -0,0 +1,959 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 制品收货记录主表
+ */
+export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '收货类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    isForm: false
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    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
+    },
+    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
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const ProductreceiptRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { 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 ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionlineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductreceiptRecordDetailRules = reactive({
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入到货日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  woNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  woLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { 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' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货记录子表
+ */
+export const BackflushRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: 'BOM版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    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: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const BackflushRecordDetailbRules = reactive({
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { 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' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
new file mode 100644
index 000000000..394e6041c
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -0,0 +1,670 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductreceiptRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductreceiptRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :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 }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductreceiptRequestMainRules"
+    :formAllSchemas="ProductreceiptRequestMain.allSchemas"
+    :tableAllSchemas="ProductreceiptRequestDetail.allSchemas"
+    :tableFormRules="ProductreceiptRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductreceiptRequestMainApi.updateProductreceiptRequestMain"
+    :apiCreate="ProductreceiptRequestMainApi.createProductreceiptRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductreceiptRequestMain.allSchemas"
+    :detailAllSchemas="ProductreceiptRequestDetail.allSchemas"
+    :detailAllSchemasRules="ProductreceiptRequestDetailRules"
+    :apiCreate="ProductreceiptRequestDetailApi.createProductreceiptRequestDetail"
+    :apiUpdate="ProductreceiptRequestDetailApi.updateProductreceiptRequestDetail"
+    :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage"
+    :apiDelete="ProductreceiptRequestDetailApi.deleteProductreceiptRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+    :detailValidate="detailValidate"
+  />
+
+    <!-- 创建标签 -->
+    <BasicForm
+      ref="formLabelRef"
+      @success="getList"
+      :tableAllSchemas="detailListTableColumns"
+      :tableFormRules="ProductreceiptRequestLabelRules"
+      :tableData="detatableData.tableList"
+      :isBusiness="true"
+      :isShowButton="false"
+      @handleAddTable="handleAddTable"
+      @handleDeleteTable="handleDeleteTable"
+      @searchTableSuccess="searchTableSuccess"
+      @submitForm="submitFormLabel"
+    />
+
+    <!-- bom列表 -->
+    <Dialog
+      :title="DialogTitle"
+      v-model="bomModelVisible"
+      width="80%"
+      :scroll="true"
+      max-height="450px"
+    >
+      <Table
+        :columns="BackflushDetailRequest.allSchemas.tableColumns"
+        :data="detatableDataBom.tableList"
+        :loading="detatableDataBom.loading"
+        :pagination="{
+          total: detatableDataBom.total
+        }"
+        v-model:pageSize="detatableDataBom.pageSize"
+        v-model:currentPage="detatableDataBom.currentPage"
+        v-model:sort="detatableDataBom.sort"
+      />
+    </Dialog>
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productreceipt-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'assemble'"/>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { ProductreceiptRequestMain,ProductreceiptRequestMainRules,ProductreceiptRequestDetail,
+  ProductreceiptRequestDetailRules, BackflushDetailRequest,
+  ProductreceiptRequestLabel,ProductreceiptRequestLabelRules } from './productreceiptAssembleRequestMain.data'
+import * as ProductreceiptRequestMainApi from '@/api/wms/productreceiptRequestMain'
+import * as ProductreceiptRequestDetailApi from '@/api/wms/productreceiptRequestDetail'
+import * as BackflushRequestDetailbApi from '@/api/wms/backflushRequestDetailb'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import * as PackageApi from '@/api/wms/package'
+import { formatTime } from '@/utils/index'
+import { getAccessToken } from '@/utils/auth'
+
+// 装配收货申请
+defineOptions({ name: 'ProductreceiptRequestMainA' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductreceiptRequestMain.allSchemas.tableColumns)
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: 'Bom',
+    name: 'bom',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+//创建标签
+const detailListTableColumns = ProductreceiptRequestLabel.allSchemas
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const labelType = ref('') // 标签类别 采购还是制造等 
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+// Bom查看
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BackflushRequestDetailbApi.getBackflushRequestDetailbPage
+})
+const { getList:getDetailListBom } = detatableMethodsBom
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      if (formField == 'secondPackUnit') {
+        row['secondPackUnit'] = val[0]['packUnit']
+        row['secondPackQty'] = val[0]['packQty']
+      }
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductreceiptRequestMainApi.getProductreceiptRequestMainAssemblePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productreceipt-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productreceipt-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-request-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 == '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) => {
+    return [
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭
+      defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productreceipt-request-main:reAdd'}), // 重新添加
+      defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:submit'}), // 提交审批
+      defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:refused'}), // 驳回
+      defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:agree'}), // 审批通过
+      defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productreceipt-request-main:handle'}), // 处理
+      defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:update'}), // 编辑
+      {
+        label: '创建标签',
+        name: 'cjbq',
+        hide: isShowMainButton(row,['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
+      defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productreceipt-request-main:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.close(row.id).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
+    ProductreceiptRequestMainApi.reAdd(row.id).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
+    ProductreceiptRequestMainApi.submit(row.id).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
+    ProductreceiptRequestMainApi.refused(row.id).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
+    ProductreceiptRequestMainApi.agree(row.id).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.id
+    }
+    await getDetailList()
+    // 打开创建标签页面
+    // dialogVisible.value = true
+    formLabelRef.value.open('create', row)
+    detatableData.tableList.map((item) => {
+      // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线
+      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
+              ProductreceiptRequestLabelRules.productionLineCodePackage[0].required = false
+            }
+            if(itemColumns.field == 'supplierItemCode') {
+              itemColumns.tableForm.isInpuFocusShow = true
+              itemColumns.tableForm.disabled = false
+              ProductreceiptRequestLabelRules.supplierItemCode[0].required = true
+            }
+          })
+          } else {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(itemColumns => {
+            if(itemColumns.field == 'supplierItemCode') {
+              itemColumns.tableForm.isInpuFocusShow = false
+              itemColumns.tableForm.disabled = true
+              ProductreceiptRequestLabelRules.supplierItemCode[0].required = false
+            }
+            if(itemColumns.field == 'productionLineCodePackage') {
+              item.productionLineCodePackage = item.productionLineCode
+              // itemColumns.tableForm.isInpuFocusShow = true
+              // itemColumns.tableForm.disabled = false
+              ProductreceiptRequestLabelRules.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
+    ProductreceiptRequestMainApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 编辑时 车间代码不可修改
+  if (type == 'update') {
+    // 修改 tableform 属性
+    ProductreceiptRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.disabled = true
+      }
+    })
+  } else {
+    // 修改 tableform 属性
+    ProductreceiptRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = true
+        itemColumns.componentProps.disabled = false
+      }
+    })
+  }
+  formRef.value.open(type, 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,'requestProductreceiptMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductreceiptRequestMainApi.deleteProductreceiptRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+      tableObject.loading = false
+    }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMainAssemble(tableObject.params)
+    download.excel(data, '制品收货申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductreceiptRequestDetail.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 = formatTime(new Date(), 'yyyyMMdd')
+  tableData.value.push(tfk)
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  if(data.subList.find(item => (item.qty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      await ProductreceiptRequestMainApi.createProductreceiptRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductreceiptRequestMainApi.updateProductreceiptRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '装配收货申请导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// 创建标签
+const submitFormLabel = async (formType, data) => {
+  try {
+    detatableData.tableList.forEach(async (item) => {
+      // 创建标签 要物料库区配置表中 入库包装规格
+      item.packUnit = null
+      item.inOfOut = 'in'
+      await PackageApi.createPackageLabel(item).then(res => {
+        isCreateLabel.value = true
+        message.success('创建标签成功')
+      }).catch(err => {
+        isCreateLabel.value = false
+        console.log(err)
+        message.error('创建标签失败')
+      })
+    })
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+      masterId: row.id
+    }
+    await getDetailListBom()
+  }
+}
+
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+// 标签打印
+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) {
+    if (labelType.value == 'cg') {
+      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      window.open(src.value+'&request_number='+row.number)
+    } else {
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+      window.open(src.value+'&request_number='+row.number)
+    }
+  } else {
+    message.warning('请先创建标签')
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductreceiptRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
new file mode 100644
index 000000000..e5926c672
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -0,0 +1,1774 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+import * as ShiftApi from '@/api/wms/shift'
+import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+
+import * as TeamApi from '@/api/wms/team'
+import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+
+import * as WorkstationApi from '@/api/wms/workstation'
+import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
+
+import * as ProcessApi from '@/api/wms/process'
+import { Process } from '@/views/wms/basicDataManage/factoryModeling/process/process.data'
+
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+
+import * as BomApi from '@/api/wms/bom'
+import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+
+import * as SupplieritemApi  from '@/api/wms/supplieritem'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductReceiptRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+/**
+ * @returns {Array} 制品收货申请主表
+ */
+export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择车间',
+        searchField: 'code',
+        searchTitle: '车间信息',
+        searchAllSchemas: Workshop.allSchemas,
+        searchPage: WorkshopApi.getWorkshopPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班组',
+        searchField: 'code',
+        searchTitle: '班组信息',
+        searchAllSchemas: Team.allSchemas,
+        searchPage: TeamApi.getTeamPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班次',
+        searchField: 'code',
+        searchTitle: '班次信息',
+        searchAllSchemas: Shift.allSchemas,
+        searchPage: ShiftApi.getShiftPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '收货类型',
+    field: 'type',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ProductReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductreceiptRequestMainRules = reactive({
+  workshopCode: [
+    { required: true, message: '请选择车间代码', trigger: 'change' }
+  ],
+  team: [
+    { required: true, message: '请选择班组代码', trigger: 'change' }
+  ],
+  shift: [
+    { required: true, message: '请选择班次代码', trigger: 'change' }
+  ],
+  // departmentCode: [
+  //   { required: true, message: '请输入部门', trigger: 'blur' }
+  // ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货申请子表
+ */
+export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码',
+      searchField: 'code',
+      searchTitle: '生产线信息',
+      searchAllSchemas: Productionline.allSchemas,
+      searchPage: ProductionlineApi.getProductionlinePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'workshopCode',
+        value: 'workshopCode',
+        message: '请填写车间代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线代码',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Productionline.allSchemas,
+        searchPage: ProductionlineApi.getProductionlinePage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工位代码',
+      searchField: 'code',
+      searchTitle: '工位信息',
+      searchAllSchemas: Workstation.allSchemas,
+      searchPage: WorkstationApi.getWorkstationPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'productionLineCode',
+        value: 'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择工位代码',
+        searchField: 'code',
+        searchTitle: '工位信息',
+        searchAllSchemas: Workstation.allSchemas,
+        searchPage: WorkstationApi.getWorkstationPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'productionLineCode',
+          value: 'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工序代码',
+      searchField: 'code',
+      searchTitle: '工序信息',
+      searchAllSchemas: Process.allSchemas,
+      searchPage: ProcessApi.getProcessPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择工序代码',
+        searchField: 'code',
+        searchTitle: '工序信息',
+        searchAllSchemas: Process.allSchemas,
+        searchPage: ProcessApi.getProcessPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '生产线物料关系信息',
+      searchAllSchemas: Productionlineitem.allSchemas,
+      searchPage: ProductionlineitemApi.getProductionlineitemPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'productionLineCode',
+        value: 'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '生产线物料关系信息',
+        searchAllSchemas: Productionlineitem.allSchemas,
+        searchPage: ProductionlineitemApi.getProductionlineitemPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'productionLineCode',
+          value: 'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      },
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+    
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      type: 'FormDate',
+      valueFormat: 'x',
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      type: 'FormDate',
+      valueFormat: 'x',
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductreceiptRequestDetailRules = reactive({
+  produceDate: [
+    { required: true, message: '请选择生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请选择过期日期', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  bomVersion: [
+    { required: true, message: '请选择Bom版本', trigger: 'change' }
+  ],
+  workStationCode: [
+    { required: true, message: '请选择工位代码', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货申请子表
+ */
+export const BackflushRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  }
+]))
+
+//表单校验
+export const BackflushRequestDetailbRules = reactive({
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+  
+})
+
+
+
+
+
+/**
+ * @returns {Array} 制品收货申请子表二子表
+ */
+export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: 'BOM版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+]))
+
+
+/**
+ * @returns {Array} 制品收货申请创建标签
+ */
+export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCodePackage',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+      // isInpuFocusShow: true,
+      // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      // searchField: 'productionLineCode', // 查询弹窗赋值字段
+      // searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      // searchCondition:[{
+      //   key: 'itemCode',
+      //   value: 'itemCode',
+      //   isMainValue: true
+      // }]
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+      searchField: 'supplierCode', // 查询弹窗赋值字段
+      searchTitle: '供应商信息', // 查询弹窗标题
+      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装规格1',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      disabled: true
+    },
+  },
+  {
+    label: '包装数量1',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '包装规格2',
+    field: 'secondPackUnit',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packUnit',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '包装数量2',
+    field: 'secondPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+]))
+
+//表单校验
+export const ProductreceiptRequestLabelRules = reactive({
+  supplierItemCode: [
+    { required: true, message: '请选择供应商', trigger: 'change' }
+  ],
+  productionLineCodePackage: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ]
+})
+

From fedf2b6cd360fc803a06f67c5dadfc72d357a08c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 25 Mar 2024 18:31:48 +0800
Subject: [PATCH 53/65] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=20=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=8A=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionMain/productionMain.data.ts     | 22 +++++++++++++++++--
 .../productionMainAssemble.data.ts            | 20 ++++++++++++++++-
 .../productionMainAssembleSparePart.data.ts   | 20 ++++++++++++++++-
 .../productionMainPredictSparePart.data.ts    | 22 +++++++++++++++++--
 4 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index 3b552367b..0f0444c03 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -77,7 +77,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '车间',
+    label: '机台',
     field: 'workshop',
     sort: 'custom',
     table: {
@@ -177,6 +177,25 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '物料代码',
+    field: 'detailItemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '计划数量',
+    field: 'detailPlanQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
   {
     label: '计划日期',
     field: 'planDate',
@@ -287,7 +306,6 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index 585255287..d7d82f5b9 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -177,6 +177,25 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '物料代码',
+    field: 'detailItemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '计划数量',
+    field: 'detailPlanQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
   {
     label: '计划日期',
     field: 'planDate',
@@ -287,7 +306,6 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
index 75a66d8d8..d7bb6a6b6 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@@ -177,6 +177,25 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '物料代码',
+    field: 'detailItemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '计划数量',
+    field: 'detailPlanQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
   {
     label: '计划日期',
     field: 'planDate',
@@ -287,7 +306,6 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
index 1e21d37e5..7ab3206c9 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@@ -77,7 +77,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '车间',
+    label: '机台',
     field: 'workshop',
     sort: 'custom',
     table: {
@@ -177,6 +177,25 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '物料代码',
+    field: 'detailItemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '计划数量',
+    field: 'detailPlanQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
   {
     label: '计划日期',
     field: 'planDate',
@@ -287,7 +306,6 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {

From 64b682900b2f7a8a86d4151b7256fa29a0192a3d Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 26 Mar 2024 11:15:00 +0800
Subject: [PATCH 54/65] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptscrapJobMain/index.vue      |  301 +++
 .../productreceiptJobMain.data.ts             |  903 +++++++++
 .../productreceiptscrapRecordMain/index.vue   |  229 +++
 .../productreceiptRecordMain.data.ts          |  945 +++++++++
 .../productreceiptscrapRequestMain/index.vue  |  670 +++++++
 .../productreceiptRequestMain.data.ts         | 1763 +++++++++++++++++
 6 files changed, 4811 insertions(+)
 create mode 100644 src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
 create mode 100644 src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptJobMain.data.ts
 create mode 100644 src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
 create mode 100644 src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptRecordMain.data.ts
 create mode 100644 src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
 create mode 100644 src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptRequestMain.data.ts

diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
new file mode 100644
index 000000000..77a975dbc
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
@@ -0,0 +1,301 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductreceiptJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductreceiptJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :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 }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductreceiptJobMainRules"
+    :formAllSchemas="ProductreceiptJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="ProductreceiptJobDetail.allSchemas"
+    :tableFormRules="ProductreceiptJobDetailRules"
+    :apiUpdate="ProductreceiptJobMainApi.updateProductreceiptJobMain"
+    :apiCreate="ProductreceiptJobMainApi.createProductreceiptJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductreceiptJobMain.allSchemas"
+    :detailAllSchemas="ProductreceiptJobDetail.allSchemas"
+    :detailAllSchemasRules="ProductreceiptJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="ProductreceiptJobDetailApi.getProductreceiptJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductreceiptJobMain,ProductreceiptJobMainRules,ProductreceiptJobDetail,ProductreceiptJobDetailRules } from './productreceiptJobMain.data'
+import * as ProductreceiptJobMainApi from '@/api/wms/productreceiptJobMain'
+import * as ProductreceiptJobDetailApi from '@/api/wms/productreceiptJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 制品收货任务主
+defineOptions({ name: 'ProductreceiptJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductreceiptJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductreceiptJobMainApi.getProductreceiptJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-job-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 isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    let aaa = {
+    "id": "1809190001478278226",
+    "requestNumber": "REC4620231212-0011",
+    "productionPlanNumber": "WP20231212-0002",
+    "workShopCode": "work2",
+    "team": "7",
+    "shift": "8",
+    "details": null,
+    "requestTime": 1702376849000,
+    "requestDueTime": null,
+    "status": "2",
+    "expiredTime": null,
+    "updateTime": 1702376904000,
+    "updater": "超级管理员",
+    "jobStageStatus": null,
+    "priority": null,
+    "priorityIncrement": null,
+    "departmentCode": "103",
+    "acceptUserId": "1",
+    "acceptTime": 1702376913000,
+    "completeUserId": "1",
+    "completeTime": 1702377036000,
+    "toWarehouseCode": null,
+    "toAreaCodes": "",
+    "fromAreaTypes": "WIP",
+    "toAreaTypes": "WIP",
+    "number": "JOB2120231212-0001",
+    "businessType": "ProductReceipt",
+    "remark": null,
+    "createTime": 1702376904000,
+    "creator": "超级管理员",
+    "autoComplete": "FALSE",
+    "allowModifyLocation": "FALSE",
+    "allowModifyQty": "TRUE",
+    "allowBiggerQty": "TRUE",
+    "allowSmallerQty": "TRUE",
+    "allowModifyInventoryStatus": "TRUE",
+    "allowContinuousScanning": "TRUE",
+    "allowPartialComplete": "TRUE",
+    "allowModifyBatch": "FALSE",
+    "allowModifyPackingNumber": "FALSE",
+    "inInventoryStatuses": "OK",
+    "outInventoryStatuses": "OK",
+    "concurrencyStamp": null,
+      subList: [
+      {
+    "id": "1809190000003953999",
+    "productionLineCode": "line4",
+    "workStationCode": "station4",
+    "processCode": null,
+    "packingNumber": "PN-00113",
+    "containerNumber": null,
+    "batch": "20231212",
+    "produceDate": null,
+    "expireDate": null,
+    "inventoryStatus": "OK",
+    "woNumber": null,
+    "woLine": null,
+    "packQty": 8,
+    "packUnit": "BOX",
+    "itemCode": "item01",
+    "itemName": "物料01",
+    "itemDesc1": "",
+    "itemDesc2": "",
+    "projectCode": "xm01",
+    "qty": 2,
+    "uom": "EA",
+    "number": "JOB2120231212-0001",
+    "remark": null,
+    "createTime": 1702376904000,
+    "creator": "1",
+    "toOwnerCode": null,
+          handleQty: 10,
+          toPackingNumber: '12',
+          toContainerNumber: '001',
+          toBatch: '21',
+          toInventoryStatus: 'OK',
+          toLocationCode: 'H03',
+        }
+      ]
+    }
+    ProductreceiptJobMainApi.executeProductreceiptMain(aaa)
+  } else if (val == 'mainJobAba') { // 放弃
+    ProductreceiptJobMainApi.abandonProductreceiptMain(row.id)
+  } else if (val == 'mainJobClo') { // 关闭
+    ProductreceiptJobMainApi.closeProductreceiptMain(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    ProductreceiptJobMainApi.acceptProductreceiptMain(row.id)
+  }
+}
+// 获取部门 用于详情 部门回显
+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,'jobProductreceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductreceiptJobMainApi.exportProductreceiptJobMain(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>
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptJobMain.data.ts
new file mode 100644
index 000000000..d88c730ec
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptJobMain.data.ts
@@ -0,0 +1,903 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 制品收货任务主表
+ */
+export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '生产线代码',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 120,
+  //     fixed: 'right'
+  //   },
+  // }
+]))
+
+//表单校验
+export const ProductreceiptJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  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 ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    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',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const ProductreceiptJobDetailRules = reactive({
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入过期日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  woNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  woLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { 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' }
+  ],
+})
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
new file mode 100644
index 000000000..fbdb61db4
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
@@ -0,0 +1,229 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductreceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductreceiptRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :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 }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductreceiptRecordMainRules"
+    :formAllSchemas="ProductreceiptRecordMain.allSchemas"
+    :tableAllSchemas="ProductreceiptRecordDetail.allSchemas"
+    :tableFormRules="ProductreceiptRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductreceiptRecordMain.allSchemas"
+    :detailAllSchemas="ProductreceiptRecordDetail.allSchemas"
+    :detailAllSchemasRules="ProductreceiptRecordDetailRules"
+    :apiPage="ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPage"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- bom列表 -->
+  <Dialog
+      :title="DialogTitle"
+      v-model="bomModelVisible"
+      width="80%"
+      :scroll="true"
+      max-height="450px"
+    >
+      <Table
+        :columns="BackflushRecordDetailb.allSchemas.tableColumns"
+        :data="detatableDataBom.tableList"
+        :loading="detatableDataBom.loading"
+        :pagination="{
+          total: detatableDataBom.total
+        }"
+        v-model:pageSize="detatableDataBom.pageSize"
+        v-model:currentPage="detatableDataBom.currentPage"
+        v-model:sort="detatableDataBom.sort"
+      />
+    </Dialog>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, BackflushRecordDetailb } from './productreceiptRecordMain.data'
+import * as ProductreceiptRecordMainApi from '@/api/wms/productreceiptRecordMain'
+import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as BackflushRecordDetailbApi from '@/api/wms/backflushRecordDetailb'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 制品收货记录主
+defineOptions({ name: 'ProductreceiptRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductreceiptRecordMain.allSchemas.tableColumns)
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: 'Bom',
+    name: 'bom',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// Bom查看
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BackflushRecordDetailbApi.getBackflushRecordDetailbPage
+})
+const { getList:getDetailListBom } = detatableMethodsBom
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductreceiptRecordMainApi.getProductreceiptRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-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) => {
+  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,'recordProductreceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordMain(tableObject.params)
+    download.excel(data, '制品收货记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+      masterId: row.id
+    }
+    await getDetailListBom()
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptRecordMain.data.ts
new file mode 100644
index 000000000..6c3fc3bcf
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptRecordMain.data.ts
@@ -0,0 +1,945 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 制品收货记录主表
+ */
+export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    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
+    },
+    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
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const ProductreceiptRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { 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 ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionlineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductreceiptRecordDetailRules = reactive({
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入到货日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  woNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  woLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { 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' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货记录子表
+ */
+export const BackflushRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: 'BOM版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    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: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
+
+//表单校验
+export const BackflushRecordDetailbRules = reactive({
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { 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' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
new file mode 100644
index 000000000..69bb3cd76
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -0,0 +1,670 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductreceiptRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductreceiptRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :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 }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductreceiptRequestMainRules"
+    :formAllSchemas="ProductreceiptRequestMain.allSchemas"
+    :tableAllSchemas="ProductreceiptRequestDetail.allSchemas"
+    :tableFormRules="ProductreceiptRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductreceiptRequestMainApi.updateProductreceiptRequestMain"
+    :apiCreate="ProductreceiptRequestMainApi.createProductreceiptRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductreceiptRequestMain.allSchemas"
+    :detailAllSchemas="ProductreceiptRequestDetail.allSchemas"
+    :detailAllSchemasRules="ProductreceiptRequestDetailRules"
+    :apiCreate="ProductreceiptRequestDetailApi.createProductreceiptRequestDetail"
+    :apiUpdate="ProductreceiptRequestDetailApi.updateProductreceiptRequestDetail"
+    :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage"
+    :apiDelete="ProductreceiptRequestDetailApi.deleteProductreceiptRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+    :detailValidate="detailValidate"
+  />
+
+    <!-- 创建标签 -->
+    <BasicForm
+      ref="formLabelRef"
+      @success="getList"
+      :tableAllSchemas="detailListTableColumns"
+      :tableFormRules="ProductreceiptRequestLabelRules"
+      :tableData="detatableData.tableList"
+      :isBusiness="true"
+      :isShowButton="false"
+      @handleAddTable="handleAddTable"
+      @handleDeleteTable="handleDeleteTable"
+      @searchTableSuccess="searchTableSuccess"
+      @submitForm="submitFormLabel"
+    />
+
+    <!-- bom列表 -->
+    <Dialog
+      :title="DialogTitle"
+      v-model="bomModelVisible"
+      width="80%"
+      :scroll="true"
+      max-height="450px"
+    >
+      <Table
+        :columns="BackflushDetailRequest.allSchemas.tableColumns"
+        :data="detatableDataBom.tableList"
+        :loading="detatableDataBom.loading"
+        :pagination="{
+          total: detatableDataBom.total
+        }"
+        v-model:pageSize="detatableDataBom.pageSize"
+        v-model:currentPage="detatableDataBom.currentPage"
+        v-model:sort="detatableDataBom.sort"
+      />
+    </Dialog>
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productreceipt-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { ProductreceiptRequestMain,ProductreceiptRequestMainRules,ProductreceiptRequestDetail,
+  ProductreceiptRequestDetailRules, BackflushDetailRequest,
+  ProductreceiptRequestLabel,ProductreceiptRequestLabelRules } from './productreceiptRequestMain.data'
+import * as ProductreceiptRequestMainApi from '@/api/wms/productreceiptRequestMain'
+import * as ProductreceiptRequestDetailApi from '@/api/wms/productreceiptRequestDetail'
+import * as BackflushRequestDetailbApi from '@/api/wms/backflushRequestDetailb'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import * as PackageApi from '@/api/wms/package'
+import { formatTime } from '@/utils/index'
+import { getAccessToken } from '@/utils/auth'
+
+// 制品收货申请
+defineOptions({ name: 'ProductreceiptRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductreceiptRequestMain.allSchemas.tableColumns)
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: 'Bom',
+    name: 'bom',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+//创建标签
+const detailListTableColumns = ProductreceiptRequestLabel.allSchemas
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const labelType = ref('') // 标签类别 采购还是制造等 
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+// Bom查看
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BackflushRequestDetailbApi.getBackflushRequestDetailbPage
+})
+const { getList:getDetailListBom } = detatableMethodsBom
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      if (formField == 'secondPackUnit') {
+        row['secondPackUnit'] = val[0]['packUnit']
+        row['secondPackQty'] = val[0]['packQty']
+      }
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductreceiptRequestMainApi.getProductreceiptRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productreceipt-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productreceipt-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-request-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 == '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) => {
+    return [
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭
+      defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productreceipt-request-main:reAdd'}), // 重新添加
+      defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:submit'}), // 提交审批
+      defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:refused'}), // 驳回
+      defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:agree'}), // 审批通过
+      defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productreceipt-request-main:handle'}), // 处理
+      defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:update'}), // 编辑
+      {
+        label: '创建标签',
+        name: 'cjbq',
+        hide: isShowMainButton(row,['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
+      defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productreceipt-request-main:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    ProductreceiptRequestMainApi.close(row.id).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
+    ProductreceiptRequestMainApi.reAdd(row.id).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
+    ProductreceiptRequestMainApi.submit(row.id).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
+    ProductreceiptRequestMainApi.refused(row.id).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
+    ProductreceiptRequestMainApi.agree(row.id).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.id
+    }
+    await getDetailList()
+    // 打开创建标签页面
+    // dialogVisible.value = true
+    formLabelRef.value.open('create', row)
+    detatableData.tableList.map((item) => {
+      // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线
+      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
+              ProductreceiptRequestLabelRules.productionLineCodePackage[0].required = false
+            }
+            if(itemColumns.field == 'supplierItemCode') {
+              itemColumns.tableForm.isInpuFocusShow = true
+              itemColumns.tableForm.disabled = false
+              ProductreceiptRequestLabelRules.supplierItemCode[0].required = true
+            }
+          })
+          } else {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(itemColumns => {
+            if(itemColumns.field == 'supplierItemCode') {
+              itemColumns.tableForm.isInpuFocusShow = false
+              itemColumns.tableForm.disabled = true
+              ProductreceiptRequestLabelRules.supplierItemCode[0].required = false
+            }
+            if(itemColumns.field == 'productionLineCodePackage') {
+              item.productionLineCodePackage = item.productionLineCode
+              // itemColumns.tableForm.isInpuFocusShow = true
+              // itemColumns.tableForm.disabled = false
+              ProductreceiptRequestLabelRules.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
+    ProductreceiptRequestMainApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 编辑时 车间代码不可修改
+  if (type == 'update') {
+    // 修改 tableform 属性
+    ProductreceiptRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.disabled = true
+      }
+    })
+  } else {
+    // 修改 tableform 属性
+    ProductreceiptRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = true
+        itemColumns.componentProps.disabled = false
+      }
+    })
+  }
+  formRef.value.open(type, 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,'requestProductreceiptMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductreceiptRequestMainApi.deleteProductreceiptRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+      tableObject.loading = false
+    }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMain(tableObject.params)
+    download.excel(data, '制品收货申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductreceiptRequestDetail.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 = formatTime(new Date(), 'yyyyMMdd')
+  tableData.value.push(tfk)
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  if(data.subList.find(item => (item.qty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      await ProductreceiptRequestMainApi.createProductreceiptRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductreceiptRequestMainApi.updateProductreceiptRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '制品收货申请主导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// 创建标签
+const submitFormLabel = async (formType, data) => {
+  try {
+    detatableData.tableList.forEach(async (item) => {
+      // 创建标签 要物料库区配置表中 入库包装规格
+      item.packUnit = null
+      item.inOfOut = 'in'
+      await PackageApi.createPackageLabel(item).then(res => {
+        isCreateLabel.value = true
+        message.success('创建标签成功')
+      }).catch(err => {
+        isCreateLabel.value = false
+        console.log(err)
+        message.error('创建标签失败')
+      })
+    })
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+      masterId: row.id
+    }
+    await getDetailListBom()
+  }
+}
+
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+// 标签打印
+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) {
+    if (labelType.value == 'cg') {
+      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      window.open(src.value+'&request_number='+row.number)
+    } else {
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+      window.open(src.value+'&request_number='+row.number)
+    }
+  } else {
+    message.warning('请先创建标签')
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductreceiptRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptRequestMain.data.ts
new file mode 100644
index 000000000..ee5f02722
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptRequestMain.data.ts
@@ -0,0 +1,1763 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+import * as ShiftApi from '@/api/wms/shift'
+import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+
+import * as TeamApi from '@/api/wms/team'
+import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+
+import * as WorkstationApi from '@/api/wms/workstation'
+import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
+
+import * as ProcessApi from '@/api/wms/process'
+import { Process } from '@/views/wms/basicDataManage/factoryModeling/process/process.data'
+
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+
+import * as BomApi from '@/api/wms/bom'
+import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+
+import * as SupplieritemApi  from '@/api/wms/supplieritem'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductReceiptRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+/**
+ * @returns {Array} 制品收货申请主表
+ */
+export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择车间',
+        searchField: 'code',
+        searchTitle: '车间信息',
+        searchAllSchemas: Workshop.allSchemas,
+        searchPage: WorkshopApi.getWorkshopPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班组',
+        searchField: 'code',
+        searchTitle: '班组信息',
+        searchAllSchemas: Team.allSchemas,
+        searchPage: TeamApi.getTeamPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择班次',
+        searchField: 'code',
+        searchTitle: '班次信息',
+        searchAllSchemas: Shift.allSchemas,
+        searchPage: ShiftApi.getShiftPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ProductReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const ProductreceiptRequestMainRules = reactive({
+  workshopCode: [
+    { required: true, message: '请选择车间代码', trigger: 'change' }
+  ],
+  team: [
+    { required: true, message: '请选择班组代码', trigger: 'change' }
+  ],
+  shift: [
+    { required: true, message: '请选择班次代码', trigger: 'change' }
+  ],
+  // departmentCode: [
+  //   { required: true, message: '请输入部门', trigger: 'blur' }
+  // ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货申请子表
+ */
+export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码',
+      searchField: 'code',
+      searchTitle: '生产线信息',
+      searchAllSchemas: Productionline.allSchemas,
+      searchPage: ProductionlineApi.getProductionlinePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'workshopCode',
+        value: 'workshopCode',
+        message: '请填写车间代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线代码',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Productionline.allSchemas,
+        searchPage: ProductionlineApi.getProductionlinePage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工位代码',
+      searchField: 'code',
+      searchTitle: '工位信息',
+      searchAllSchemas: Workstation.allSchemas,
+      searchPage: WorkstationApi.getWorkstationPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'productionLineCode',
+        value: 'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择工位代码',
+        searchField: 'code',
+        searchTitle: '工位信息',
+        searchAllSchemas: Workstation.allSchemas,
+        searchPage: WorkstationApi.getWorkstationPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'productionLineCode',
+          value: 'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工序代码',
+      searchField: 'code',
+      searchTitle: '工序信息',
+      searchAllSchemas: Process.allSchemas,
+      searchPage: ProcessApi.getProcessPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择工序代码',
+        searchField: 'code',
+        searchTitle: '工序信息',
+        searchAllSchemas: Process.allSchemas,
+        searchPage: ProcessApi.getProcessPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '生产线物料关系信息',
+      searchAllSchemas: Productionlineitem.allSchemas,
+      searchPage: ProductionlineitemApi.getProductionlineitemPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'productionLineCode',
+        value: 'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '生产线物料关系信息',
+        searchAllSchemas: Productionlineitem.allSchemas,
+        searchPage: ProductionlineitemApi.getProductionlineitemPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'productionLineCode',
+          value: 'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      },
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+    
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      type: 'FormDate',
+      valueFormat: 'x',
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      type: 'FormDate',
+      valueFormat: 'x',
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const ProductreceiptRequestDetailRules = reactive({
+  produceDate: [
+    { required: true, message: '请选择生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请选择过期日期', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  bomVersion: [
+    { required: true, message: '请选择Bom版本', trigger: 'change' }
+  ],
+  workStationCode: [
+    { required: true, message: '请选择工位代码', trigger: 'change' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 制品收货申请子表
+ */
+export const BackflushRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  }
+]))
+
+//表单校验
+export const BackflushRequestDetailbRules = reactive({
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+  
+})
+
+
+
+
+
+/**
+ * @returns {Array} 制品收货申请子表二子表
+ */
+export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: 'BOM版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+]))
+
+
+/**
+ * @returns {Array} 制品收货申请创建标签
+ */
+export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCodePackage',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+      // isInpuFocusShow: true,
+      // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      // searchField: 'productionLineCode', // 查询弹窗赋值字段
+      // searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      // searchCondition:[{
+      //   key: 'itemCode',
+      //   value: 'itemCode',
+      //   isMainValue: true
+      // }]
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+      searchField: 'supplierCode', // 查询弹窗赋值字段
+      searchTitle: '供应商信息', // 查询弹窗标题
+      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装规格1',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    tableForm: {
+      disabled: true
+    },
+  },
+  {
+    label: '包装数量1',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '包装规格2',
+    field: 'secondPackUnit',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packUnit',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '包装数量2',
+    field: 'secondPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+]))
+
+//表单校验
+export const ProductreceiptRequestLabelRules = reactive({
+  supplierItemCode: [
+    { required: true, message: '请选择供应商', trigger: 'change' }
+  ],
+  productionLineCodePackage: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ]
+})
+

From beb1f6234aeb7f55123ebf9785b831fbdad36af1 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 26 Mar 2024 13:10:06 +0800
Subject: [PATCH 55/65] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productreceiptJobMain/index.ts      | 13 +++++++++++++
 src/api/wms/productreceiptRecordMain/index.ts   | 12 ++++++++++++
 src/api/wms/productreceiptRequestMain/index.ts  | 13 +++++++++++++
 .../productreceiptscrapJobMain/index.vue        |  4 ++--
 ...ta.ts => productreceiptscrapJobMain.data.ts} |  0
 .../productreceiptscrapRecordMain/index.vue     |  4 ++--
 ...ts => productreceiptscrapRecordMain.data.ts} |  0
 .../productreceiptscrapRequestMain/index.vue    |  6 +++---
 ...s => productreceiptscrapRequestMain.data.ts} | 17 +++++++++++++++++
 9 files changed, 62 insertions(+), 7 deletions(-)
 rename src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/{productreceiptJobMain.data.ts => productreceiptscrapJobMain.data.ts} (100%)
 rename src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/{productreceiptRecordMain.data.ts => productreceiptscrapRecordMain.data.ts} (100%)
 rename src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/{productreceiptRequestMain.data.ts => productreceiptscrapRequestMain.data.ts} (99%)

diff --git a/src/api/wms/productreceiptJobMain/index.ts b/src/api/wms/productreceiptJobMain/index.ts
index d52d825bb..8f06b62f8 100644
--- a/src/api/wms/productreceiptJobMain/index.ts
+++ b/src/api/wms/productreceiptJobMain/index.ts
@@ -66,6 +66,19 @@ export const getProductreceiptJobMainAssemblePage = async (params) => {
   }
 }
 
+// 查询报废收货货任务主列表
+export const getProductreceiptscapJobMainPage = async (params) => {
+  params.type = 'scrap'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-job-main/page`, params })
+  }
+}
+
+
 // 查询制品收货任务主详情
 export const getProductreceiptJobMain = async (id: number) => {
   return await request.get({ url: `/wms/productreceipt-job-main/get?id=` + id })
diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts
index 1d71bfbd1..79b5699c9 100644
--- a/src/api/wms/productreceiptRecordMain/index.ts
+++ b/src/api/wms/productreceiptRecordMain/index.ts
@@ -51,6 +51,18 @@ export const getProductreceiptRecordMainAssemblePage = async (params) => {
   }
 }
 
+// 查询报废收货记录主列表
+export const getProductreceiptRecordMainScrapPage = async (params) => {
+  params.type = 'scrap'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-record-main/page`, params })
+  }
+}
+
 // 查询制品收货记录主详情
 export const getProductreceiptRecordMain = async (id: number) => {
   return await request.get({ url: `/wms/productreceipt-record-main/get?id=` + id })
diff --git a/src/api/wms/productreceiptRequestMain/index.ts b/src/api/wms/productreceiptRequestMain/index.ts
index d244cb3b5..0d337b177 100644
--- a/src/api/wms/productreceiptRequestMain/index.ts
+++ b/src/api/wms/productreceiptRequestMain/index.ts
@@ -49,6 +49,19 @@ export const getProductreceiptRequestMainAssemblePage = async (params) => {
   }
 }
 
+// 查询报废收货申请主列表
+export const getProductreceiptRequestMainScrapPage = async (params) => {
+  params.type = 'scrap'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-request-main/page`, params })
+  }
+}
+
+
 // 查询制品收货申请主详情
 export const getProductreceiptRequestMain = async (id: number) => {
   return await request.get({ url: `/wms/productreceipt-request-main/get?id=` + id })
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
index 77a975dbc..d99b2eb65 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
@@ -67,7 +67,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ProductreceiptJobMain,ProductreceiptJobMainRules,ProductreceiptJobDetail,ProductreceiptJobDetailRules } from './productreceiptJobMain.data'
+import { ProductreceiptJobMain,ProductreceiptJobMainRules,ProductreceiptJobDetail,ProductreceiptJobDetailRules } from './productreceiptscrapJobMain.data'
 import * as ProductreceiptJobMainApi from '@/api/wms/productreceiptJobMain'
 import * as ProductreceiptJobDetailApi from '@/api/wms/productreceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -107,7 +107,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductreceiptJobMainApi.getProductreceiptJobMainPage // 分页接口
+  getListApi: ProductreceiptJobMainApi.getProductreceiptscapJobMainPage // 报废收货分页接口
 })
 
 // 获得表格的各种操作
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
similarity index 100%
rename from src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptJobMain.data.ts
rename to src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
index fbdb61db4..6f9360198 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
@@ -85,7 +85,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, BackflushRecordDetailb } from './productreceiptRecordMain.data'
+import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, BackflushRecordDetailb } from './productreceiptscrapRecordMain.data'
 import * as ProductreceiptRecordMainApi from '@/api/wms/productreceiptRecordMain'
 import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -127,7 +127,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductreceiptRecordMainApi.getProductreceiptRecordMainPage // 分页接口
+  getListApi: ProductreceiptRecordMainApi.getProductreceiptRecordMainScrapPage // 报废收货分页接口
 })
 
 // 获得表格的各种操作
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts
similarity index 100%
rename from src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptRecordMain.data.ts
rename to src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index 69bb3cd76..ff70c327f 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -119,7 +119,7 @@ import download from '@/utils/download'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { ProductreceiptRequestMain,ProductreceiptRequestMainRules,ProductreceiptRequestDetail,
   ProductreceiptRequestDetailRules, BackflushDetailRequest,
-  ProductreceiptRequestLabel,ProductreceiptRequestLabelRules } from './productreceiptRequestMain.data'
+  ProductreceiptRequestLabel,ProductreceiptRequestLabelRules } from './productreceiptscrapRequestMain.data'
 import * as ProductreceiptRequestMainApi from '@/api/wms/productreceiptRequestMain'
 import * as ProductreceiptRequestDetailApi from '@/api/wms/productreceiptRequestDetail'
 import * as BackflushRequestDetailbApi from '@/api/wms/backflushRequestDetailb'
@@ -202,7 +202,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductreceiptRequestMainApi.getProductreceiptRequestMainPage // 分页接口
+  getListApi: ProductreceiptRequestMainApi.getProductreceiptRequestMainScrapPage // 报废收货分页接口
 })
 
 // 获得表格的各种操作
@@ -667,4 +667,4 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await ProductreceiptRequestMainApi.importTemplate()
 })
-</script>
+</script>
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
similarity index 99%
rename from src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptRequestMain.data.ts
rename to src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index ee5f02722..f53d8bba2 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -431,6 +431,23 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '收货类型',
+    field: 'type',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'scrap',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false
+  },
   {
     label: '操作',
     field: 'action',

From 0d308ca27c132775dd21464e5cc8fe8b1b0d96e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 26 Mar 2024 14:34:49 +0800
Subject: [PATCH 56/65] =?UTF-8?q?=E9=80=80=E6=96=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreturnRequestMain/index.vue     |  36 ++++-
 .../productionreturnRequestMain.data.ts       | 124 ++++++++++++++----
 .../productionreturnRequestMainNo/index.vue   |   8 +-
 .../productionreturnRequestMainNo.data.ts     | 122 +++++++++++++----
 4 files changed, 235 insertions(+), 55 deletions(-)

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index c636538eb..582f72410 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -175,6 +175,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           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限制
           ProductionreturnRequestDetail.allSchemas.tableFormColumns.map(item => {
@@ -186,6 +192,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       } else if(formField == 'workStationCode') {
         row['workStationCode'] = val[0]['code']
         row['fromLocationCode'] = val[0]['rawLocationCode']
+      } else if(formField == 'packUnit') {
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
       } else {
         row[formField] = val[0][searchField]
       }
@@ -210,6 +219,12 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
         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 属性 数量最大值设置为库存余额中数量
         ProductionreturnRequestDetail.allSchemas.tableFormColumns.map(item => {
           if(item.field == 'qty' && val[0]['qty'] > 0) {
@@ -220,6 +235,9 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
     } 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]
     }
@@ -381,7 +399,7 @@ const buttonTableClick = async (val, row) => {
     // dialogVisible.value = true
     formLabelRef.value.open('create', row)
     detatableData.tableList.map((item) => {
-      item.batch = '000000'
+      // item.batch = '000000'
       // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线
       ItembasicApi.getItembasicPage({
         pageSize: 10,
@@ -498,7 +516,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 /** 详情操作——子表表单 */
 const detailOpenForm = (type, row) => {
   nextTick(()=>{
-    detailRef.value.formRef.formRef.formModel.batch = '000000'
+    // detailRef.value.formRef.formRef.formModel.batch = '000000'
   })
 }
 
@@ -545,7 +563,7 @@ const tableData = ref([])
 // 添加明细
 const handleAddTable = () => {
   let tfk = JSON.parse(JSON.stringify(tableFormKeys))
-  tfk.batch = '000000'
+  // tfk.batch = '000000'
   tableData.value.push(tfk)
 }
 // 删除明细
@@ -556,6 +574,17 @@ const handleDeleteTable = (item, index) => {
 // 主子数据 提交
 const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
+  let isZC = true // 数量和标包数量 是否整除
+  data.subList.forEach(item => {
+    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 {
@@ -583,6 +612,7 @@ const submitForm = async (formType, data) => {
 const submitFormLabel = async (formType, data) => {
   try {
     detatableData.tableList.forEach(async (item) => {
+      item.toLocationCode = item.fromLocationCode
       await PackageApi.createPackageLabel(item).then(() => {
         isCreateLabel.value = true
         message.success('创建标签成功')
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index b52acb497..ae283b571 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -17,6 +17,9 @@ import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 import * as ProductionlineitemApi  from '@/api/wms/productionlineitem'
 import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
 
+import * as ItempackagingApi from '@/api/wms/itempackage'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+
 import * as SupplieritemApi  from '@/api/wms/supplieritem'
 import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
 
@@ -533,22 +536,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       }]
     },
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
+  
   {
     label: '物料代码',
     field: 'itemCode',
@@ -658,6 +646,71 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       precision: 6
     }
   },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 120
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      isSearchList: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+      searchField: 'packUnit', // 查询弹窗赋值字段
+      searchTitle: '物料包装信息', // 查询弹窗标题
+      searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+      searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请先选择物料代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+        searchField: 'packUnit', // 查询弹窗赋值字段
+        searchTitle: '物料包装信息', // 查询弹窗标题
+        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+        searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '标包数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '计量单位',
     field: 'uom',
@@ -666,7 +719,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 120
     },
     tableForm: {
       type: 'Select',
@@ -708,18 +761,15 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     isTableForm: false,
     isForm: false,
   },
+  
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
     },
     tableForm: {
-      type: 'Select',
       disabled: true
     },
     form: {
@@ -728,9 +778,10 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       }
     }
   },
+  
   {
-    label: '批次',
-    field: 'batch',
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
@@ -744,6 +795,26 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       }
     }
   },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '单据号',
     field: 'number',
@@ -907,6 +978,9 @@ export const ProductionreturnRequestDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'blur' }
+  ]
 })
 
 /**
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index 4f74ce577..ce344ef0d 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -86,7 +86,7 @@
     />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/productionreturn-request-main/importNO" :importTemplateData="importTemplateData"
+  <ImportForm ref="importFormRef" url="/wms/productionreturn-request-main/hold-import" :importTemplateData="importTemplateData"
     @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
 
 </template>
@@ -190,6 +190,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       } else if(formField == 'workStationCode') {
         row['workStationCode'] = val[0]['code']
         row['fromLocationCode'] = val[0]['rawLocationCode']
+      } else if(formField == 'packUnit') {
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
       } else {
         row[formField] = val[0][searchField]
       }
@@ -225,6 +228,9 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
     } 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]
     }
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
index 0fd27bd5c..c43b49670 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
@@ -13,6 +13,9 @@ import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/worksta
 import * as BalanceApi  from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
+import * as ItempackagingApi from '@/api/wms/itempackage'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+
 const { t } = useI18n() // 国际化
 
 /**
@@ -123,22 +126,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       }]
     },
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
+  
   {
     label: '物料代码',
     field: 'itemCode',
@@ -248,6 +236,71 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       precision: 6
     }
   },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 120
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      isSearchList: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+      searchField: 'packUnit', // 查询弹窗赋值字段
+      searchTitle: '物料包装信息', // 查询弹窗标题
+      searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+      searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请先选择物料代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+        searchField: 'packUnit', // 查询弹窗赋值字段
+        searchTitle: '物料包装信息', // 查询弹窗标题
+        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+        searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '标包数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '计量单位',
     field: 'uom',
@@ -298,18 +351,31 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     isTableForm: false,
     isForm: false,
   },
+  
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: false
+    },
+    form: {
+      componentProps: {
+        disabled: false
+      }
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
     tableForm: {
-      type: 'Select',
       disabled: true
     },
     form: {
@@ -319,18 +385,22 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     }
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
     tableForm: {
-      disabled: false
+      type: 'Select',
+      disabled: true
     },
     form: {
       componentProps: {
-        disabled: false
+        disabled: true
       }
     }
   },

From 1b2367e8a5f803467defc8cd344c7b179668b451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 26 Mar 2024 14:50:05 +0800
Subject: [PATCH 57/65] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E8=AE=B0=E5=BD=95=20?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packageoverRecordMain/index.vue           | 35 ++++++++++++++++++-
 .../packageoverRecordMain.data.ts             | 10 ++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
index a7421c788..9774d78d0 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
@@ -66,6 +66,8 @@ import { PackageoverMain,PackageoverMainRules, PackageoverDetail, PackageoverDet
 import * as PackageoverRecordMainApi from '@/api/wms/packageoverRecordMain'
 import * as PackageoverRecordDetailApi from '@/api/wms/packageoverRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as PackageApi from '@/api/wms/package'
+import { getAccessToken } from '@/utils/auth'
 
 // 翻包记录
 defineOptions({ name: 'PackageoverMain' })
@@ -118,11 +120,42 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = (row) => {
-  return []
+  return [defaultButtons.mainListPointBtn(null)] // 标签打印
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if (val == 'point') { // 标签打印
+    handlePoint(row)
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const labelType = ref('') // 标签类别 采购还是制造等
+// 标签打印
+const handlePoint = async (row) => {
+  // 查询是否已创建过标签
+  await PackageApi.getPackagePage({
+    requestNumber: row.number
+  }).then((res) => {
+    if(res.list.length > 0) {
+      if (res.list[0].productionLineCode != null) {
+        labelType.value = 'zz'
+      } else {
+        labelType.value = 'cg'
+      }
+    }
+  }).catch(err => {
+    console.log(err)
+  })
+  // 判断是采购还是制造
+  if (labelType.value == 'cg') {
+    const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+    window.open(src.value+'&request_number='+row.number)
+  } else {
+    const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+    window.open(src.value+'&request_number='+row.number)
+  }
 }
 
 /** 详情操作 */
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
index 5d6693780..0cdb5f1f4 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
@@ -232,6 +232,16 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
 ]))
 
 

From 84322760ab07c4f2bcb6c9d4efd9e54ff936a2fc Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 26 Mar 2024 16:07:42 +0800
Subject: [PATCH 58/65] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptscrapRequestMain/index.vue                  | 4 ++--
 .../productreceiptscrapRequestMain.data.ts                    | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index ff70c327f..3541ec885 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -585,8 +585,8 @@ const submitFormLabel = async (formType, data) => {
   try {
     detatableData.tableList.forEach(async (item) => {
       // 创建标签 要物料库区配置表中 入库包装规格
-      item.packUnit = null
-      item.inOfOut = 'in'
+      // item.packUnit = null
+      // item.inOfOut = 'in'
       await PackageApi.createPackageLabel(item).then(res => {
         isCreateLabel.value = true
         message.success('创建标签成功')
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index f53d8bba2..535b4adc7 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -446,7 +446,6 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     },
-    isForm: false
   },
   {
     label: '操作',

From 4bc2afd82ae0e670d824077b1062acf33344d74d Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 26 Mar 2024 17:41:08 +0800
Subject: [PATCH 59/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                             |   3 +-
 .../deliverJobMain/deliverJobMain.data.ts     |   8 +
 .../deliver/deliverJobMain/index.vue          | 191 +++++++++---------
 .../deliverRecordMain.data.ts                 |   8 +
 .../deliverRequestMain.data.ts                |  71 ++++++-
 .../deliverPlanMain/deliverPlanMain.data.ts   |  77 ++++++-
 6 files changed, 256 insertions(+), 102 deletions(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index a55244551..c2a9ff9f1 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -276,5 +276,6 @@ export enum DICT_TYPE {
   PACK_UNIT_TYPE = 'pack_unit_type', // 包装规格类型
   TRANSFER_REASON = 'transfer_reason', // 调拨出入库原因
   PURCHASERECEIPT_SOURCE_TYPE="purchasereceipt_source_type",//采购收货数据来源
-  PLAN_PRODUCTION_TYPE = "plan_production_type" // 生产计划类型
+  PLAN_PRODUCTION_TYPE = "plan_production_type", // 生产计划类型
+  DELIVER_TYPE="deliver_type",//发货类型
 }
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
index db84960d1..3e307ff01 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
@@ -761,6 +761,14 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '在途库库位',
+    field: 'onTheWayLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '从库位代码',
     field: 'fromLocationCode',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
index 8d5aeea6c..93cdffaa4 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
@@ -180,112 +180,109 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
-    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
    if (val == 'mainJobExe') { // 执行
-    let aaa = {
-    "id": "1809190002130023685",
-    "requestNumber": "REQ1720231222-0004",
-    "deliverPlanNumber": "DP20231222-0004",
-    "customerDeliverNumber": "CUST20231222-00000005",
-    "customerCode": "CF",
-    "customerDockCode": "CFCKYT",
-    "deliverDock": null,
-    "carrierCode": null,
-    "transferMode": null,
-    "vehiclePlateNumber": null,
-    "fromWarehouseCode": null,
-    "toWarehouseCode": "CFCK",
-    "requestTime": 1703207798000,
-    "requestDueTime": 1703952000000,
-    "status": "2",
-    "expiredTime": null,
-    "updateTime": 1703207917000,
-    "updater": "超级管理员",
-    "jobStageStatus": null,
-    "priority": null,
-    "priorityincrement": null,
-    "departmentCode": "100",
-    "acceptUserId": "1",
-    "acceptTime": 1703207934000,
-    "completeUserId": null,
-    "completeTime": null,
-    "fromAreaTypes": "FG",
-    "toAreaTypes": "CUST",
-    "number": "JOB2420231222-0006",
-    "businessType": "DeliverJob",
-    "remark": "",
-    "createTime": 1703207917000,
-    "creator": "超级管理员",
-    "ruleUserId": null,
-    "fromAreaCodes": "采购在途库",
-    "toAreaCodes": "采购在途库",
-    "fromDockCode": null,
-    "autoComplete": "FALSE",
-    "allowModifyLocation": "FALSE",
-    "allowModifyQty": "TRUE",
-    "allowBiggerQty": "TRUE",
-    "allowSmallerQty": "TRUE",
-    "allowModifyInventoryStatus": "TRUE",
-    "allowContinuousScanning": "TRUE",
-    "allowPartialComplete": "TRUE",
-    "allowModifyBatch": "FALSE",
-    "allowModifyPackingNumber": "FALSE",
-    "inInventoryStatuses": "OK",
-    "outInventoryStatuses": "OK",
-    "concurrencyStamp": 1,
-    "subList": [{
-    "id": "1809190001245559379",
-    "soNumber": null,
-    "soLine": null,
-    "packingNumber": null,
-    "batch": "20230808",
-    "inventoryStatus": "OK",
-    "ownerCode": null,
-    "containerNumber": null,
-    "fromLocationCode": "L-R-001-001-1-01",
-    "toLocationCode": "CUST",
-    "itemCode": "testCF",
-    "itemName": "陈放测试物料",
-    "itemDesc1": "测试用",
-    "itemDesc2": "测试用",
-    "projectCode": "5",
-    "qty": 5,
-    "uom": "EA",
-    "number": "JOB2420231222-0006",
-    "remark": "",
-    "createTime": 1703207917000,
-    "creator": "超级管理员",
-    "toPackingNumber": null,
-    "toContainerNumber": null,
-    "toBatch": null,
-    "handleQty": null,
-    "toInventoryStatus": null,
-        recordList: [{
-            handleQty: 10,
-            toPackingNumber: '12',
-            toContainerNumber: '001',
-            toBatch: '21',
+    let aaa = {
+  "id": 3,
+  "requestNumber": "REQ1720240326-0012",
+  "deliverPlanNumber": "",
+  "customerDeliverNumber": "CUST20240326-00000012",
+  "customerCode": "KHV",
+  "customerDockCode": "YTV4",
+  "deliverDock": null,
+  "carrierCode": "",
+  "transferMode": "",
+  "vehiclePlateNumber": "",
+  "fromWarehouseCode": null,
+  "toWarehouseCode": "CKV",
+  "requestTime": 1711443936000,
+  "requestDueTime": null,
+  "status": "2",
+  "expiredTime": null,
+  "updateTime": 1711443936000,
+  "updater": "超级管理员",
+  "jobStageStatus": null,
+  "priority": null,
+  "priorityincrement": null,
+  "departmentCode": "100",
+  "acceptUserId": "1",
+  "acceptTime": 1711443941000,
+  "completeUserId": null,
+  "completeTime": null,
+  "fromAreaTypes": "FG,STOCK_UP",
+  "toAreaTypes": "CUST,THIRD_PARTY",
+  "number": "JOB2420240326-0013",
+  "businessType": "Deliver",
+  "remark": "",
+  "createTime": 1711443936000,
+  "creator": "超级管理员",
+  "ruleUserId": null,
+  "fromAreaCodes": "FG",
+  "toAreaCodes": "CUST,ZTQ",
+  "fromDockCode": null,
+  "autoComplete": "FALSE",
+  "allowModifyLocation": "FALSE",
+  "allowModifyQty": "TRUE",
+  "allowBiggerQty": "TRUE",
+  "allowSmallerQty": "TRUE",
+  "allowModifyInventoryStatus": "TRUE",
+  "allowContinuousScanning": "TRUE",
+  "allowPartialComplete": "TRUE",
+  "allowModifyBatch": "FALSE",
+  "allowModifyPackingNumber": "FALSE",
+  "inInventoryStatuses": "OK",
+  "outInventoryStatuses": "OK",
+  "concurrencyStamp": 1,
+  "useOnTheWayLocation": null,
+  "subList": [{
+  "id": 3,
+  "soNumber": null,
+  "soLine": null,
+  "packingNumber": null,
+  "batch": "2024021801",
+  "inventoryStatus": "OK",
+  "ownerCode": null,
+  "containerNumber": null,
+  "fromLocationCode": "FG",
+  "toLocationCode": "SFK",
+  "itemCode": "vvcs-zhj1",
+  "itemName": "测试物件",
+  "itemDesc1": "水冷系-散热器",
+  "itemDesc2": "水冷系-散热器",
+  "projectCode": "PJ001",
+  "qty": 11,
+  "uom": "PC",
+  "number": "JOB2420240326-0013",
+  "remark": "",
+  "createTime": 1711443936000,
+  "creator": "超级管理员",
+  "toPackingNumber": null,
+  "toContainerNumber": null,
+  "toBatch": null,
+  "handleQty": null,
+  "toInventoryStatus": null,
+  "updateTime": 1711443936000,
+  "updater": "超级管理员",
+  "onTheWayLocationCode": "FHZTK",
+      recordList: [{
+            handleQty: 11,
+            toPackingNumber: null,
+            toContainerNumber: null,
+            toBatch: '2024021801',
             toInventoryStatus: 'OK',
-            toLocationCode: 'H03',
-            supplierCode: '31213',
-          },{
-            handleQty: 22,
-            toPackingNumber: 'M20230421000005',
-            toContainerNumber: '001',
-            toBatch: '20230808',
-            toInventoryStatus: 'OK',
-            toLocationCode: 'SFG',
+            toLocationCode: "SFK",
             supplierCode: '31213',
           }]
-      }]
+    }
+  ]
 }
     handleHandle(aaa)
     console.log('列表-操作按钮事件-执行')
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
index a11a3c3f1..a3ca68a6e 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
@@ -516,6 +516,14 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '在途库库位',
+    field: 'onTheWayLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '从库位代码',
     field: 'fromLocationCode',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index ae7805bab..fcb7b4b31 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -19,6 +19,9 @@ import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/cu
 import * as CarrierApi from '@/api/wms/carrier'
 import { Carrier } from '@/views/wms/basicDataManage/orderManage/carrier/carrier.data'
 
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import * as WorkstationApi from '@/api/wms/workstation'
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -166,6 +169,16 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '发货类型',
+    field: 'deliverType',
+    sort: 'custom',
+    dictType: DICT_TYPE.DELIVER_TYPE,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '承运商',
     field: 'carrierCode',
@@ -200,6 +213,15 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '发货库区类型',
+    field: 'deliverType',
+    sort: 'custom',
+    dictType: DICT_TYPE.DELIVER_TYPE,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '车牌号',
     field: 'vehiclePlateNumber',
@@ -527,6 +549,9 @@ export const DeliverRequestMainRules = reactive({
   customerCode: [
     { required: true, message: '请选择客户代码', trigger: 'change' }
   ],
+  deliverType: [
+    { required: true, message: '发货库区类型不能为空', trigger: 'change' }
+  ],
   customerDockCode: [
     { required: true, message: '请选择客户月台代码', trigger: 'change' }
   ],
@@ -783,7 +808,8 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true
     },
     form: {
       componentProps: {
@@ -798,8 +824,44 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择到库位代码',
+      searchField: 'code',
+      searchTitle: '库位基础信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: WorkstationApi.selectAreaTypeToLocation,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'areaType',
+        value: "deliverType",
+        message:"请选择发货类型",
+        isMainValue: true
+    }]
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择到库位代码',
+        searchField: 'code',
+        searchTitle: '库位基础信息',
+        searchAllSchemas: Location.allSchemas,
+      searchPage: WorkstationApi.selectAreaTypeToLocation,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'areaType',
+          value: "deliverType",
+          message:"请选择发货类型",
+          isMainValue: false
+      }]
+      }
+    },
   },
   {
     label: '库存状态',
@@ -966,4 +1028,7 @@ export const DeliverRequestDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
 })
\ No newline at end of file
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index c7bea610a..0ab9228ad 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -10,8 +10,15 @@ import { Customerdock } from '@/views/wms/basicDataManage/customerManage/custome
 import * as CustomerItemApi from '@/api/wms/customeritem'
 import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data'
 
+
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import * as WorkstationApi from '@/api/wms/workstation'
+
 import * as getPlansettingApi  from '@/api/wms/plansetting/index'
 
+import * as getBusinessTypeApi  from '@/api/wms/businesstype/index'
+
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -23,6 +30,13 @@ const queryParams = {
  const data = await getPlansettingApi.getPlansettingPage(queryParams)
  const plansettingData =data?.list[0]||{}
 
+ const businessTypeQueryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'Deliver'
+}
+const data1 = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams)
+const businessTypeData =data1?.list[0]||{}
 /**
  * @returns {Array} 发货计划主表
  */
@@ -63,6 +77,16 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '发货类型',
+    field: 'deliverType',
+    sort: 'custom',
+    dictType: DICT_TYPE.DELIVER_TYPE,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '计划日期',
     field: 'planDate',
@@ -317,6 +341,9 @@ export const DeliverPlanMainRules = reactive({
   customerCode: [
     { required: true, message: '请选择客户代码', trigger: 'change' }
   ],
+  deliverType: [
+    { required: true, message: '发货库区类型不能为空', trigger: 'change' }
+  ],
   planDate: [
     { required: true, message: '计划日期不能为空', trigger: 'change' }
   ],
@@ -405,7 +432,6 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchCondition: [{
         key: 'available',
         value: 'TRUE',
-        isMainValue: false
       },{
         key: 'customerCode',
         value: 'customerCode',
@@ -500,6 +526,52 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择到库位代码',
+      searchField: 'code',
+      searchTitle: '库位基础信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: WorkstationApi.selectAreaTypeToLocation,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'areaType',
+        value: "deliverType",
+        message:"请选择发货类型",
+        isMainValue: true
+    }]
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择到库位代码',
+        searchField: 'code',
+        searchTitle: '库位基础信息',
+        searchAllSchemas: Location.allSchemas,
+      searchPage: WorkstationApi.selectAreaTypeToLocation,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'areaType',
+          value: "deliverType",
+          message:"请选择发货类型",
+          isMainValue: false
+      }]
+      }
+    },
+  },
   {
     label: '备注',
     field: 'remark',
@@ -657,6 +729,9 @@ export const DeliverPlanDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物料代码', trigger: 'change' }
   ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
   available: [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],

From 3c9a4bbc3aec2ff83ef0e807b60b416311727da8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AE=9C=E9=98=B3?= <1301318913@qq.com>
Date: Wed, 27 Mar 2024 11:07:57 +0800
Subject: [PATCH 60/65] =?UTF-8?q?=E5=A2=9E=E5=8A=A0mes=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=97=A5=E5=8E=86=E6=8E=92=E4=BA=A7=E8=AE=A1=E5=88=92=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/productionPlan/index.ts           |  61 +++++
 src/views/mes/productionPlan/index.vue        | 244 ++++++++++++++++++
 .../mes/productionPlan/productionPlan.data.ts | 182 +++++++++++++
 3 files changed, 487 insertions(+)
 create mode 100644 src/api/mes/productionPlan/index.ts
 create mode 100644 src/views/mes/productionPlan/index.vue
 create mode 100644 src/views/mes/productionPlan/productionPlan.data.ts

diff --git a/src/api/mes/productionPlan/index.ts b/src/api/mes/productionPlan/index.ts
new file mode 100644
index 000000000..de60663ba
--- /dev/null
+++ b/src/api/mes/productionPlan/index.ts
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface ProductionPlanVO {
+  id: number
+  planCode: string
+  planName: string
+  teamType: string
+  endTime: Date
+  shiftMode: string
+  billState: number
+  deleteTime: Date
+  status: string
+  concurrencyStamp: number
+  remark: string
+  deleter: string
+  siteId: number
+  textOne: string
+  textTwo: string
+  textThree: string
+}
+
+// 查询生产排产计划列表
+export const getProductionPlanPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/productionPlan/senior', data })
+  } else {
+    return await request.get({ url: `/mes/productionPlan/page`, params })
+  }
+}
+
+// 查询生产排产计划详情
+export const getProductionPlan = async (id: number) => {
+  return await request.get({ url: `/mes/productionPlan/get?id=` + id })
+}
+
+// 新增生产排产计划
+export const createProductionPlan = async (data: ProductionPlanVO) => {
+  return await request.post({ url: `/mes/productionPlan/create`, data })
+}
+
+// 修改生产排产计划
+export const updateProductionPlan = async (data: ProductionPlanVO) => {
+  return await request.put({ url: `/mes/productionPlan/update`, data })
+}
+
+// 删除生产排产计划
+export const deleteProductionPlan = async (id: number) => {
+  return await request.delete({ url: `/mes/productionPlan/delete?id=` + id })
+}
+
+// 导出生产排产计划 Excel
+export const exportProductionPlan = async (params) => {
+  return await request.download({ url: `/mes/productionPlan/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/productionPlan/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/mes/productionPlan/index.vue b/src/views/mes/productionPlan/index.vue
new file mode 100644
index 000000000..1c9271bea
--- /dev/null
+++ b/src/views/mes/productionPlan/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductionPlan.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductionPlan.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :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 #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ProductionPlanRules"
+    :formAllSchemas="ProductionPlan.allSchemas"
+    :apiUpdate="ProductionPlanApi.updateProductionPlan"
+    :apiCreate="ProductionPlanApi.createProductionPlan"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="ProductionPlan.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/mes/productionPlan/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductionPlan,ProductionPlanRules } from './productionPlan.data'
+import * as ProductionPlanApi from '@/api/mes/productionPlan'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'MesProductionPlan' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductionPlan.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionPlanApi.getProductionPlanPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'mes:productionPlan:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'mes:productionPlan:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'mes:productionPlan:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'mes:productionPlan:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'mes:productionPlan:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =ProductionPlan.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await ProductionPlanApi.createProductionPlan(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ProductionPlanApi.updateProductionPlan(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicProductionPlan')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ProductionPlanApi.deleteProductionPlan(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionPlanApi.exportProductionPlan(tableObject.params)
+    download.excel(data, '生产排产计划.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '生产排产计划导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductionPlanApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/mes/productionPlan/productionPlan.data.ts b/src/views/mes/productionPlan/productionPlan.data.ts
new file mode 100644
index 000000000..539264c0e
--- /dev/null
+++ b/src/views/mes/productionPlan/productionPlan.data.ts
@@ -0,0 +1,182 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ProductionPlanRules = reactive({
+  endTime: [required],
+  concurrencyStamp: [required],
+})
+
+export const ProductionPlan = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '计划编号',
+    field: 'planCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '计划名称',
+    field: 'planName',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '班组类型',
+    field: 'teamType',
+    sort: 'custom',
+    isSearch: true,
+                // form: {
+                //   component: 'SelectV2'
+                // },
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '轮班方式',
+    field: 'shiftMode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '单据状态',
+    field: 'billState',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '删除时间',
+    field: 'deleteTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '删除用户名',
+    field: 'deleter',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '位置ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '备用字段一',
+    field: 'textOne',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '备用字段二',
+    field: 'textTwo',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '备用字段三',
+    field: 'textThree',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

From 027d879a425945625c2534d111d447204b5ae1c0 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 27 Mar 2024 11:11:08 +0800
Subject: [PATCH 61/65] test

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index a28b719c2..554ca3d62 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,8 @@ form: {
       ]
     }
 }
+
+
 **tableForm明细列表查询弹窗配置**
 tableForm:{
   isInpuFocusShow: true, // 开启查询弹窗 【**与form表单中唯一不同属性**】

From e3bcb7d1bca307e961cf43672ee826418bf0d54b Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 27 Mar 2024 11:32:47 +0800
Subject: [PATCH 62/65] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/supplierdeliverRecordMain/index.vue        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
index 5e1b2a07e..9119693f4 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
@@ -175,7 +175,8 @@ const handlerCreatePurchasereceiptRequest = async (number:string) => {
 
 // 单据打印
 const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
-const documentSrc = ref(BASE_URL + '/jmreport/view/884680688168280064?token=' + getAccessToken())
+//const documentSrc = ref(BASE_URL + '/jmreport/view/884680688168280064?token=' + getAccessToken())
+const documentSrc = ref(BASE_URL + '/jmreport/view/932556833517789184?token=' + getAccessToken())
 const handleDocumentPrint = async (id) => {
   window.open(documentSrc.value + '&id=' + id)
 }

From 2d0630ebd10a930f0a19ec3bbe557fae937c7dce Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 27 Mar 2024 11:33:43 +0800
Subject: [PATCH 63/65] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/supplierdeliverRequestMain/index.vue       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 35dd36a73..13a635690 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -601,7 +601,8 @@ const print = async () => {
 }
 
 // 单据打印
-const documentSrc = ref(BASE_URL + '/jmreport/view/884680688168280064?token=' + getAccessToken())
+// const documentSrc = ref(BASE_URL + '/jmreport/view/884680688168280064?token=' + getAccessToken())
+const documentSrc = ref(BASE_URL + '/jmreport/view/932556833517789184?token=' + getAccessToken())
 const handleDocumentPrint = async (id) => {
   window.open(documentSrc.value + '&id=' + id)
 }

From 511129542f1dee0823a529b8123a3a615b40af64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Wed, 27 Mar 2024 13:15:55 +0800
Subject: [PATCH 64/65] =?UTF-8?q?=E5=88=B6=E5=93=81=E5=9B=9E=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productredressJobDetail/index.ts  |  71 +++
 src/api/wms/productredressJobMain/index.ts    |  87 +++
 .../wms/productredressRecordDetail/index.ts   |  77 +++
 src/api/wms/productredressRecordMain/index.ts |  70 +++
 .../wms/productredressRequestDetail/index.ts  |  73 +++
 .../wms/productredressRequestMain/index.ts    | 100 +++
 src/components/SearchHigh/src/SearchHigh.vue  |   8 +-
 .../productredressJobMain/index.vue           | 244 +++++++
 .../productredressJobMain.data.ts             | 523 +++++++++++++++
 .../productredressRecordMain/index.vue        | 244 +++++++
 .../productredressRecordMain.data.ts          | 446 +++++++++++++
 .../productredressRequestMain/index.vue       | 501 +++++++++++++++
 .../productredressRequestMain.data.ts         | 595 ++++++++++++++++++
 13 files changed, 3038 insertions(+), 1 deletion(-)
 create mode 100644 src/api/wms/productredressJobDetail/index.ts
 create mode 100644 src/api/wms/productredressJobMain/index.ts
 create mode 100644 src/api/wms/productredressRecordDetail/index.ts
 create mode 100644 src/api/wms/productredressRecordMain/index.ts
 create mode 100644 src/api/wms/productredressRequestDetail/index.ts
 create mode 100644 src/api/wms/productredressRequestMain/index.ts
 create mode 100644 src/views/wms/productionManage/productredress/productredressJobMain/index.vue
 create mode 100644 src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
 create mode 100644 src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
 create mode 100644 src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
 create mode 100644 src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
 create mode 100644 src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts

diff --git a/src/api/wms/productredressJobDetail/index.ts b/src/api/wms/productredressJobDetail/index.ts
new file mode 100644
index 000000000..27dd360fe
--- /dev/null
+++ b/src/api/wms/productredressJobDetail/index.ts
@@ -0,0 +1,71 @@
+import request from '@/config/axios'
+
+export interface ProductredressJobDetailVO {
+  id: number
+  productionLineCode: string
+  workStationCode: string
+  processCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  produceDate: Date
+  expireDate: Date
+  inventoryStatus: string
+  toLocationCode: string
+  woNumber: string
+  woLine: string
+  packQty: number
+  packUnit: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  masterId: number
+  number: string
+  remark: string
+  toOwnerCode: string
+}
+
+// 查询制品回收任务子列表
+export const getProductredressJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productredress-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productredress-job-detail/page`, params })
+  }
+}
+
+// 查询制品回收任务子详情
+export const getProductredressJobDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productredress-job-detail/get?id=` + id })
+}
+
+// 新增制品回收任务子
+export const createProductredressJobDetail = async (data: ProductredressJobDetailVO) => {
+  return await request.post({ url: `/wms/productredress-job-detail/create`, data })
+}
+
+// 修改制品回收任务子
+export const updateProductredressJobDetail = async (data: ProductredressJobDetailVO) => {
+  return await request.put({ url: `/wms/productredress-job-detail/update`, data })
+}
+
+// 删除制品回收任务子
+export const deleteProductredressJobDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productredress-job-detail/delete?id=` + id })
+}
+
+// 导出制品回收任务子 Excel
+export const exportProductredressJobDetail = async (params) => {
+  return await request.download({ url: `/wms/productredress-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productredress-job-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productredressJobMain/index.ts b/src/api/wms/productredressJobMain/index.ts
new file mode 100644
index 000000000..40311c5c8
--- /dev/null
+++ b/src/api/wms/productredressJobMain/index.ts
@@ -0,0 +1,87 @@
+import request from '@/config/axios'
+
+export interface ProductredressJobMainVO {
+  id: number
+  requestNumber: string
+  productionPlanNumber: string
+  workShopCode: string
+  team: string
+  shift: string
+  details: string
+  requestTime: Date
+  requestDueTime: Date
+  status: string
+  expiredTime: Date
+  jobStageStatus: string
+  priority: number
+  priorityIncrement: number
+  departmentCode: string
+  userGroupCode: string
+  acceptUserId: string
+  acceptUserName: string
+  acceptTime: Date
+  completeUserId: string
+  completeUserName: string
+  completeTime: Date
+  toWarehouseCode: string
+  toAreaCodes: string
+  fromAreaTypes: string
+  toAreaTypes: string
+  number: string
+  type: string
+  businessType: string
+  remark: string
+  autoComplete: string
+  allowModifyLocation: string
+  allowModifyQty: string
+  allowBiggerQty: string
+  allowSmallerQty: string
+  allowModifyInventoryStatus: string
+  allowContinuousScanning: string
+  allowPartialComplete: string
+  allowModifyBatch: string
+  allowModifyPackingNumber: string
+  inInventoryStatuses: string
+  outInventoryStatuses: string
+}
+
+// 查询制品回收任务主列表
+export const getProductredressJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productredress-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productredress-job-main/page`, params })
+  }
+}
+
+// 查询制品回收任务主详情
+export const getProductredressJobMain = async (id: number) => {
+  return await request.get({ url: `/wms/productredress-job-main/get?id=` + id })
+}
+
+// 新增制品回收任务主
+export const createProductredressJobMain = async (data: ProductredressJobMainVO) => {
+  return await request.post({ url: `/wms/productredress-job-main/create`, data })
+}
+
+// 修改制品回收任务主
+export const updateProductredressJobMain = async (data: ProductredressJobMainVO) => {
+  return await request.put({ url: `/wms/productredress-job-main/update`, data })
+}
+
+// 删除制品回收任务主
+export const deleteProductredressJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productredress-job-main/delete?id=` + id })
+}
+
+// 导出制品回收任务主 Excel
+export const exportProductredressJobMain = async (params) => {
+  return await request.download({ url: `/wms/productredress-job-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productredress-job-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productredressRecordDetail/index.ts b/src/api/wms/productredressRecordDetail/index.ts
new file mode 100644
index 000000000..860b7d8a3
--- /dev/null
+++ b/src/api/wms/productredressRecordDetail/index.ts
@@ -0,0 +1,77 @@
+import request from '@/config/axios'
+
+export interface ProductredressRecordDetailVO {
+  id: number
+  productionlineCode: string
+  workStationCode: string
+  processCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  produceDate: Date
+  expireDate: Date
+  inventoryStatus: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  toOwnerCode: string
+  woNumber: string
+  woLine: string
+  packQty: number
+  packUnit: string
+  bomVersion: string
+  backFlushDetails: string
+  masterId: number
+  number: string
+  itemCode: string
+  remark: string
+  siteId: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  interfaceType: string
+}
+
+// 查询制品回收记录子列表
+export const getProductredressRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productredress-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productredress-record-detail/page`, params })
+  }
+}
+
+// 查询制品回收记录子详情
+export const getProductredressRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productredress-record-detail/get?id=` + id })
+}
+
+// 新增制品回收记录子
+export const createProductredressRecordDetail = async (data: ProductredressRecordDetailVO) => {
+  return await request.post({ url: `/wms/productredress-record-detail/create`, data })
+}
+
+// 修改制品回收记录子
+export const updateProductredressRecordDetail = async (data: ProductredressRecordDetailVO) => {
+  return await request.put({ url: `/wms/productredress-record-detail/update`, data })
+}
+
+// 删除制品回收记录子
+export const deleteProductredressRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productredress-record-detail/delete?id=` + id })
+}
+
+// 导出制品回收记录子 Excel
+export const exportProductredressRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/productredress-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productredress-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productredressRecordMain/index.ts b/src/api/wms/productredressRecordMain/index.ts
new file mode 100644
index 000000000..e935de9c9
--- /dev/null
+++ b/src/api/wms/productredressRecordMain/index.ts
@@ -0,0 +1,70 @@
+import request from '@/config/axios'
+
+export interface ProductredressRecordMainVO {
+  id: number
+  requestNumber: string
+  jobNumber: string
+  productionPlanNumber: string
+  workshopCode: string
+  team: string
+  shift: string
+  details: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  available: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  interfaceType: string
+  number: string
+  type: string
+  businessType: string
+  remark: string
+  code: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+}
+
+// 查询制品回收记录主列表
+export const getProductredressRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productredress-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productredress-record-main/page`, params })
+  }
+}
+
+// 查询制品回收记录主详情
+export const getProductredressRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/productredress-record-main/get?id=` + id })
+}
+
+// 新增制品回收记录主
+export const createProductredressRecordMain = async (data: ProductredressRecordMainVO) => {
+  return await request.post({ url: `/wms/productredress-record-main/create`, data })
+}
+
+// 修改制品回收记录主
+export const updateProductredressRecordMain = async (data: ProductredressRecordMainVO) => {
+  return await request.put({ url: `/wms/productredress-record-main/update`, data })
+}
+
+// 删除制品回收记录主
+export const deleteProductredressRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productredress-record-main/delete?id=` + id })
+}
+
+// 导出制品回收记录主 Excel
+export const exportProductredressRecordMain = async (params) => {
+  return await request.download({ url: `/wms/productredress-record-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productredress-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productredressRequestDetail/index.ts b/src/api/wms/productredressRequestDetail/index.ts
new file mode 100644
index 000000000..150891c58
--- /dev/null
+++ b/src/api/wms/productredressRequestDetail/index.ts
@@ -0,0 +1,73 @@
+import request from '@/config/axios'
+
+export interface ProductredressRequestDetailVO {
+  id: number
+  productionLineCode: string
+  workStationCode: string
+  toLocationCode: string
+  processCode: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  produceDate: Date
+  expireDate: Date
+  inventoryStatus: string
+  woNumber: string
+  woLine: string
+  packQty: number
+  packUnit: string
+  bomVersion: string
+  backFlushDetails: string
+  masterId: number
+  number: string
+  itemCode: string
+  remark: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  toOwnerCode: string
+}
+
+// 查询制品回收申请子列表
+export const getProductredressRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productredress-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productredress-request-detail/page`, params })
+  }
+}
+
+// 查询制品回收申请子详情
+export const getProductredressRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productredress-request-detail/get?id=` + id })
+}
+
+// 新增制品回收申请子
+export const createProductredressRequestDetail = async (data: ProductredressRequestDetailVO) => {
+  return await request.post({ url: `/wms/productredress-request-detail/create`, data })
+}
+
+// 修改制品回收申请子
+export const updateProductredressRequestDetail = async (data: ProductredressRequestDetailVO) => {
+  return await request.put({ url: `/wms/productredress-request-detail/update`, data })
+}
+
+// 删除制品回收申请子
+export const deleteProductredressRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productredress-request-detail/delete?id=` + id })
+}
+
+// 导出制品回收申请子 Excel
+export const exportProductredressRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/productredress-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productredress-request-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productredressRequestMain/index.ts b/src/api/wms/productredressRequestMain/index.ts
new file mode 100644
index 000000000..933a72def
--- /dev/null
+++ b/src/api/wms/productredressRequestMain/index.ts
@@ -0,0 +1,100 @@
+import request from '@/config/axios'
+
+export interface ProductredressRequestMainVO {
+  id: number
+  productionPlanNumber: string
+  workshopCode: string
+  team: string
+  shift: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  number: string
+  type: 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
+  inInventoryStatuses: string
+  outInventoryStatuses: string
+}
+
+// 查询制品回收申请主列表
+export const getProductredressRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productredress-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productredress-request-main/page`, params })
+  }
+}
+
+// 查询制品回收申请主详情
+export const getProductredressRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/productredress-request-main/get?id=` + id })
+}
+
+// 新增制品回收申请主
+export const createProductredressRequestMain = async (data: ProductredressRequestMainVO) => {
+  return await request.post({ url: `/wms/productredress-request-main/create`, data })
+}
+
+// 修改制品回收申请主
+export const updateProductredressRequestMain = async (data: ProductredressRequestMainVO) => {
+  return await request.put({ url: `/wms/productredress-request-main/update`, data })
+}
+
+// 删除制品回收申请主
+export const deleteProductredressRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productredress-request-main/delete?id=` + id })
+}
+
+// 导出制品回收申请主 Excel
+export const exportProductredressRequestMain = async (params) => {
+  return await request.download({ url: `/wms/productredress-request-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productredress-request-main/get-import-template' })
+}
+
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/productredress-request-main/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/productredress-request-main/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/productredress-request-main/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/productredress-request-main/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/productredress-request-main/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/productredress-request-main/handle?id=' + id })
+}
\ No newline at end of file
diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue
index be0dba4a3..0c3ab7a0c 100644
--- a/src/components/SearchHigh/src/SearchHigh.vue
+++ b/src/components/SearchHigh/src/SearchHigh.vue
@@ -126,6 +126,12 @@ const moreListOptions = ref({
     }, {
       value: 'isNotNull',
       label: '不是空'
+    }, {
+      value: 'isStr',
+      label: '是空字符串'
+    }, {
+      value: 'isNotStr',
+      label: '不是空字符串'
     }
   ]
 })
@@ -205,7 +211,7 @@ const resetSelect = (val) => {
 }
 // 范围改变
 const actionSelect = (val)=>{
-  if(val.action=='isNull'|| val.action == 'isNotNull'){
+  if(val.action=='isNull'|| val.action == 'isNotNull'|| val.action == 'isStr'|| val.action == 'isNotStr'){
     val.disabled = true
   }else{
     val.disabled = false
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
new file mode 100644
index 000000000..0f5b83f11
--- /dev/null
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductredressJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductredressJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :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 #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ProductredressJobMainRules"
+    :formAllSchemas="ProductredressJobMain.allSchemas"
+    :apiUpdate="ProductredressJobMainApi.updateProductredressJobMain"
+    :apiCreate="ProductredressJobMainApi.createProductredressJobMain"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="ProductredressJobMain.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productredress-job-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductredressJobMain,ProductredressJobMainRules } from './productredressJobMain.data'
+import * as ProductredressJobMainApi from '@/api/wms/productredressJobMain'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'ProductredressJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductredressJobMain.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductredressJobMainApi.getProductredressJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productredressJobMain:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productredressJobMain:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productredressJobMain:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:productredressJobMain:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:productredressJobMain:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =ProductredressJobMain.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await ProductredressJobMainApi.createProductredressJobMain(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ProductredressJobMainApi.updateProductredressJobMain(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicProductredressJobMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ProductredressJobMainApi.deleteProductredressJobMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductredressJobMainApi.exportProductredressJobMain(tableObject.params)
+    download.excel(data, '制品回收任务主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '制品回收任务主导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductredressJobMainApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
new file mode 100644
index 000000000..1bd45da80
--- /dev/null
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
@@ -0,0 +1,523 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ProductredressJobMainRules = reactive({
+})
+
+export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '车间代码',
+    field: 'workShopCode',
+    sort: 'custom',
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+  },
+  {
+    label: '明细',
+    field: 'details',
+    sort: 'custom',
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '最后更新者Id',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '状态',
+    field: 'jobStageStatus',
+    sort: 'custom',
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+  },
+  {
+    label: '用户组',
+    field: 'userGroupCode',
+    sort: 'custom',
+  },
+  {
+    label: '承接人用户ID',
+    field: 'acceptUserId',
+    sort: 'custom',
+  },
+  {
+    label: '承接人用户名',
+    field: 'acceptUserName',
+    sort: 'custom',
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '完成人用户ID',
+    field: 'completeUserId',
+    sort: 'custom',
+  },
+  {
+    label: '完成人用户名',
+    field: 'completeUserName',
+    sort: 'custom',
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    sort: 'custom',
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    sort: 'custom',
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+  },
+  {
+    label: '收货类型',
+    field: 'type',
+    sort: 'custom',
+                form: {
+                  component: 'SelectV2'
+                },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+                form: {
+                  component: 'SelectV2'
+                },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '创建者id',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    sort: 'custom',
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    sort: 'custom',
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    sort: 'custom',
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    sort: 'custom',
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    sort: 'custom',
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    sort: 'custom',
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    sort: 'custom',
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    sort: 'custom',
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    sort: 'custom',
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    sort: 'custom',
+  },
+  {
+    label: '入库库存状态范围',
+    field: 'inInventoryStatuses',
+    sort: 'custom',
+  },
+  {
+    label: '出库库存状态范围',
+    field: 'outInventoryStatuses',
+    sort: 'custom',
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ProductredressJobDetailRules = reactive({
+})
+
+export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    sort: 'custom',
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+  },
+  {
+    label: '主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '创建者Id',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '最后更新者Id',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
new file mode 100644
index 000000000..753878fa1
--- /dev/null
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductredressRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductredressRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :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 #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ProductredressRecordMainRules"
+    :formAllSchemas="ProductredressRecordMain.allSchemas"
+    :apiUpdate="ProductredressRecordMainApi.updateProductredressRecordMain"
+    :apiCreate="ProductredressRecordMainApi.createProductredressRecordMain"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="ProductredressRecordMain.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productredress-record-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductredressRecordMain,ProductredressRecordMainRules } from './productredressRecordMain.data'
+import * as ProductredressRecordMainApi from '@/api/wms/productredressRecordMain'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'ProductredressRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductredressRecordMain.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductredressRecordMainApi.getProductredressRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productredressRecordMain:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productredressRecordMain:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productredressRecordMain:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:productredressRecordMain:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:productredressRecordMain:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =ProductredressRecordMain.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await ProductredressRecordMainApi.createProductredressRecordMain(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ProductredressRecordMainApi.updateProductredressRecordMain(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicProductredressRecordMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ProductredressRecordMainApi.deleteProductredressRecordMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductredressRecordMainApi.exportProductredressRecordMain(tableObject.params)
+    download.excel(data, '制品回收记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '制品回收记录主导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductredressRecordMainApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
new file mode 100644
index 000000000..47e4fad1c
--- /dev/null
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
@@ -0,0 +1,446 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ProductredressRecordMainRules = reactive({
+})
+
+export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+  },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+  },
+  {
+    label: '班组',
+    field: 'team',
+    sort: 'custom',
+  },
+  {
+    label: '班次',
+    field: 'shift',
+    sort: 'custom',
+  },
+  {
+    label: '明细',
+    field: 'details',
+    sort: 'custom',
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+                form: {
+                  component: 'SelectV2'
+                },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+                form: {
+                  component: 'SelectV2'
+                },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    sort: 'custom',
+                form: {
+                  component: 'SelectV2'
+                },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+  },
+  {
+    label: '收货类型',
+    field: 'type',
+    sort: 'custom',
+                form: {
+                  component: 'SelectV2'
+                },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+                form: {
+                  component: 'SelectV2'
+                },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '创建者Id',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    sort: 'custom',
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '最后更新者用户名',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+
+// 表单校验
+export const ProductredressRecordDetailRules = reactive({
+  productionlineCode: [required],
+  masterId: [required],
+})
+
+export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '生产线代码',
+    field: 'productionlineCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    sort: 'custom',
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+  },
+  {
+    label: 'BOM版本',
+    field: 'bomVersion',
+    sort: 'custom',
+  },
+  {
+    label: '明细',
+    field: 'backFlushDetails',
+    sort: 'custom',
+  },
+  {
+    label: '主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '创建者Id',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    sort: 'custom',
+                form: {
+                  component: 'SelectV2'
+                },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '最后更新者用户名',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
new file mode 100644
index 000000000..f00d7de53
--- /dev/null
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
@@ -0,0 +1,501 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProductredressRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductredressRequestMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :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 }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductredressRequestMainRules"
+    :formAllSchemas="ProductredressRequestMain.allSchemas"
+    :tableAllSchemas="ProductredressRequestDetail.allSchemas"
+    :tableFormRules="ProductredressRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductredressRequestMainApi.updateProductredressRequestMain"
+    :apiCreate="ProductredressRequestMainApi.createProductredressRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductredressRequestMain.allSchemas"
+    :detailAllSchemas="ProductredressRequestDetail.allSchemas"
+    :detailAllSchemasRules="ProductredressRequestDetailRules"
+    :apiCreate="ProductredressRequestDetailApi.createProductredressRequestDetail"
+    :apiUpdate="ProductredressRequestDetailApi.updateProductredressRequestDetail"
+    :apiPage="ProductredressRequestDetailApi.getProductredressRequestDetailPage"
+    :apiDelete="ProductredressRequestDetailApi.deleteProductredressRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+    :detailValidate="detailValidate"
+  />
+    <!-- bom列表 
+    <Dialog
+      :title="DialogTitle"
+      v-model="bomModelVisible"
+      width="80%"
+      :scroll="true"
+      max-height="450px"
+    >
+      <Table
+        :columns="BackflushDetailRequest.allSchemas.tableColumns"
+        :data="detatableDataBom.tableList"
+        :loading="detatableDataBom.loading"
+        :pagination="{
+          total: detatableDataBom.total
+        }"
+        v-model:pageSize="detatableDataBom.pageSize"
+        v-model:currentPage="detatableDataBom.currentPage"
+        v-model:sort="detatableDataBom.sort"
+      />
+    </Dialog>-->
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productredress-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { ProductredressRequestMain,ProductredressRequestMainRules,ProductredressRequestDetail,ProductredressRequestDetailRules } from './productredressRequestMain.data'
+import * as ProductredressRequestMainApi from '@/api/wms/productredressRequestMain'
+import * as ProductredressRequestDetailApi from '@/api/wms/productredressRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'ProductredressRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ProductredressRequestMain.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      if (formField == 'itemCode') {
+        row['itemCode'] = val[0]['itemCode']
+        row['qty'] = val[0]['qty']
+        row['uom'] = val[0]['uom']
+        row['packingNumber'] = val[0]['packingNumber']
+        row['batch'] = val[0]['batch']
+        row['packQty'] = val[0]['packQty']
+        row['packUnit'] = val[0]['packUnit']
+        row['inventoryStatus'] = val[0]['inventoryStatus']
+      }
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    if (formField == 'itemCode') {
+        setV['itemCode'] = val[0]['itemCode']
+        setV['qty'] = val[0]['qty']
+        setV['uom'] = val[0]['uom']
+        setV['packingNumber'] = val[0]['packingNumber']
+        setV['batch'] = val[0]['batch']
+        setV['packQty'] = val[0]['packQty']
+        setV['packUnit'] = val[0]['packUnit']
+        setV['inventoryStatus'] = val[0]['inventoryStatus']
+      }
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductredressRequestMainApi.getProductredressRequestMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productredress-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productredress-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productredress-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') { // 刷新
+    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) => {
+    return [
+      defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productredress-request-main:close'}), // 关闭
+      defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productredress-request-main:reAdd'}), // 重新添加
+      defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productredress-request-main:submit'}), // 提交审批
+      defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productredress-request-main:refused'}), // 驳回
+      defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productredress-request-main:agree'}), // 审批通过
+      defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productredress-request-main:handle'}), // 处理
+      defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productredress-request-main:update'}), // 编辑
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    ProductredressRequestMainApi.close(row.id).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
+    ProductredressRequestMainApi.reAdd(row.id).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
+    ProductredressRequestMainApi.submit(row.id).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
+    ProductredressRequestMainApi.refused(row.id).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
+    ProductredressRequestMainApi.agree(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  }
+  else if (val == 'mainHandle') { // 处理
+    tableObject.loading = true
+    ProductredressRequestMainApi.handle(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 编辑时 车间代码不可修改
+  if (type == 'update') {
+    // 修改 tableform 属性
+    ProductredressRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.disabled = true
+      }
+    })
+  } else {
+    // 修改 tableform 属性
+    ProductredressRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = true
+        itemColumns.componentProps.disabled = false
+      }
+    })
+  }
+  formRef.value.open(type, 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,'requestProductreceiptMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductredressRequestMainApi.deleteProductredressRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+      tableObject.loading = false
+    }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductredressRequestMainApi.exportProductredressRequestMain(tableObject.params)
+    download.excel(data, '制品回收申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductredressRequestDetail.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 = formatTime(new Date(), 'yyyyMMdd')
+  tableData.value.push(tfk)
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  if(data.subList.find(item => (item.qty <= 0))) {
+    message.warning('数量必须大于0')
+    formRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      await ProductredressRequestMainApi.createProductredressRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductredressRequestMainApi.updateProductredressRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '制品回收申请导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// 查看 Bom 按钮回调事件
+// const tableFormButton = async (val , row) => {
+//   if (val == 'bom') { // 查看 bom
+//     bomModelVisible.value = true
+//     DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+//     detatableDataBom.params = {
+//       masterId: row.id
+//     }
+//     await getDetailListBom()
+//   }
+// }
+
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
+// const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+// // 标签打印
+// 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) {
+//     if (labelType.value == 'cg') {
+//       const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+//       window.open(src.value+'&request_number='+row.number)
+//     } else {
+//       const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+//       window.open(src.value+'&request_number='+row.number)
+//     }
+//   } else {
+//     message.warning('请先创建标签')
+//   }
+// }
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductredressRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
new file mode 100644
index 000000000..c49fca4f8
--- /dev/null
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
@@ -0,0 +1,595 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as BalanceApi  from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+// 表单校验
+export const ProductredressRequestMainRules = reactive({
+  autoCommit: [required],
+  autoAgree: [required],
+  autoExecute: [required],
+  directCreateRecord: [required],
+})
+
+export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  // {
+  //   label: '生产计划单号',
+  //   field: 'productionPlanNumber',
+  //   sort: 'custom',
+  // },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  // {
+  //   label: '车间代码',
+  //   field: 'workshopCode',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  // {
+  //   label: '班组',
+  //   field: 'team',
+  //   sort: 'custom',
+  // },
+  // {
+  //   label: '班次',
+  //   field: 'shift',
+  //   sort: 'custom',
+  // },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    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',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    sort: 'custom',
+    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',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '入库库存状态范围',
+    field: 'inInventoryStatuses',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '出库库存状态范围',
+    field: 'outInventoryStatuses',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '创建者用户名',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    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',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新者用户名',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    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',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ProductredressRequestDetailRules = reactive({
+})
+
+export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  // {
+  //   label: '生产线代码',
+  //   field: 'productionLineCode',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  // {
+  //   label: '工位代码',
+  //   field: 'workStationCode',
+  //   sort: 'custom',
+  // },
+  // {
+  //   label: '目标库位',
+  //   field: 'toLocationCode',
+  //   sort: 'custom',
+  // },
+  // {
+  //   label: '工序代码',
+  //   field: 'processCode',
+  //   sort: 'custom',
+  // },
+
+  // {
+  //   label: '器具号',
+  //   field: 'containerNumber',
+  //   sort: 'custom',
+  // },
+  
+  // {
+  //   label: '生产日期',
+  //   field: 'produceDate',
+  //   sort: 'custom',
+  //   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',
+  //     }
+  //   },
+  //   isForm: false
+  // },
+  // {
+  //   label: '过期日期',
+  //   field: 'expireDate',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false
+  // },
+
+  // {
+  //   label: '订单号',
+  //   field: 'woNumber',
+  //   sort: 'custom',
+  // },
+  // {
+  //   label: '订单行',
+  //   field: 'woLine',
+  //   sort: 'custom',
+  // },
+
+  // {
+  //   label: 'BOM版本',
+  //   field: 'bomVersion',
+  //   sort: 'custom',
+  // },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '库存余额信息', // 查询弹窗标题
+        searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
+        searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
+        searchCondition:[
+        {
+          key: 'inventoryStatus',
+          value: 'OK',
+          isMainValue: false
+        },{
+          key: 'packingNumber', // 查询列表中字段
+          value: '', // 指查询具体值
+          action: '!=', // 查询拼接条件
+          isSearch: true, // 使用自定义拼接条件
+          isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '库存余额信息', // 查询弹窗标题
+      searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
+      searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
+      searchCondition:[
+      {
+        key: 'inventoryStatus',
+        value: 'OK',
+        isMainValue: false
+      },{
+        key: 'packingNumber', // 查询列表中字段
+        value: '', // 指查询具体值
+        action: '!=', // 查询拼接条件
+        isSearch: true, // 使用自定义拼接条件
+        isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+      }]
+    },
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建者用户名',
+    field: 'creator',
+    sort: 'custom',
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者用户名',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    isTableForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

From f7d9e9a6919178c5232ba0040ab4ce6d16ae0103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AE=9C=E9=98=B3?= <1301318913@qq.com>
Date: Wed, 27 Mar 2024 16:22:16 +0800
Subject: [PATCH 65/65] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8F=AD=E7=BB=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/teamSetting/index.ts              |  61 +++++
 .../mes/productionPlan/productionPlan.data.ts |   8 +-
 src/views/mes/teamSetting/index.vue           | 244 ++++++++++++++++++
 src/views/mes/teamSetting/teamSetting.data.ts | 178 +++++++++++++
 4 files changed, 487 insertions(+), 4 deletions(-)
 create mode 100644 src/api/mes/teamSetting/index.ts
 create mode 100644 src/views/mes/teamSetting/index.vue
 create mode 100644 src/views/mes/teamSetting/teamSetting.data.ts

diff --git a/src/api/mes/teamSetting/index.ts b/src/api/mes/teamSetting/index.ts
new file mode 100644
index 000000000..61224bc56
--- /dev/null
+++ b/src/api/mes/teamSetting/index.ts
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface TeamSettingVO {
+  id: number
+  teamCode: string
+  teamName: string
+  teamType: string
+  endTime: Date
+  textOne: string
+  textTwo: string
+  textThree: string
+  textFour: string
+  textFive: string
+  deleteTime: Date
+  status: string
+  concurrencyStamp: number
+  remark: string
+  deleter: string
+  siteId: number
+}
+
+// 查询班组人员管理列表
+export const getTeamSettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/teamSetting/senior', data })
+  } else {
+    return await request.get({ url: `/mes/teamSetting/page`, params })
+  }
+}
+
+// 查询班组人员管理详情
+export const getTeamSetting = async (id: number) => {
+  return await request.get({ url: `/mes/teamSetting/get?id=` + id })
+}
+
+// 新增班组人员管理
+export const createTeamSetting = async (data: TeamSettingVO) => {
+  return await request.post({ url: `/mes/teamSetting/create`, data })
+}
+
+// 修改班组人员管理
+export const updateTeamSetting = async (data: TeamSettingVO) => {
+  return await request.put({ url: `/mes/teamSetting/update`, data })
+}
+
+// 删除班组人员管理
+export const deleteTeamSetting = async (id: number) => {
+  return await request.delete({ url: `/mes/teamSetting/delete?id=` + id })
+}
+
+// 导出班组人员管理 Excel
+export const exportTeamSetting = async (params) => {
+  return await request.download({ url: `/mes/teamSetting/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/teamSetting/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/mes/productionPlan/productionPlan.data.ts b/src/views/mes/productionPlan/productionPlan.data.ts
index 539264c0e..f6f8f68ec 100644
--- a/src/views/mes/productionPlan/productionPlan.data.ts
+++ b/src/views/mes/productionPlan/productionPlan.data.ts
@@ -78,7 +78,7 @@ export const ProductionPlan = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'deleteTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+    isSearch: false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -99,7 +99,7 @@ export const ProductionPlan = useCrudSchemas(reactive<CrudSchema[]>([
     label: '状态',
     field: 'status',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     form: {
       component: 'Radio'
     },
@@ -118,7 +118,7 @@ export const ProductionPlan = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '创建时间',
@@ -140,7 +140,7 @@ export const ProductionPlan = useCrudSchemas(reactive<CrudSchema[]>([
     label: '删除用户名',
     field: 'deleter',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '位置ID',
diff --git a/src/views/mes/teamSetting/index.vue b/src/views/mes/teamSetting/index.vue
new file mode 100644
index 000000000..135bba85f
--- /dev/null
+++ b/src/views/mes/teamSetting/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="TeamSetting.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="TeamSetting.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :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 #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="TeamSettingRules"
+    :formAllSchemas="TeamSetting.allSchemas"
+    :apiUpdate="TeamSettingApi.updateTeamSetting"
+    :apiCreate="TeamSettingApi.createTeamSetting"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="TeamSetting.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/mes/teamSetting/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { TeamSetting,TeamSettingRules } from './teamSetting.data'
+import * as TeamSettingApi from '@/api/mes/teamSetting'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'MesTeamSetting' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(TeamSetting.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: TeamSettingApi.getTeamSettingPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'mes:teamSetting:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'mes:teamSetting:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'mes:teamSetting:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'mes:teamSetting:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'mes:teamSetting:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =TeamSetting.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await TeamSettingApi.createTeamSetting(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await TeamSettingApi.updateTeamSetting(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicTeamSetting')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await TeamSettingApi.deleteTeamSetting(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await TeamSettingApi.exportTeamSetting(tableObject.params)
+    download.excel(data, '班组人员管理.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '班组人员管理导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await TeamSettingApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/mes/teamSetting/teamSetting.data.ts b/src/views/mes/teamSetting/teamSetting.data.ts
new file mode 100644
index 000000000..a24d17006
--- /dev/null
+++ b/src/views/mes/teamSetting/teamSetting.data.ts
@@ -0,0 +1,178 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const TeamSettingRules = reactive({
+  endTime: [required],
+  concurrencyStamp: [required],
+})
+
+export const TeamSetting = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '班组编号',
+    field: 'teamCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '班组名称',
+    field: 'teamName',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '班组类型',
+    field: 'teamType',
+    sort: 'custom',
+    isSearch: true,
+                // form: {
+                //   component: 'SelectV2'
+                // },
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '备用字段一',
+    field: 'textOne',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '备用字段二',
+    field: 'textTwo',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '备用字段三',
+    field: 'textThree',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '备用字段四',
+    field: 'textFour',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '备用字段五',
+    field: 'textFive',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '删除时间',
+    field: 'deleteTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '删除用户名',
+    field: 'deleter',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '位置ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))