From 32957e4f590b065fe5bde5beded1656f7f4e53f1 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 17 May 2024 14:05:42 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=99=8D=E7=BA=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index.ts                                  |  28 +-
 src/api/wms/relegateRequestMain/index.ts      |  68 +++
 src/views/system/user/UserForm.vue            |   4 +-
 .../itemManage/relegateRequest/index.vue      | 181 ++++--
 .../relegateRequestMain.data.ts               | 539 ++++++++++++++++++
 .../relegateRequestDetail/index.vue           | 233 ++++++++
 .../relegateRequest.data.ts                   |   2 +-
 7 files changed, 1001 insertions(+), 54 deletions(-)
 rename src/api/wms/{relegateRequest => relegateRequestDetail}/index.ts (50%)
 create mode 100644 src/api/wms/relegateRequestMain/index.ts
 create mode 100644 src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequestMain.data.ts
 create mode 100644 src/views/wms/basicDataManage/itemManage/relegateRequestDetail/index.vue
 rename src/views/wms/basicDataManage/itemManage/{relegateRequest => relegateRequestDetail}/relegateRequest.data.ts (98%)

diff --git a/src/api/wms/relegateRequest/index.ts b/src/api/wms/relegateRequestDetail/index.ts
similarity index 50%
rename from src/api/wms/relegateRequest/index.ts
rename to src/api/wms/relegateRequestDetail/index.ts
index a26e8c360..98aa10e73 100644
--- a/src/api/wms/relegateRequest/index.ts
+++ b/src/api/wms/relegateRequestDetail/index.ts
@@ -1,6 +1,6 @@
 import request from '@/config/axios'
 
-export interface RelegateRequestVO {
+export interface RelegateRequestDetailVO {
   id: number
   itemCode: string
   downItemCode: string
@@ -32,39 +32,39 @@ export interface RelegateRequestVO {
 }
 
 // 查询物料降级信息列表
-export const getRelegateRequestPage = async (params) => {
+export const getRelegateRequestDetailPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/relegate-request/senior', data })
+    return await request.post({ url: '/wms/relegate-request-detail/senior', data })
   } else {
-    return await request.get({ url: `/wms/relegate-request/page`, params })
+    return await request.get({ url: `/wms/relegate-request-detail/page`, params })
   }
 }
 
 // 查询物料降级信息详情
-export const getRelegateRequest = async (id: number) => {
-  return await request.get({ url: `/wms/relegate-request/get?id=` + id })
+export const getRelegateRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/relegate-request-detail/get?id=` + id })
 }
 
 // 新增物料降级信息
-export const createRelegateRequest = async (data: RelegateRequestVO) => {
-  return await request.post({ url: `/wms/relegate-request/create`, data })
+export const createRelegateRequestDetail = async (data: RelegateRequestDetailVO) => {
+  return await request.post({ url: `/wms/relegate-request-detail/create`, data })
 }
 
 // 修改物料降级信息
-export const updateRelegateRequest = async (data: RelegateRequestVO) => {
-  return await request.put({ url: `/wms/relegate-request/update`, data })
+export const updateRelegateRequestDetail = async (data: RelegateRequestDetailVO) => {
+  return await request.put({ url: `/wms/relegate-request-detail/update`, data })
 }
 
 // 删除物料降级信息
-export const deleteRelegateRequest = async (id: number) => {
-  return await request.delete({ url: `/wms/relegate-request/delete?id=` + id })
+export const deleteRelegateRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/relegate-request-detail/delete?id=` + id })
 }
 
 // 导出物料降级信息 Excel
-export const exportRelegateRequest = async (params) => {
-  return await request.download({ url: `/wms/relegate-request/export-excel`, params })
+export const exportRelegateRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/relegate-request-detail/export-excel`, params })
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/relegateRequestMain/index.ts b/src/api/wms/relegateRequestMain/index.ts
new file mode 100644
index 000000000..1b3ca3018
--- /dev/null
+++ b/src/api/wms/relegateRequestMain/index.ts
@@ -0,0 +1,68 @@
+import request from '@/config/axios'
+
+export interface RelegateRequestMainVO {
+  id: number
+  fromWarehouseCode: string
+  number: string
+  businessType: string
+  remark: string
+  extraProperties: string
+  siteId: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+  concurrencyStamp: number
+  ruleUserId: number
+  fromAreaTypes: string
+  fromAreaCodes: string
+  serialNumber: string
+  inInventoryStatuses: string
+  outInventoryStatuses: string
+  reason: string
+}
+
+// 查询物料降级申请主列表
+export const getRelegateRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/relegate-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/relegate-request-main/page`, params })
+  }
+}
+
+// 查询物料降级申请主详情
+export const getRelegateRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/relegate-request-main/get?id=` + id })
+}
+
+// 新增物料降级申请主
+export const createRelegateRequestMain = async (data: RelegateRequestMainVO) => {
+  return await request.post({ url: `/wms/relegate-request-main/create`, data })
+}
+
+// 修改物料降级申请主
+export const updateRelegateRequestMain = async (data: RelegateRequestMainVO) => {
+  return await request.put({ url: `/wms/relegate-request-main/update`, data })
+}
+
+// 删除物料降级申请主
+export const deleteRelegateRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/relegate-request-main/delete?id=` + id })
+}
+
+// 导出物料降级申请主 Excel
+export const exportRelegateRequestMain = async (params) => {
+  return await request.download({ url: `/wms/relegate-request-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/relegate-request-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/system/user/UserForm.vue b/src/views/system/user/UserForm.vue
index 60583b826..5a605d49d 100644
--- a/src/views/system/user/UserForm.vue
+++ b/src/views/system/user/UserForm.vue
@@ -40,8 +40,8 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item v-if="formData.id === undefined" label="用户名称" prop="username">
-            <el-input v-model="formData.username" placeholder="请输入用户名称" />
+          <el-form-item v-if="formData.id === undefined" label="用户账号" prop="username">
+            <el-input v-model="formData.username" placeholder="请输入用户账号" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/wms/basicDataManage/itemManage/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegateRequest/index.vue
index e60621efe..637efc95c 100644
--- a/src/views/wms/basicDataManage/itemManage/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegateRequest/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="RelegateRequest.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...RelegateRequestMain.allSchemas.searchSchema,...RelegateRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -11,7 +11,8 @@
       :routeName="routeName"
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
-      :allSchemas="RelegateRequest.allSchemas"
+      :allSchemas="RelegateRequestMain.allSchemas"
+      :detailAllSchemas="RelegateRequestDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -27,13 +28,13 @@
       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>
+      <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" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -41,32 +42,57 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="basicFormRef"
-    @success="formsSuccess"
-    :rules="RelegateRequestRules"
-    :formAllSchemas="RelegateRequest.allSchemas"
-    :apiUpdate="RelegateRequestApi.updateRelegateRequest"
-    :apiCreate="RelegateRequestApi.createRelegateRequest"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
+    @success="getList"
+    :rules="RelegateRequestMainRules"
+    :formAllSchemas="RelegateRequestMain.allSchemas"
+    :tableAllSchemas="RelegateRequestDetail.allSchemas"
+    :tableFormRules="RelegateRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="RelegateRequestMainApi.updateRelegateRequestMain"
+    :apiCreate="RelegateRequestMainApi.createRelegateRequestMain"
+    :isBusiness="true"
+    fromeWhere="RelegateRequestMain"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
+    @submitForm="submitForm"
+    :isShowButton = isShowButton
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="RelegateRequest.allSchemas" />
+  <Detail 
+    ref="detailRef" 
+    :isBasic="true" 
+    :allSchemas="RelegateRequestMain.allSchemas" 
+    :detailAllSchemas="RelegateRequestDetail.allSchemas"
+    :detailAllSchemasRules="RelegateRequestDetailRules"
+    :apiCreate="RelegateRequestDetailApi.createRelegateRequestDetail"
+    :apiUpdate="RelegateRequestDetailApi.updateRelegateRequestDetail"
+    :apiPage="RelegateRequestDetailApi.getRelegateRequestDetailPage"
+    :apiDelete="RelegateRequestDetailApi.deleteRelegateRequestDetail"
+    fromeWhere="RelegateRequestMain"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShowAdd="trueFalse"
+    :detailButtonIsShowDelete="trueFalse"
+/>
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/relegate-request/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/wms/relegate-request-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { RelegateRequest,RelegateRequestRules } from './relegateRequest.data'
-import * as RelegateRequestApi from '@/api/wms/relegateRequest'
+import { RelegateRequestMain,RelegateRequestMainRules,RelegateRequestDetail,RelegateRequestDetailRules } from './relegateRequestMain.data'
+import * as RelegateRequestMainApi from '@/api/wms/relegateRequestMain'
+import * as RelegateRequestDetailApi from '@/api/wms/relegateRequestDetail'
 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: 'RelegateRequest' })
+defineOptions({ name: 'RelegateRequestMain' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -74,7 +100,10 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(RelegateRequest.allSchemas.tableColumns)
+const tableColumns = ref([...RelegateRequestMain.allSchemas.tableColumns,...RelegateRequestDetail.allSchemas.tableMainColumns])
+const isShowButton = ref(true)
+//定义  展示子表数据时是否显示新增/修改/删除按钮
+const trueFalse = ref(false)
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
@@ -85,13 +114,26 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   })
 }
 
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    if(formField == 'itemCode') {
+      setV['itemCode'] = val[0]['itemCode']
+      setV['uom'] = val[0]['customerUom']    
+    }else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: RelegateRequestApi.getRelegateRequestPage // 分页接口
+  getListApi: RelegateRequestDetailApi.getRelegateRequestDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -99,9 +141,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:relegate-request:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:relegate-request:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:relegate-request:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'wms:relegate-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:relegate-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:relegate-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -131,11 +173,26 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:relegate-request:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:relegate-request:delete'}), // 删除
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
+    return [
+  defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:relegate-request-main:delete'}), // 删除
 ]
+}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
@@ -151,24 +208,56 @@ const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
-
+//为true表示子表数据中存在数量为0的数据
+const flag = ref(false)
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  if (formType === 'create') {
-    await RelegateRequestApi.createRelegateRequest(data)
+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) {
+    basicFormRef.value.formLoading = false
+    return message.warning('物料代码重复')
+  }
+  data.subList.forEach(obj => {
+    if(obj.qty == 0){
+      message.warning(`数量不能为0!`)
+      flag.value = true
+      return;
+    }
+  })
+  if(flag.value){
+    basicFormRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      if(tableData.value.length <= 0){
+      message.warning(`子表明细不能为空!`)
+      flag.value = true
+      basicFormRef.value.formLoading = false
+      return;
+  }
+    await RelegateRequestMainApi.createRelegateRequestMain(data)
     message.success(t('common.createSuccess'))
   } else {
-    await RelegateRequestApi.updateRelegateRequest(data)
+    await RelegateRequestMainApi.updateRelegateRequestMain(data)
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
   getList()
+} finally {
+  basicFormRef.value.formLoading = false
+  }
 }
 
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicRelegateRequest')
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicRelegateRequestMain')
 }
 
 /** 删除按钮操作 */
@@ -177,13 +266,31 @@ const handleDelete = async (id: number) => {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await RelegateRequestApi.deleteRelegateRequest(id)
+    await RelegateRequestMainApi.deleteRelegateRequestMain(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
   } catch {}
 }
 
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+RelegateRequestDetail.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 exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
@@ -192,8 +299,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await RelegateRequestApi.exportRelegateRequest(tableObject.params)
-    download.excel(data, '物料降级信息.xlsx')
+    const data = await RelegateRequestMainApi.exportRelegateRequestMain(tableObject.params)
+    download.excel(data, '物料降级申请主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -208,7 +315,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '物料降级信息导入模版.xlsx'
+  templateTitle: '物料降级申请主导入模版.xlsx'
 })
 // 导入成功之后
 const importSuccess = () => {
@@ -227,7 +334,7 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await RelegateRequestApi.importTemplate()
+  importTemplateData.templateUrl = await RelegateRequestMainApi.importTemplate()
 })
 
 </script>
diff --git a/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequestMain.data.ts
new file mode 100644
index 000000000..80f8bb35c
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequestMain.data.ts
@@ -0,0 +1,539 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'RelegateRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+// 表单校验
+export const RelegateRequestMainRules = reactive({
+  fromWarehouseCode: [required],
+  number: [required],
+  businessType: [required],
+  autoCommit: [required],
+  autoAgree: [required],
+  autoExecute: [required],
+  directCreateRecord: [required],
+  concurrencyStamp: [required],
+  fromAreaTypes: [required],
+  fromAreaCodes: [required],
+})
+
+export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    isTable: false
+  },
+  {
+    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')]
+      }
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    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')]
+      }
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    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')]
+      }
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '权限所属人员id',
+    field: 'ruleUserId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '工作流流水号',
+    field: 'serialNumber',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const RelegateRequestDetailRules = reactive({
+  itemCode: [required],
+  downItemCode: [required],
+  businessType: [required],
+  available: [required],
+  departmentCode: [required],
+  concurrencyStamp: [required],
+})
+
+export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '物料基础信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '降级物料代码',
+    field: 'downItemCode',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择降级物料代码',
+        searchField: 'itemCode',
+        searchTitle: '物料基础信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    isSearch: true
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '从库区类型',
+    field: 'fromAreaTypes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '到库区类型',
+    field: 'toAreaTypes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm:false,
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    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')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '工作流流水号',
+    field: 'serialNumber',
+    isForm:false,
+    sort: 'custom',
+  },
+  {
+    label: '权限所属人员id',
+    field: 'ruleUserId',
+    sort: 'custom',
+    isForm:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/basicDataManage/itemManage/relegateRequestDetail/index.vue b/src/views/wms/basicDataManage/itemManage/relegateRequestDetail/index.vue
new file mode 100644
index 000000000..ca983bb05
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/relegateRequestDetail/index.vue
@@ -0,0 +1,233 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="RelegateRequest.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="RelegateRequest.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="RelegateRequestRules"
+    :formAllSchemas="RelegateRequest.allSchemas"
+    :apiUpdate="RelegateRequestApi.updateRelegateRequest"
+    :apiCreate="RelegateRequestApi.createRelegateRequest"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="RelegateRequest.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/relegate-request/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { RelegateRequest,RelegateRequestRules } from './relegateRequest.data'
+import * as RelegateRequestApi from '@/api/wms/relegateRequestDetail'
+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: 'RelegateRequest' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(RelegateRequest.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: RelegateRequestApi.getRelegateRequestPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:relegate-request:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:relegate-request:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:relegate-request: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:relegate-request:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:relegate-request: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) => {
+  if (formType === 'create') {
+    await RelegateRequestApi.createRelegateRequest(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await RelegateRequestApi.updateRelegateRequest(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, 'basicRelegateRequest')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RelegateRequestApi.deleteRelegateRequest(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 RelegateRequestApi.exportRelegateRequest(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 RelegateRequestApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts b/src/views/wms/basicDataManage/itemManage/relegateRequestDetail/relegateRequest.data.ts
similarity index 98%
rename from src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts
rename to src/views/wms/basicDataManage/itemManage/relegateRequestDetail/relegateRequest.data.ts
index de2becfec..61bcc4294 100644
--- a/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegateRequestDetail/relegateRequest.data.ts
@@ -32,7 +32,7 @@ export const RelegateRequest = useCrudSchemas(reactive<CrudSchema[]>([
         isSearchList: true,
         searchListPlaceholder: '请选择物料代码',
         searchField: 'itemCode',
-        searchTitle: '客户物料基础信息',
+        searchTitle: '物料基础信息',
         searchAllSchemas: Itembasic.allSchemas,
         searchPage: ItembasicApi.getItembasicPage,
         searchCondition: [{

From ceadb799a4dbfd5e0040a33d416e595cf330fc69 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 17 May 2024 14:16:55 +0800
Subject: [PATCH 2/9] =?UTF-8?q?mes=E9=83=A8=E5=88=86=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E7=BC=96=E8=BE=91=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E4=B8=8D=E5=85=81=E8=AE=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/abilityInfo/index.vue    | 10 ++++++++++
 src/views/mes/opersteps/index.vue      |  1 -
 src/views/mes/ordermonthplan/index.vue |  9 +++++++++
 src/views/mes/pattern/index.vue        |  9 +++++++++
 src/views/mes/patternType/index.vue    |  9 +++++++++
 src/views/mes/qualityclass/index.vue   | 10 +++++++++-
 src/views/mes/qualitygroup/index.vue   |  9 +++++++++
 src/views/mes/workstation/index.vue    |  9 +++++++++
 8 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/src/views/mes/abilityInfo/index.vue b/src/views/mes/abilityInfo/index.vue
index 945375f6f..85bc873ae 100644
--- a/src/views/mes/abilityInfo/index.vue
+++ b/src/views/mes/abilityInfo/index.vue
@@ -66,6 +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.vue'
+import {MesOrderMonthMain} from "@/views/mes/ordermonthplan/mesOrderMonthMain.data";
 
 defineOptions({ name: 'AbilityInfo' })
 
@@ -150,6 +151,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  AbilityInfo.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'ablityCode') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 
diff --git a/src/views/mes/opersteps/index.vue b/src/views/mes/opersteps/index.vue
index 6250e6ef1..48bb42dd9 100644
--- a/src/views/mes/opersteps/index.vue
+++ b/src/views/mes/opersteps/index.vue
@@ -159,7 +159,6 @@ const openForm = (type: string, row?: any) => {
       }
     })
   basicFormRef.value.open(type, row)
-  basicFormRef.value.open(type, row)
 }
 
 // form表单提交
diff --git a/src/views/mes/ordermonthplan/index.vue b/src/views/mes/ordermonthplan/index.vue
index 6c59a287a..d525dfc0f 100644
--- a/src/views/mes/ordermonthplan/index.vue
+++ b/src/views/mes/ordermonthplan/index.vue
@@ -185,6 +185,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  MesOrderMonthMain.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'planMasterCode' || item.field == 'planSubCode') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 
diff --git a/src/views/mes/pattern/index.vue b/src/views/mes/pattern/index.vue
index e7a6f128d..459f4190f 100644
--- a/src/views/mes/pattern/index.vue
+++ b/src/views/mes/pattern/index.vue
@@ -149,6 +149,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  Pattern.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'code') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 
diff --git a/src/views/mes/patternType/index.vue b/src/views/mes/patternType/index.vue
index 6a1ad681a..e0cc50b14 100644
--- a/src/views/mes/patternType/index.vue
+++ b/src/views/mes/patternType/index.vue
@@ -149,6 +149,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  PatternType.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'code') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 
diff --git a/src/views/mes/qualityclass/index.vue b/src/views/mes/qualityclass/index.vue
index bd691dd60..aa7018cab 100644
--- a/src/views/mes/qualityclass/index.vue
+++ b/src/views/mes/qualityclass/index.vue
@@ -149,7 +149,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
-  console.log(row)
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  Qualityclass.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'code') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 
diff --git a/src/views/mes/qualitygroup/index.vue b/src/views/mes/qualitygroup/index.vue
index 2255e5593..04d6a8e6b 100644
--- a/src/views/mes/qualitygroup/index.vue
+++ b/src/views/mes/qualitygroup/index.vue
@@ -149,6 +149,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  Qualitygroup.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'code') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 
diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue
index 13b6a688f..95255959d 100644
--- a/src/views/mes/workstation/index.vue
+++ b/src/views/mes/workstation/index.vue
@@ -171,6 +171,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  Workstation.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'code') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 

From 8c39a1fb9c804fa546dd3ef42782c21d117ffe25 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 17 May 2024 14:19:50 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/UserForm.vue | 34 +++++++++++++++---------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/views/system/user/UserForm.vue b/src/views/system/user/UserForm.vue
index ae69d0b0a..d673cdc96 100644
--- a/src/views/system/user/UserForm.vue
+++ b/src/views/system/user/UserForm.vue
@@ -7,6 +7,23 @@
       :rules="formRules"
       label-width="80px"
     >
+    <el-row>
+        <el-col :span="12">
+          <el-form-item v-if="formData.id === undefined" label="用户账号" prop="username">
+            <el-input v-model="formData.username" placeholder="请输入用户账号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="formData.id === undefined" label="用户密码" prop="password">
+            <el-input
+              v-model="formData.password"
+              placeholder="请输入用户密码"
+              show-password
+              type="password"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="用户昵称" prop="nickname">
@@ -38,23 +55,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item v-if="formData.id === undefined" label="用户账号" prop="username">
-            <el-input v-model="formData.username" placeholder="请输入用户账号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item v-if="formData.id === undefined" label="用户密码" prop="password">
-            <el-input
-              v-model="formData.password"
-              placeholder="请输入用户密码"
-              show-password
-              type="password"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="用户性别">

From e3261fa4130ebfa391d34563c8df83f17212cb6a Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 17 May 2024 14:30:42 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=99=8D=E7=BA=A7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../relegateRequest/relegateRequestMain.data.ts  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequestMain.data.ts
index 80f8bb35c..cc7ee6027 100644
--- a/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequestMain.data.ts
@@ -2,7 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
-import * as ItembasicApi from '@/api/wms/itembasic'
+import * as ItembasicApi from "@/api/wms/itembasic";
+
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 
 import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
@@ -298,6 +299,19 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
+    tableForm:{
+      isInpuFocusShow: false, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'code',
+      searchTitle: '物料基础信息',
+      searchAllSchemas: Itembasic.allSchemas,
+      searchPage: ItembasicApi.getItembasicPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
     form: {
       componentProps: {
         isSearchList: true,

From 3f54dbd1007e9ec734f93ca02c4869e99a01d2a2 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 17 May 2024 14:36:29 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=B9=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{ => relegate}/relegateRequest/index.vue  |   0
 .../relegateRequestMain.data.ts               | 539 ++++++++++++++++++
 2 files changed, 539 insertions(+)
 rename src/views/wms/basicDataManage/itemManage/{ => relegate}/relegateRequest/index.vue (100%)
 create mode 100644 src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts

diff --git a/src/views/wms/basicDataManage/itemManage/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
similarity index 100%
rename from src/views/wms/basicDataManage/itemManage/relegateRequest/index.vue
rename to src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
new file mode 100644
index 000000000..80f8bb35c
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -0,0 +1,539 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'RelegateRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+// 表单校验
+export const RelegateRequestMainRules = reactive({
+  fromWarehouseCode: [required],
+  number: [required],
+  businessType: [required],
+  autoCommit: [required],
+  autoAgree: [required],
+  autoExecute: [required],
+  directCreateRecord: [required],
+  concurrencyStamp: [required],
+  fromAreaTypes: [required],
+  fromAreaCodes: [required],
+})
+
+export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    isTable: false
+  },
+  {
+    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')]
+      }
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    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')]
+      }
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    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')]
+      }
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '权限所属人员id',
+    field: 'ruleUserId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '工作流流水号',
+    field: 'serialNumber',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const RelegateRequestDetailRules = reactive({
+  itemCode: [required],
+  downItemCode: [required],
+  businessType: [required],
+  available: [required],
+  departmentCode: [required],
+  concurrencyStamp: [required],
+})
+
+export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '物料基础信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '降级物料代码',
+    field: 'downItemCode',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择降级物料代码',
+        searchField: 'itemCode',
+        searchTitle: '物料基础信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    isSearch: true
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '从库区类型',
+    field: 'fromAreaTypes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '到库区类型',
+    field: 'toAreaTypes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm:false,
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    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')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '工作流流水号',
+    field: 'serialNumber',
+    isForm:false,
+    sort: 'custom',
+  },
+  {
+    label: '权限所属人员id',
+    field: 'ruleUserId',
+    sort: 'custom',
+    isForm:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

From 93a01767cf125c992ad416238fbc75027cdd99be Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 17 May 2024 14:47:39 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A6=81=E8=B4=A7?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasereceiptJobDetail/index.ts      | 12 ++++++++++++
 .../purchasereceiptJobMain/index.vue               |  2 +-
 .../supplierdeliverRequestMain.data.ts             | 14 ++++++--------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/api/wms/purchasereceiptJobDetail/index.ts b/src/api/wms/purchasereceiptJobDetail/index.ts
index 4163887b2..c012a623f 100644
--- a/src/api/wms/purchasereceiptJobDetail/index.ts
+++ b/src/api/wms/purchasereceiptJobDetail/index.ts
@@ -55,6 +55,18 @@ export const getPurchasereceiptJobDetailPageSapre = async (params) => {
   }
 }
 
+// 查询采购收货任务子列表
+export const getPurchasereceiptJobDetailPageSCP = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-job-detail/seniorSCP', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-job-detail/pageSCP`, params })
+  }
+}
+
+
 // 查询采购收货任务子详情
 export const getPurchasereceiptJobDetail = async (id: number) => {
   return await request.get({ url: `/wms/purchasereceipt-job-detail/get?id=` + id })
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index a9d2e713c..46dc78808 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -153,7 +153,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const Echo =  []
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPage // 分页接口
+  getListApi: routeName.value.includes('SCP')?PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPageSCP:PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 3e42b6e1a..25ead0c5e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -3,8 +3,6 @@ import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
-// import { PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
-import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
 import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
 import { PurchasePlanDetail, PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
 import { validateHanset, validateEmail } from '@/utils/validator'
@@ -23,8 +21,8 @@ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
 const requestsettingData = data?.list[0] || {}
 
  // 获取当前操作人的部门
- import { useUserStore } from '@/store/modules/user'
- import { TableColumn } from '@/types/table'
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
 import { tr } from 'element-plus/es/locale'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
@@ -64,7 +62,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '供应商信息', // 查询弹窗标题
         searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
-        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+        searchPage: SupplierApi.getSupplierPageSCP // 查询弹窗所需分页方法
       }
     }
   },
@@ -94,8 +92,8 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
         searchField: 'number', // 查询弹窗赋值字段
         searchTitle: '要货计划信息', // 查询弹窗标题
-        searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类
-        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法
+        searchAllSchemas: PurchasePlanDetail.allSchemas, // 查询弹窗所需类
+        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage, // 查询弹窗所需分页方法
         searchCondition: [
           {
             key: 'supplierCode',
@@ -1692,4 +1690,4 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
     },
   },
 
-]))
\ No newline at end of file
+]))

From c820abbd127e06722bd0d6180b428b22a1bb3395 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 17 May 2024 15:30:40 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8CSCP=E9=9A=90=E8=97=8F=E6=8B=92?=
 =?UTF-8?q?=E6=94=B6=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceipt/purchasereceiptJobMain/index.vue       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 46dc78808..b117408b4 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -107,9 +107,14 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...PurchasereceiptJobMain.allSchemas.tableColumns,...PurchasereceiptJobDetail.allSchemas.tableMainColumns])
-
+if(routeName.value.includes('SCP')){
+  tableColumns.value = tableColumns.value.filter(item=>item.label!='操作')
+}
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
+  if(routeName.value.includes('SCP')){
+    val = val.filter(item=>item.label!='操作')
+  }
   tableColumns.value = val
 }
 

From 797fac8137b728eaa95ac7b21efcf2740d77cf04 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 17 May 2024 15:54:31 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=BF=94=E5=B7=A5?=
 =?UTF-8?q?=E3=80=81=E5=8D=95=E4=BB=B6=E8=BF=94=E5=B7=A5=EF=BC=8C=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/reworkBatch/index.vue  | 2 +-
 src/views/mes/reworkSingle/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/mes/reworkBatch/index.vue b/src/views/mes/reworkBatch/index.vue
index d081b8355..72022d168 100644
--- a/src/views/mes/reworkBatch/index.vue
+++ b/src/views/mes/reworkBatch/index.vue
@@ -51,7 +51,7 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :allSchemas="ReworkBatch.allSchemas" :isBasic="false"  :isBasicMes="false"  :detailAllSchemas="ReworkBatch.allSchemas"
+  <Detail ref="detailRef" :allSchemas="ReworkBatch.allSchemas" :isBasic="false"  :isBasicMes="true"  :detailAllSchemas="ReworkBatch.allSchemas"
   :apiPage="ReworkBatchApi.getReworkBatchPage"/>
 
   <!-- 导入 -->
diff --git a/src/views/mes/reworkSingle/index.vue b/src/views/mes/reworkSingle/index.vue
index a5254d728..e8b17bdd4 100644
--- a/src/views/mes/reworkSingle/index.vue
+++ b/src/views/mes/reworkSingle/index.vue
@@ -51,7 +51,7 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="false" :allSchemas="ReworkSingle.allSchemas" :isBasicMes="false"  :detailAllSchemas="ReworkSingle.allSchemas"
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="ReworkSingle.allSchemas" :isBasicMes="true"  :detailAllSchemas="ReworkSingle.allSchemas"
   :apiPage="ReworkSingleApi.getReworkSinglePage"/>
 
   <!-- 导入 -->

From 481927a1de6ed417d29d98f0e8acf1b6d28f940c Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 17 May 2024 16:16:03 +0800
Subject: [PATCH 9/9] =?UTF-8?q?1=E3=80=81=E5=8F=AB=E6=96=99=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE--=E6=96=B0=E5=A2=9E--=E5=8C=85=E8=A3=85=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E6=90=9C=E7=B4=A2--=E5=B1=95=E7=A4=BA=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=202=E3=80=81=20?=
 =?UTF-8?q?=20=20=20label:=20'=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8D=95=E5=8F=B7',?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../callmaterials/callmaterials.data.ts       | 23 +++++++++++++++----
 .../labelManage/callmaterials/index.vue       |  4 ++--
 .../purchasereturnRequestMain.data.ts         | 10 ++++++++
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
index eb1e78e45..216b92563 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
@@ -3,6 +3,8 @@ import { dateFormatter } from '@/utils/formatTime'
 
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+import * as ItempackagingApi from '@/api/wms/itempackage'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
 import * as LocationApi from '@/api/wms/location'
 import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 import * as PackageunitApi from '@/api/wms/packageunit'
@@ -68,12 +70,23 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        isSearch:true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '包装规格信息', // 查询弹窗标题
-        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
-        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '物料包装信息', // 查询弹窗标题
+        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+        searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        }]
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
index 5e23364c5..dea316f10 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
@@ -87,8 +87,8 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     if (formField == 'itemCode') {
       setV['itemCode'] = val[0]['code']
     } else  if (formField == 'packUnit') {
-      setV['uom'] = val[0]['unit']
-      setV['packUnit'] = val[0]['code']
+      setV['uom'] = val[0]['uom']
+      setV['packUnit'] = val[0]['packUnit']
     }else {
       setV[formField] = val[0][searchField]
     }
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index f99cf21fb..2dbadc3fe 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -41,6 +41,16 @@ const PurchasereceiptRecordMain1 = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+  {
+    label: '采购收货记录单号',
+    field: 'number',
+    fixed: 'left',
+    sort: 'custom',
+    table: {
+      width: 200
+    },
+    isSearch: true
+  },
   {
     label: '发货单号',
     field: 'asnNumber',