diff --git a/src/api/wms/pickJobDetail/index.ts b/src/api/wms/pickJobDetail/index.ts index 152833738..b15045502 100644 --- a/src/api/wms/pickJobDetail/index.ts +++ b/src/api/wms/pickJobDetail/index.ts @@ -22,7 +22,7 @@ export interface PickJobDetailVO { toOwnerCode: string } -// 查询拣料任务子列表 +// 查询备货任务子列表 export const getPickJobDetailPage = async (params) => { if (params.isSearch) { delete params.isSearch @@ -33,27 +33,27 @@ export const getPickJobDetailPage = async (params) => { } } -// 查询拣料任务子详情 +// 查询备货任务子详情 export const getPickJobDetail = async (id: number) => { return await request.get({ url: `/wms/pick-job-detail/get?id=` + id }) } -// 新增拣料任务子 +// 新增备货任务子 export const createPickJobDetail = async (data: PickJobDetailVO) => { return await request.post({ url: `/wms/pick-job-detail/create`, data }) } -// 修改拣料任务子 +// 修改备货任务子 export const updatePickJobDetail = async (data: PickJobDetailVO) => { return await request.put({ url: `/wms/pick-job-detail/update`, data }) } -// 删除拣料任务子 +// 删除备货任务子 export const deletePickJobDetail = async (id: number) => { return await request.delete({ url: `/wms/pick-job-detail/delete?id=` + id }) } -// 导出拣料任务子 Excel +// 导出备货任务子 Excel export const exportPickJobDetail = async (params) => { return await request.download({ url: `/wms/pick-job-detail/export-excel`, params }) } diff --git a/src/api/wms/pickJobMain/index.ts b/src/api/wms/pickJobMain/index.ts index bb4e84ace..20722e557 100644 --- a/src/api/wms/pickJobMain/index.ts +++ b/src/api/wms/pickJobMain/index.ts @@ -39,7 +39,7 @@ export interface PickJobMainVO { allowModifyPackingNumber: string } -// 查询拣料任务主列表 +// 查询备货任务主列表 export const getPickJobMainPage = async (params) => { if (params.isSearch) { delete params.isSearch @@ -50,29 +50,35 @@ export const getPickJobMainPage = async (params) => { } } -// 查询拣料任务主详情 +// 查询备货任务主详情 export const getPickJobMain = async (id: number) => { return await request.get({ url: `/wms/pick-job-main/get?id=` + id }) } -// 新增拣料任务主 +// 新增备货任务主 export const createPickJobMain = async (data: PickJobMainVO) => { return await request.post({ url: `/wms/pick-job-main/create`, data }) } -// 修改拣料任务主 +// 修改备货任务主 export const updatePickJobMain = async (data: PickJobMainVO) => { return await request.put({ url: `/wms/pick-job-main/update`, data }) } -// 删除拣料任务主 +// 删除备货任务主 export const deletePickJobMain = async (id: number) => { return await request.delete({ url: `/wms/pick-job-main/delete?id=` + id }) } -// 导出拣料任务主 Excel +// 导出备货任务主 Excel export const exportPickJobMain = async (params) => { - return await request.download({ url: `/wms/pick-job-main/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/pick-job-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/pick-job-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/wms/pickRecordDetail/index.ts b/src/api/wms/pickRecordDetail/index.ts index f18fb3fbf..7bec0331e 100644 --- a/src/api/wms/pickRecordDetail/index.ts +++ b/src/api/wms/pickRecordDetail/index.ts @@ -32,7 +32,7 @@ export interface PickRecordDetailVO { toBatch: string } -// 查询拣料记录子列表 +// 查询备货记录子列表 export const getPickRecordDetailPage = async (params) => { if (params.isSearch) { delete params.isSearch @@ -43,27 +43,27 @@ export const getPickRecordDetailPage = async (params) => { } } -// 查询拣料记录子详情 +// 查询备货记录子详情 export const getPickRecordDetail = async (id: number) => { return await request.get({ url: `/wms/pick-record-detail/get?id=` + id }) } -// 新增拣料记录子 +// 新增备货记录子 export const createPickRecordDetail = async (data: PickRecordDetailVO) => { return await request.post({ url: `/wms/pick-record-detail/create`, data }) } -// 修改拣料记录子 +// 修改备货记录子 export const updatePickRecordDetail = async (data: PickRecordDetailVO) => { return await request.put({ url: `/wms/pick-record-detail/update`, data }) } -// 删除拣料记录子 +// 删除备货记录子 export const deletePickRecordDetail = async (id: number) => { return await request.delete({ url: `/wms/pick-record-detail/delete?id=` + id }) } -// 导出拣料记录子 Excel +// 导出备货记录子 Excel export const exportPickRecordDetail = async (params) => { return await request.download({ url: `/wms/pick-record-detail/export-excel`, params }) } diff --git a/src/api/wms/pickRecordMain/index.ts b/src/api/wms/pickRecordMain/index.ts index 96a5635e9..bf291181c 100644 --- a/src/api/wms/pickRecordMain/index.ts +++ b/src/api/wms/pickRecordMain/index.ts @@ -26,7 +26,7 @@ export interface PickRecordMainVO { available: string } -// 查询拣料记录主列表 +// 查询备货记录主列表 export const getPickRecordMainPage = async (params) => { if (params.isSearch) { delete params.isSearch @@ -37,29 +37,35 @@ export const getPickRecordMainPage = async (params) => { } } -// 查询拣料记录主详情 +// 查询备货记录主详情 export const getPickRecordMain = async (id: number) => { return await request.get({ url: `/wms/pick-record-main/get?id=` + id }) } -// 新增拣料记录主 +// 新增备货记录主 export const createPickRecordMain = async (data: PickRecordMainVO) => { return await request.post({ url: `/wms/pick-record-main/create`, data }) } -// 修改拣料记录主 +// 修改备货记录主 export const updatePickRecordMain = async (data: PickRecordMainVO) => { return await request.put({ url: `/wms/pick-record-main/update`, data }) } -// 删除拣料记录主 +// 删除备货记录主 export const deletePickRecordMain = async (id: number) => { return await request.delete({ url: `/wms/pick-record-main/delete?id=` + id }) } -// 导出拣料记录主 Excel +// 导出备货记录主 Excel export const exportPickRecordMain = async (params) => { - return await request.download({ url: `/wms/pick-record-main/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/pick-record-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/pick-record-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/wms/pickRequestDetail/index.ts b/src/api/wms/pickRequestDetail/index.ts index 143edf18d..4f41d5e05 100644 --- a/src/api/wms/pickRequestDetail/index.ts +++ b/src/api/wms/pickRequestDetail/index.ts @@ -20,7 +20,7 @@ export interface PickRequestDetailVO { toOwnerCode: string } -// 查询拣料申请子列表 +// 查询备货申请子列表 export const getPickRequestDetailPage = async (params) => { if (params.isSearch) { delete params.isSearch @@ -31,27 +31,27 @@ export const getPickRequestDetailPage = async (params) => { } } -// 查询拣料申请子详情 +// 查询备货申请子详情 export const getPickRequestDetail = async (id: number) => { return await request.get({ url: `/wms/pick-request-detail/get?id=` + id }) } -// 新增拣料申请子 +// 新增备货申请子 export const createPickRequestDetail = async (data: PickRequestDetailVO) => { return await request.post({ url: `/wms/pick-request-detail/create`, data }) } -// 修改拣料申请子 +// 修改备货申请子 export const updatePickRequestDetail = async (data: PickRequestDetailVO) => { return await request.put({ url: `/wms/pick-request-detail/update`, data }) } -// 删除拣料申请子 +// 删除备货申请子 export const deletePickRequestDetail = async (id: number) => { return await request.delete({ url: `/wms/pick-request-detail/delete?id=` + id }) } -// 导出拣料申请子 Excel +// 导出备货申请子 Excel export const exportPickRequestDetail = async (params) => { return await request.download({ url: `/wms/pick-request-detail/export-excel`, params }) } diff --git a/src/api/wms/pickRequestMain/index.ts b/src/api/wms/pickRequestMain/index.ts index 277ef1448..b11d5593b 100644 --- a/src/api/wms/pickRequestMain/index.ts +++ b/src/api/wms/pickRequestMain/index.ts @@ -24,7 +24,7 @@ export interface PickRequestMainVO { directCreateRecord: string } -// 查询拣料申请主列表 +// 查询备货申请主列表 export const getPickRequestMainPage = async (params) => { if (params.isSearch) { delete params.isSearch @@ -35,29 +35,35 @@ export const getPickRequestMainPage = async (params) => { } } -// 查询拣料申请主详情 +// 查询备货申请主详情 export const getPickRequestMain = async (id: number) => { return await request.get({ url: `/wms/pick-request-main/get?id=` + id }) } -// 新增拣料申请主 +// 新增备货申请主 export const createPickRequestMain = async (data: PickRequestMainVO) => { return await request.post({ url: `/wms/pick-request-main/create`, data }) } -// 修改拣料申请主 +// 修改备货申请主 export const updatePickRequestMain = async (data: PickRequestMainVO) => { return await request.put({ url: `/wms/pick-request-main/update`, data }) } -// 删除拣料申请主 +// 删除备货申请主 export const deletePickRequestMain = async (id: number) => { return await request.delete({ url: `/wms/pick-request-main/delete?id=` + id }) } -// 导出拣料申请主 Excel +// 导出备货申请主 Excel export const exportPickRequestMain = async (params) => { - return await request.download({ url: `/wms/pick-request-main/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/pick-request-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/pick-request-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/wms/plansetting/index.ts b/src/api/wms/plansetting/index.ts index 28b3df1ee..1b703dadc 100644 --- a/src/api/wms/plansetting/index.ts +++ b/src/api/wms/plansetting/index.ts @@ -48,7 +48,13 @@ export const deletePlansetting = async (id: number) => { // 导出计划设置 Excel export const exportPlansetting = async (params) => { - return await request.download({ url: `/wms/plansetting/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/plansetting/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/plansetting/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/wms/productdismantleJobMain/index.ts b/src/api/wms/productdismantleJobMain/index.ts index b2dddc5e7..0459b0d62 100644 --- a/src/api/wms/productdismantleJobMain/index.ts +++ b/src/api/wms/productdismantleJobMain/index.ts @@ -73,7 +73,13 @@ export const deleteProductdismantleJobMain = async (id: number) => { // 导出制品拆解任务主 Excel export const exportProductdismantleJobMain = async (params) => { - return await request.download({ url: `/wms/productdismantle-job-main/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/productdismantle-job-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/productdismantle-job-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/wms/productdismantleRecordMain/index.ts b/src/api/wms/productdismantleRecordMain/index.ts index 4628be7a3..6cf740a06 100644 --- a/src/api/wms/productdismantleRecordMain/index.ts +++ b/src/api/wms/productdismantleRecordMain/index.ts @@ -58,7 +58,13 @@ export const deleteProductdismantleRecordMain = async (id: number) => { // 导出制品拆解记录主 Excel export const exportProductdismantleRecordMain = async (params) => { - return await request.download({ url: `/wms/productdismantle-record-main/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/productdismantle-record-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/productdismantle-record-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/utils/disposition/formFields.ts b/src/utils/disposition/formFields.ts index 69ab06215..941ce69fa 100644 --- a/src/utils/disposition/formFields.ts +++ b/src/utils/disposition/formFields.ts @@ -265,7 +265,7 @@ { label: "库区代码", prop: "areaCode", }, { type: "filter", label: "类型", prop: "groupType", filters: "locationType", }, { type: "filter", label: "状态", prop: "defaultInventoryStatus", filters: "inventoryStage", }, - { label: "拣料优先级", prop: "pickPriority", }, + { label: "备货优先级", prop: "pickPriority", }, { label: "编号", prop: "code", }, { label: "名称", prop: 'name', }, { label: "描述", prop: "description", }, @@ -312,8 +312,8 @@ { label: "行号", prop: "rowCode", }, { label: "列号", prop: "columnCode", }, { type: "filter", label: "默认库存状态", prop: "defaultInventoryStatus", filters: "inventoryStage", }, - { label: "拣料优先级", prop: "pickPriority", }, - { label: "拣料顺序", prop: "pickOrder", }, + { label: "备货优先级", prop: "pickPriority", }, + { label: "备货顺序", prop: "pickOrder", }, { label: "货架号", prop: "shelfCode", }, { label: "ERP系统库位编号", prop: "erpLocationCode", }, { type: "objectFilter", label: "是否混物料", prop: "locSwitch", showProp: "enableMixItem", filters: "whetherOrNot", }, diff --git a/src/views/home/components/produce.vue b/src/views/home/components/produce.vue index c289ec0c0..b3615be8a 100644 --- a/src/views/home/components/produce.vue +++ b/src/views/home/components/produce.vue @@ -48,7 +48,7 @@ - + diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts index 8c8308e31..2765c0899 100644 --- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts @@ -189,7 +189,7 @@ export const Location = useCrudSchemas(reactive([ }, }, { - label: '拣料优先级', + label: '备货优先级', field: 'pickPriority', sort: 'custom', table: { @@ -400,7 +400,7 @@ export const LocationRules = reactive({ // { required: true, message: '请选择类型', trigger: 'change' } // ], pickPriority: [ - { required: true, message: '请输入拣料优先级', trigger: 'blur' } + { required: true, message: '请输入备货优先级', trigger: 'blur' } ], available: [ { required: true, message: '请选择是否可用', trigger: 'change' } diff --git a/src/views/wms/issueManage/pick/pickJobMain/index.vue b/src/views/wms/issueManage/pick/pickJobMain/index.vue index 153f01d5b..fca7919b6 100644 --- a/src/views/wms/issueManage/pick/pickJobMain/index.vue +++ b/src/views/wms/issueManage/pick/pickJobMain/index.vue @@ -72,7 +72,7 @@ import * as PickJobMainApi from '@/api/wms/pickJobMain' import * as PickJobDetailApi from '@/api/wms/pickJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' -// 拣料任务主 +// 备货任务主 defineOptions({ name: 'PickJobMain' }) const message = useMessage() // 消息弹窗 @@ -215,7 +215,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PickJobMainApi.exportPickJobMain(tableObject.params) - download.excel(data, '拣料任务主.xlsx') + download.excel(data, '备货任务主.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts index d01683497..04280cab4 100644 --- a/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts +++ b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts @@ -2,7 +2,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' /** - * @returns {Array} 拣料任务主表 + * @returns {Array} 备货任务主表 */ export const PickJobMain = useCrudSchemas(reactive([ { @@ -575,7 +575,7 @@ export const PickJobMainRules = reactive({ }) /** - * @returns {Array} 拣料任务子表 + * @returns {Array} 备货任务子表 */ export const PickJobDetail = useCrudSchemas(reactive([ { diff --git a/src/views/wms/issueManage/pick/pickRecordMain/index.vue b/src/views/wms/issueManage/pick/pickRecordMain/index.vue index 94f63352d..87352f916 100644 --- a/src/views/wms/issueManage/pick/pickRecordMain/index.vue +++ b/src/views/wms/issueManage/pick/pickRecordMain/index.vue @@ -67,7 +67,7 @@ import * as PickRecordMainApi from '@/api/wms/pickRecordMain' import * as PickRecordDetailApi from '@/api/wms/pickRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' -// 拣料记录主 +// 备货记录主 defineOptions({ name: 'PickRecordMain' }) const message = useMessage() // 消息弹窗 @@ -148,7 +148,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PickRecordMainApi.exportPickRecordMain(tableObject.params) - download.excel(data, '拣料记录主.xlsx') + download.excel(data, '备货记录主.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts b/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts index 9e550b062..85ea5f5ac 100644 --- a/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts +++ b/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts @@ -2,7 +2,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** - * @returns {Array} 拣料记录主表 + * @returns {Array} 备货记录主表 */ export const PickRecordMain = useCrudSchemas(reactive([ { @@ -330,7 +330,7 @@ export const PickRecordMainRules = reactive({ }) /** - * @returns {Array} 拣料记录子表 + * @returns {Array} 备货记录子表 */ export const PickRecordDetail = useCrudSchemas(reactive([ { diff --git a/src/views/wms/issueManage/pick/pickRequestMain/index.vue b/src/views/wms/issueManage/pick/pickRequestMain/index.vue index b1ff89c76..5e1d78556 100644 --- a/src/views/wms/issueManage/pick/pickRequestMain/index.vue +++ b/src/views/wms/issueManage/pick/pickRequestMain/index.vue @@ -84,7 +84,7 @@ import * as PickRequestMainApi from '@/api/wms/pickRequestMain' import * as PickRequestDetailApi from '@/api/wms/pickRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' -// 拣料申请 +// 备货申请 defineOptions({ name: 'PickRequestMain' }) const message = useMessage() // 消息弹窗 @@ -270,7 +270,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PickRequestMainApi.exportPickRequestMain(tableObject.params) - download.excel(data, '拣料申请主.xlsx') + download.excel(data, '备货申请主.xlsx') } catch { } finally { exportLoading.value = false @@ -323,7 +323,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '拣料申请主导入模版.xlsx' + templateTitle: '备货申请主导入模版.xlsx' }) // 导入成功之后 diff --git a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts index c88a74d5f..ca6888846 100644 --- a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts +++ b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts @@ -23,7 +23,7 @@ const queryParams = { /** - * @returns {Array} 拣料申请主表 + * @returns {Array} 备货申请主表 */ export const PickRequestMain = useCrudSchemas(reactive([ { @@ -384,7 +384,7 @@ export const PickRequestMainRules = reactive({ }) /** - * @returns {Array} 拣料申请子表 + * @returns {Array} 备货申请子表 */ export const PickRequestDetail = useCrudSchemas(reactive([ {