diff --git a/.env.development b/.env.development index 7ffad86e9..0baf5cba7 100644 --- a/.env.development +++ b/.env.development @@ -37,4 +37,7 @@ VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html' VITE_JMREPORT_BASE_URL='http://localhost:12080' # 租户配置 -VITE_TENANT='["长春","成都"]' \ No newline at end of file +VITE_TENANT='["长春","成都"]' + +# 查看质检报告环境 +VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' diff --git a/.env.hella13 b/.env.hella13 deleted file mode 100644 index 21d8a4bb0..000000000 --- a/.env.hella13 +++ /dev/null @@ -1,43 +0,0 @@ -# wms海拉长春生产环境 -NODE_ENV=production - -VITE_DEV=false - -# 请求路径 -VITE_BASE_URL='http://172.21.32.13/api' - -# 上传路径 -VITE_UPLOAD_URL='http://172.21.32.13/api/admin-api/infra/file/upload' - -# 接口前缀 -VITE_API_BASEPATH= - -# 接口地址 -VITE_API_URL=/admin-api - -# 是否删除debugger -VITE_DROP_DEBUGGER=true - -# 是否删除console.log -VITE_DROP_CONSOLE=true - -# 是否sourcemap -VITE_SOURCEMAP=false - -# 打包路径 -VITE_BASE_PATH=/ - -# 输出路径 -VITE_OUT_DIR=sfms3.0-ui - -# 自定义接口路径 -VITE_INTERFACE_URL='http://172.21.32.13:90/magic/web/index.html' - -# 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://172.21.32.13:90' - -# 租户配置 -VITE_TENANT='["长春"]' - -# 查看质检报告环境 -VITE_REPORT_URL = 'https://scp.faway-hella.com' \ No newline at end of file diff --git a/.env.hella14 b/.env.hella14 deleted file mode 100644 index 9b5fca566..000000000 --- a/.env.hella14 +++ /dev/null @@ -1,43 +0,0 @@ -# wms海拉长春测试环境 -NODE_ENV=production - -VITE_DEV=false - -# 请求路径 -VITE_BASE_URL='http://172.21.32.14/api' - -# 上传路径 -VITE_UPLOAD_URL='http://172.21.32.14/api/admin-api/infra/file/upload' - -# 接口前缀 -VITE_API_BASEPATH= - -# 接口地址 -VITE_API_URL=/admin-api - -# 是否删除debugger -VITE_DROP_DEBUGGER=true - -# 是否删除console.log -VITE_DROP_CONSOLE=true - -# 是否sourcemap -VITE_SOURCEMAP=false - -# 打包路径 -VITE_BASE_PATH=/ - -# 输出路径 -VITE_OUT_DIR=sfms3.0-ui - -# 自定义接口路径 -VITE_INTERFACE_URL='http://172.21.32.14:90/magic/web/index.html' - -# 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://172.21.32.14:90' - -# 租户配置 -VITE_TENANT='["长春"]' - -# 查看质检报告环境 -VITE_REPORT_URL = 'https://scptest.faway-hella.com' \ No newline at end of file diff --git a/.env.hella16 b/.env.hella16 deleted file mode 100644 index e5f3cf2a6..000000000 --- a/.env.hella16 +++ /dev/null @@ -1,40 +0,0 @@ -# scp海拉长春测试环境 -NODE_ENV=production - -VITE_DEV=false - -# 请求路径 -VITE_BASE_URL='https://scptest.faway-hella.com/api' - -# 上传路径 -VITE_UPLOAD_URL='https://scptest.faway-hella.com/api/admin-api/infra/file/upload' - -# 接口前缀 -VITE_API_BASEPATH= - -# 接口地址 -VITE_API_URL=/admin-api - -# 是否删除debugger -VITE_DROP_DEBUGGER=true - -# 是否删除console.log -VITE_DROP_CONSOLE=true - -# 是否sourcemap -VITE_SOURCEMAP=false - -# 打包路径 -VITE_BASE_PATH=/ - -# 输出路径 -VITE_OUT_DIR=sfms3.0-ui - -# 自定义接口路径 -VITE_INTERFACE_URL='https://scptest.faway-hella.com/magic/web/index.html' - -# 积木报表请求路径 -VITE_JMREPORT_BASE_URL='https://scptest.faway-hella.com' - -# 租户配置 -VITE_TENANT='["长春","成都"]' diff --git a/.env.hella8 b/.env.hella8 deleted file mode 100644 index d022f0740..000000000 --- a/.env.hella8 +++ /dev/null @@ -1,44 +0,0 @@ -# wms海拉成都生产环境 -NODE_ENV=production - -VITE_DEV=false - -# 请求路径 -VITE_BASE_URL='http://172.22.32.8/api' - -# 上传路径 -VITE_UPLOAD_URL='http://172.22.32.8/api/admin-api/infra/file/upload' - -# 接口前缀 -VITE_API_BASEPATH= - -# 接口地址 -VITE_API_URL=/admin-api - -# 是否删除debugger -VITE_DROP_DEBUGGER=true - -# 是否删除console.log -VITE_DROP_CONSOLE=true - -# 是否sourcemap -VITE_SOURCEMAP=false - -# 打包路径 -VITE_BASE_PATH=/ - -# 输出路径 -VITE_OUT_DIR=sfms3.0-ui - -# 自定义接口路径 -VITE_INTERFACE_URL='http://172.22.32.8:90/magic/web/index.html' - -# 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://172.22.32.8:90' - - -# 租户配置 -VITE_TENANT='["成都"]' - -# 查看质检报告环境 -VITE_REPORT_URL = 'https://scp.faway-hella.com' \ No newline at end of file diff --git a/.env.hella9 b/.env.hella9 deleted file mode 100644 index baf753b61..000000000 --- a/.env.hella9 +++ /dev/null @@ -1,43 +0,0 @@ -# wms海拉成都测试环境 -NODE_ENV=production - -VITE_DEV=false - -# 请求路径 -VITE_BASE_URL='http://172.22.32.9/api' - -# 上传路径 -VITE_UPLOAD_URL='http://172.22.32.9/api/admin-api/infra/file/upload' - -# 接口前缀 -VITE_API_BASEPATH= - -# 接口地址 -VITE_API_URL=/admin-api - -# 是否删除debugger -VITE_DROP_DEBUGGER=true - -# 是否删除console.log -VITE_DROP_CONSOLE=true - -# 是否sourcemap -VITE_SOURCEMAP=false - -# 打包路径 -VITE_BASE_PATH=/ - -# 输出路径 -VITE_OUT_DIR=sfms3.0-ui - -# 自定义接口路径 -VITE_INTERFACE_URL='http://172.22.32.9:90/magic/web/index.html' - -# 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://172.22.32.9:90' - -# 租户配置 -VITE_TENANT='["成都"]' - -# 查看质检报告环境 -VITE_REPORT_URL = 'https://scptest.faway-hella.com' diff --git a/.env.hella15 b/.env.prod similarity index 56% rename from .env.hella15 rename to .env.prod index 122b9022e..dabaa224f 100644 --- a/.env.hella15 +++ b/.env.prod @@ -1,13 +1,13 @@ -# scp海拉长春生产环境 +# 生产环境 NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='https://scp.faway-hella.com/api' +VITE_BASE_URL='http://dev.ccwin-in.com:25300/api' # 上传路径 -VITE_UPLOAD_URL='https://scp.faway-hella.com/api/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://dev.ccwin-in.com:25300/api/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH= @@ -31,10 +31,13 @@ VITE_BASE_PATH=/ VITE_OUT_DIR=sfms3.0-ui # 自定义接口路径 -VITE_INTERFACE_URL='https://scp.faway-hella.com/magic/web/index.html' +VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html' # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='https://scp.faway-hella.com' +VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310' # 租户配置 VITE_TENANT='["长春","成都"]' + +# 查看质检报告环境 +VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' diff --git a/.env.test b/.env.test index 53100a20f..02d51a0d7 100644 --- a/.env.test +++ b/.env.test @@ -28,7 +28,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=sfms3.0 +VITE_OUT_DIR=sfms3.0-ui # 自定义接口路径 VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html' diff --git a/.env.test-scp b/.env.test-scp index e64386900..c97b58331 100644 --- a/.env.test-scp +++ b/.env.test-scp @@ -39,3 +39,6 @@ VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25311' # 租户配置 VITE_TENANT='["长春","成都"]' + +# 查看质检报告环境 +VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' diff --git a/.env.wyf b/.env.wyf index 5b2520335..03883d055 100644 --- a/.env.wyf +++ b/.env.wyf @@ -48,4 +48,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html' VITE_JMREPORT_BASE_URL='http://192.168.0.108:12080' # 租户配置 -VITE_TENANT='["长春","成都"]' \ No newline at end of file +VITE_TENANT='["长春","成都"]' + +# 查看质检报告环境 +VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' diff --git a/README.md b/README.md index 648fbf09c..7c997d5fa 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,14 @@ const { tableObject, tableMethods } = useTable({ getListApi: “PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage”// 分页接口 }) -5、ts文件配置： +5、搜索工作栏 + + +6、ts文件配置： hiddenInMain:true, //子表中数据不展示在主表 sortTableDefault:1000, // 主页面中Table表中展示的排序位置：默认值999 ，最小值1，值越大越靠后,值越小越靠前 sortSearchDefault：1000,// 搜素框中展示的排序位置，用法同sortTableDefault diff --git a/index.html b/index.html index e322068ed..e164a59b3 100644 --- a/index.html +++ b/index.html @@ -8,6 +8,7 @@ + %VITE_APP_TITLE% diff --git a/package.json b/package.json index be89b1319..5646cfe76 100644 --- a/package.json +++ b/package.json @@ -9,12 +9,7 @@ "wyf": "vite --mode wyf", "test": "vite build --mode test", "test-scp": "vite build --mode test-scp", - "hella8": "vite build --mode hella8", - "hella9": "vite build --mode hella9", - "hella13": "vite build --mode hella13", - "hella14": "vite build --mode hella14", - "hella15": "vite build --mode hella15", - "hella16": "vite build --mode hella16", + "prod": "vite build --mode prod", "preview": "vite preview", "lint": "eslint --fix --ext .js,.vue src" }, diff --git a/public/systemConfig.js b/public/systemConfig.js new file mode 100644 index 000000000..1908c7089 --- /dev/null +++ b/public/systemConfig.js @@ -0,0 +1,14 @@ +let systemConfig = { + // 请求路径 + baseUrl: 'http://172.22.32.8/api', + // 上传路径 + uploadUrl: 'http://172.22.32.8/api/admin-api/infra/file/upload', + // 自定义接口路径 + interfaceUrl: 'http://172.22.32.8:90/magic/web/index.html', + // 积木报表请求路径 + jmreportBaseUrl: 'http://172.22.32.8:90', + // 查看质检报告环境 + reportUrl: 'https://scp.faway-hella.com', + // 租户配置 + tenant: '["成都"]' +} diff --git a/src/api/eam/equipmentInspectionDetail/index.ts b/src/api/eam/equipmentInspectionDetail/index.ts new file mode 100644 index 000000000..2381178c3 --- /dev/null +++ b/src/api/eam/equipmentInspectionDetail/index.ts @@ -0,0 +1,60 @@ +import request from '@/config/axios' + +export interface EquipmentInspectionDetailVO { + id: number + number: string + masterId: number + completionTime: Date + uncompletedCause: string + result: string + name: string + content: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询巡检工单子列表 +export const getEquipmentInspectionDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/equipment-inspection-detail/senior', data }) + } else { + return await request.get({ url: `/eam/equipment-inspection-detail/page`, params }) + } +} + +// 查询巡检工单子详情 +export const getEquipmentInspectionDetail = async (id: number) => { + return await request.get({ url: `/eam/equipment-inspection-detail/get?id=` + id }) +} + +// 新增巡检工单子 +export const createEquipmentInspectionDetail = async (data: EquipmentInspectionDetailVO) => { + return await request.post({ url: `/eam/equipment-inspection-detail/create`, data }) +} + +// 修改巡检工单子 +export const updateEquipmentInspectionDetail = async (data: EquipmentInspectionDetailVO) => { + return await request.put({ url: `/eam/equipment-inspection-detail/update`, data }) +} + +// 删除巡检工单子 +export const deleteEquipmentInspectionDetail = async (id: number) => { + return await request.delete({ url: `/eam/equipment-inspection-detail/delete?id=` + id }) +} + +// 导出巡检工单子 Excel +export const exportEquipmentInspectionDetail = async (params) => { + return await request.download({ url: `/eam/equipment-inspection-detail/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/equipment-inspection-detail/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/eam/equipmentInspectionMain/index.ts b/src/api/eam/equipmentInspectionMain/index.ts new file mode 100644 index 000000000..5ea08a095 --- /dev/null +++ b/src/api/eam/equipmentInspectionMain/index.ts @@ -0,0 +1,104 @@ +import request from '@/config/axios' +import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart"; +import {EquipmentMaintenanceMainVO} from "@/api/eam/equipmentMaintenanceMain"; + +export interface EquipmentInspectionMainVO { + id: number + number: string + sources: string + describing: string + equipmentCode: string + type: string + isPictures: boolean + planNumber: string + planStartTime: Date + planEndTime: Date + startTime: Date + endTime: Date + classType: string + verifyer: number + verifyContent: string + verifyTime: Date + maintenancer: number + completionTime: Date + maintenanceTime: Date + status: string + autoOrder: string + autoPerform: string + autoVerify: string + directCreateRecord: string + faultType: string + factoryAreaCode: string + workshopCode: string + lineCode: string + processCode: string + workstationCode: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询巡检工单主列表 +export const getEquipmentInspectionMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/equipment-inspection-main/senior', data }) + } else { + return await request.get({ url: `/eam/equipment-inspection-main/page`, params }) + } +} + +// 查询巡检工单主详情 +export const getEquipmentInspectionMain = async (id: number) => { + return await request.get({ url: `/eam/equipment-inspection-main/get?id=` + id }) +} + +// 新增巡检工单主 +export const createEquipmentInspectionMain = async (data: EquipmentInspectionMainVO) => { + return await request.post({ url: `/eam/equipment-inspection-main/create`, data }) +} + +// 修改巡检工单主 +export const updateEquipmentInspectionMain = async (data: EquipmentInspectionMainVO) => { + return await request.put({ url: `/eam/equipment-inspection-main/update`, data }) +} + +// 修改巡检工单主 +export const updateEquipmentInspection = async (data: EquipmentInspectionMainVO) => { + return await request.post({ url: `/eam/equipment-inspection-main/updateOrders`, data }) +} + +// 删除巡检工单主 +export const deleteEquipmentInspectionMain = async (id: number) => { + return await request.delete({ url: `/eam/equipment-inspection-main/delete?id=` + id }) +} + +// 导出巡检工单主 Excel +export const exportEquipmentInspectionMain = async (params) => { + return await request.download({ url: `/eam/equipment-inspection-main/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/equipment-inspection-main/get-import-template' }) +} + +// 修改保养工单状态 +export const updateEquipmentInspectionOrder = async (data: EquipmentInspectionMainVO) => { + return await request.post({ url: `/eam/equipment-inspection-main/updateOrder`, data }) +} + +//完成保养工单 +export const executeEquipmentInspectionOrder = async (data: EquipmentInspectionMainVO) => { + return await request.post({ url: `/eam/equipment-inspection-main/execute`, data }) +} + +//验证不通过,打回保养工单 +export const backEquipmentInspectionOrder = async (data: EquipmentInspectionMainVO) => { + return await request.post({ url: `/eam/equipment-inspection-main/fallback`, data }) +} diff --git a/src/api/eam/equipmentSpotCheckDetail/index.ts b/src/api/eam/equipmentSpotCheckDetail/index.ts new file mode 100644 index 000000000..be5b18019 --- /dev/null +++ b/src/api/eam/equipmentSpotCheckDetail/index.ts @@ -0,0 +1,62 @@ +import request from '@/config/axios' + +export interface EquipmentSpotCheckDetailVO { + id: number + number: string + masterId: number + completionTime: Date + uncompletedCause: string + result: string + name: string + content: string + equipmentParts: string + methods: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询点检工单子列表 +export const getEquipmentSpotCheckDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/equipment-spot-check-detail/senior', data }) + } else { + return await request.get({ url: `/eam/equipment-spot-check-detail/page`, params }) + } +} + +// 查询点检工单子详情 +export const getEquipmentSpotCheckDetail = async (id: number) => { + return await request.get({ url: `/eam/equipment-spot-check-detail/get?id=` + id }) +} + +// 新增点检工单子 +export const createEquipmentSpotCheckDetail = async (data: EquipmentSpotCheckDetailVO) => { + return await request.post({ url: `/eam/equipment-spot-check-detail/create`, data }) +} + +// 修改点检工单子 +export const updateEquipmentSpotCheckDetail = async (data: EquipmentSpotCheckDetailVO) => { + return await request.put({ url: `/eam/equipment-spot-check-detail/update`, data }) +} + +// 删除点检工单子 +export const deleteEquipmentSpotCheckDetail = async (id: number) => { + return await request.delete({ url: `/eam/equipment-spot-check-detail/delete?id=` + id }) +} + +// 导出点检工单子 Excel +export const exportEquipmentSpotCheckDetail = async (params) => { + return await request.download({ url: `/eam/equipment-spot-check-detail/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/equipment-spot-check-detail/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/eam/equipmentSpotCheckMain/index.ts b/src/api/eam/equipmentSpotCheckMain/index.ts new file mode 100644 index 000000000..9403acf8d --- /dev/null +++ b/src/api/eam/equipmentSpotCheckMain/index.ts @@ -0,0 +1,103 @@ +import request from '@/config/axios' +import {EquipmentInspectionMainVO} from "@/api/eam/equipmentInspectionMain"; + +export interface EquipmentSpotCheckMainVO { + id: number + number: string + describing: string + equipmentCode: string + type: string + planNumber: string + planStartTime: Date + planEndTime: Date + startTime: Date + endTime: Date + faultType: string + verifyer: number + verifyContent: string + verifyTime: Date + maintenancer: number + completionTime: Date + maintenanceTime: Date + isPictures: boolean + status: string + autoOrder: string + autoPerform: string + autoVerify: string + directCreateRecord: string + classType: string + factoryAreaCode: string + workshopCode: string + lineCode: string + processCode: string + workstationCode: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询点检工单主列表 +export const getEquipmentSpotCheckMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/equipment-spot-check-main/senior', data }) + } else { + return await request.get({ url: `/eam/equipment-spot-check-main/page`, params }) + } +} + +// 查询点检工单主详情 +export const getEquipmentSpotCheckMain = async (id: number) => { + return await request.get({ url: `/eam/equipment-spot-check-main/get?id=` + id }) +} + +// 新增点检工单主 +export const createEquipmentSpotCheckMain = async (data: EquipmentSpotCheckMainVO) => { + return await request.post({ url: `/eam/equipment-spot-check-main/create`, data }) +} + +// 修改点检工单主 +export const updateEquipmentSpotCheckMain = async (data: EquipmentSpotCheckMainVO) => { + return await request.put({ url: `/eam/equipment-spot-check-main/update`, data }) +} + +// 修改点检工单主 +export const updateEquipmentSpotCheck = async (data: EquipmentSpotCheckMainVO) => { + return await request.post({ url: `/eam/equipment-spot-check-main/updateOrders`, data }) +} + +// 删除点检工单主 +export const deleteEquipmentSpotCheckMain = async (id: number) => { + return await request.delete({ url: `/eam/equipment-spot-check-main/delete?id=` + id }) +} + +// 导出点检工单主 Excel +export const exportEquipmentSpotCheckMain = async (params) => { + return await request.download({ url: `/eam/equipment-spot-check-main/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/equipment-spot-check-main/get-import-template' }) +} + + +// 修改点检工单状态 +export const updateEquipmentSpotCheckOrder = async (data: EquipmentSpotCheckMainVO) => { + return await request.post({ url: `/eam/equipment-spot-check-main/updateOrder`, data }) +} + +//完成点检工单 +export const executeEquipmentSpotCheckOrder = async (data: EquipmentSpotCheckMainVO) => { + return await request.post({ url: `/eam/equipment-spot-check-main/execute`, data }) +} + +//验证不通过,打回点检工单 +export const backEquipmentSpotCheckOrder = async (data: EquipmentSpotCheckMainVO) => { + return await request.post({ url: `/eam/equipment-spot-check-main/fallback`, data }) +} diff --git a/src/api/eam/item/index.ts b/src/api/eam/item/index.ts new file mode 100644 index 000000000..35d3e1086 --- /dev/null +++ b/src/api/eam/item/index.ts @@ -0,0 +1,80 @@ +import request from '@/config/axios' + +export interface ItemVO { + number : string + name : string + brand : string + specifications : string + isConstant : string + subject : string + classification : string + uom : string + singlePrice : number + reprocurement : number + safetyStock : number + cost : string + purchaser : string + financer : string + isFramework : string + isRadeIn : string + siteId : string + available : string + concurrencyStamp : number +} + +// 查询备件列表 +export const getItemPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/eam/item/senior', data }) + } else { + return await request.get({ url: `/eam/item/page`, params }) + } +} + +// 生成标签 +export const genDevice = async (data) => { + return await request.post({ url: `/eam/item/genDevice`, data }) +} + +// 查询备件详情 +export const getItem = async (id : number) => { + return await request.get({ url: `/eam/item/get?id=` + id }) +} + +// 新增备件 +export const createItem = async (data : ItemVO) => { + return await request.post({ url: `/eam/item/create`, data }) +} + +// 修改备件 +export const updateItem = async (data : ItemVO) => { + return await request.put({ url: `/eam/item/update`, data }) +} + +// 删除备件 +export const deleteItem = async (id : number) => { + return await request.delete({ url: `/eam/item/delete?id=` + id }) +} + +// 导出备件 Excel +export const exportItem = async (params) => { + return await request.download({ url: `/eam/item/export-excel`, params }) +} + +// 修改备件 +export const getItemList = async (params) => { + return await request.get({ url: `/eam/item/getListByNumber`, params }) +} + +// // 删除备件 +// export const getaaa = async () => { +// return await request.get({ url: `/eam/producePlan/produce`}) +// } + +// 备件不分页 + +export const getItemNoPage = async (params) => { + return await request.get({ url: `/eam/item/noPage`, params }) +} diff --git a/src/api/eam/itemApplyMain/index.ts b/src/api/eam/itemApplyMain/index.ts new file mode 100644 index 000000000..eeccb6e13 --- /dev/null +++ b/src/api/eam/itemApplyMain/index.ts @@ -0,0 +1,63 @@ +import request from '@/config/axios' + +export interface ItemApplyMainVO { + number: string + name: string + type: string + applyId: number + applyDeptId: number + approveId: number + approveTime: Date + outId: number + outTime: Date + siteId: string + available: string + concurrencyStamp: number +} + +// 查询备件申领记录主列表 +export const getItemApplyMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/item-apply-request-main/senior', data }) + } else { + return await request.get({ url: `/eam/item-apply-request-main/page`, params }) + } +} + +// 查询备件申领记录主详情 +export const getItemApplyMain = async (id: number) => { + return await request.get({ url: `/eam/item-apply-request-main/get?id=` + id }) +} + +// 新增备件申领记录主 +export const createItemApplyMain = async (data: ItemApplyMainVO) => { + return await request.post({ url: `/eam/item-apply-request-main/create`, data }) +} + +// 修改备件申领记录主 +export const updateItemApplyMain = async (data: ItemApplyMainVO) => { + return await request.put({ url: `/eam/item-apply-request-main/update`, data }) +} + +// 删除备件申领记录主 +export const deleteItemApplyMain = async (id: number) => { + return await request.delete({ url: `/eam/item-apply-request-main/delete?id=` + id }) +} + +// 撤销备件申领记录主 +export const backoutItemApplyMain = async (id: number) => { + return await request.get({ url: `/eam/item-apply-request-main/backout?id=` + id }) +} + + +// 导出备件申领记录主 Excel +export const exportItemApplyMain = async (params) => { + return await request.download({ url: `/eam/item-apply-request-main/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/item-apply-request-main/get-import-template' }) +} diff --git a/src/api/eam/itemDelete/index.ts b/src/api/eam/itemDelete/index.ts new file mode 100644 index 000000000..417f114e1 --- /dev/null +++ b/src/api/eam/itemDelete/index.ts @@ -0,0 +1,65 @@ +import request from '@/config/axios' + +export interface ItemAccountsVO { + itemNumber: string + qty: number + areaNumber: string + isInAccount: string + siteId: string + available: string + concurrencyStamp: number +} + +// 查询备件台账移除列表 +export const getItemAccountsPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + data.qty = 0 + return await request.post({ url: '/eam/item-accounts/senior', data }) + } else { + params.qty = 0 + return await request.get({ url: `/eam/item-accounts/page`, params }) + } +} + +// 查询备件台账详情 +export const getItemAccounts = async (id: number) => { + return await request.get({ url: `/eam/item-accounts/get?id=` + id }) +} + +// 新增备件台账 +export const createItemAccounts = async (data: ItemAccountsVO) => { + return await request.post({ url: `/eam/item-accounts/create`, data }) +} + +// 修改备件台账 +export const updateItemAccounts = async (data: ItemAccountsVO) => { + return await request.put({ url: `/eam/item-accounts/update`, data }) +} + +// 删除备件台账 +export const deleteItemAccounts = async (id: number) => { + return await request.delete({ url: `/eam/item-accounts/delete?id=` + id }) +} + +// 导出备件台账 Excel +export const exportItemAccounts = async (params) => { + return await request.download({ url: `/eam/item-accounts/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/item-accounts/get-import-template' }) +} + +// 更改备件库位 +export const replaceLocation = async (data: Array) => { + return await request.post({ url: `/eam/item-accounts/replaceLocation `, data }) +} + +// 备件不分页 + +export const getItemAccountsNoPage = async (params) => { + return await request.get({ url: `/eam/item-accounts/noPage`, params }) +} diff --git a/src/api/eam/location/index.ts b/src/api/eam/location/index.ts new file mode 100644 index 000000000..66eab6e12 --- /dev/null +++ b/src/api/eam/location/index.ts @@ -0,0 +1,55 @@ +import request from '@/config/axios' + +export interface LocationVO { + number: string + name: string + description: string + areaNumber: string + type: string + isInAccount: string + siteId: string + available: string + concurrencyStamp: number +} + +// 查询库位列表 +export const getLocationPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/location/senior', data }) + } else { + return await request.get({ url: `/eam/location/page`, params }) + } +} + +// 查询库位详情 +export const getLocation = async (id: number) => { + return await request.get({ url: `/eam/location/get?id=` + id }) +} + +// 新增库位 +export const createLocation = async (data: LocationVO) => { + return await request.post({ url: `/eam/location/create`, data }) +} + +// 修改库位 +export const updateLocation = async (data: LocationVO) => { + return await request.put({ url: `/eam/location/update`, data }) +} + +// 删除库位 +export const deleteLocation = async (id: number) => { + return await request.delete({ url: `/eam/location/delete?id=` + id }) +} + +// 导出库位 Excel +export const exportLocation = async (params) => { + return await request.download({ url: `/eam/location/export-excel`, params }) +} + + +// 查询库位列表 +export const getLocationNoPage = async (params) => { + return await request.get({ url: `/eam/location/noPage`, params }) +} diff --git a/src/api/eam/locationArea/index.ts b/src/api/eam/locationArea/index.ts new file mode 100644 index 000000000..e1dd72ead --- /dev/null +++ b/src/api/eam/locationArea/index.ts @@ -0,0 +1,48 @@ +import request from '@/config/axios' + +export interface LocationAreaVO { + number: string + name: string + description: string + type: string + siteId: string + available: string + concurrencyStamp: number +} + +// 查询库区列表 +export const getLocationAreaPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/location-area/senior', data }) + } else { + return await request.get({ url: `/eam/location-area/page`, params }) + } +} + +// 查询库区详情 +export const getLocationArea = async (id: number) => { + return await request.get({ url: `/eam/location-area/get?id=` + id }) +} + +// 新增库区 +export const createLocationArea = async (data: LocationAreaVO) => { + return await request.post({ url: `/eam/location-area/create`, data }) +} + +// 修改库区 +export const updateLocationArea = async (data: LocationAreaVO) => { + return await request.put({ url: `/eam/location-area/update`, data }) +} + +// 删除库区 +export const deleteLocationArea = async (id: number) => { + return await request.delete({ url: `/eam/location-area/delete?id=` + id }) +} + +// 导出库区 Excel +export const exportLocationArea = async (params) => { + return await request.download({ url: `/eam/location-area/export-excel`, params }) +} + diff --git a/src/api/eam/maintainExperience/index.ts b/src/api/eam/maintainExperience/index.ts new file mode 100644 index 000000000..f85ae6eba --- /dev/null +++ b/src/api/eam/maintainExperience/index.ts @@ -0,0 +1,51 @@ +import request from '@/config/axios' + +export interface MaintainExperienceVO { + id: number + name: string + content: string + masterId: number + orderType: string + maintainNumber: string +} + +// 查询保养经验记录列表 +export const getMaintainExperiencePage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/record/maintain-experience/senior', data }) + } else { + return await request.get({ url: `/record/maintain-experience/page`, params }) + } +} + +// 查询保养经验记录详情 +export const getMaintainExperience = async (id: number) => { + return await request.get({ url: `/record/maintain-experience/get?id=` + id }) +} + +// 新增保养经验记录 +export const createMaintainExperience = async (data: MaintainExperienceVO) => { + return await request.post({ url: `/record/maintain-experience/create`, data }) +} + +// 修改保养经验记录 +export const updateMaintainExperience = async (data: MaintainExperienceVO) => { + return await request.put({ url: `/record/maintain-experience/update`, data }) +} + +// 删除保养经验记录 +export const deleteMaintainExperience = async (id: number) => { + return await request.delete({ url: `/record/maintain-experience/delete?id=` + id }) +} + +// 导出保养经验记录 Excel +export const exportMaintainExperience = async (params) => { + return await request.download({ url: `/record/maintain-experience/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/record/maintain-experience/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/eam/relationInspectionPlanItem/index.ts b/src/api/eam/relationInspectionPlanItem/index.ts new file mode 100644 index 000000000..08f78637e --- /dev/null +++ b/src/api/eam/relationInspectionPlanItem/index.ts @@ -0,0 +1,57 @@ +import request from '@/config/axios' + +export interface RelationInspectionPlanItemVO { + id: number + planNumber: string + itemCode: string + itemName: string + isSelectd: boolean + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询巡检计划和巡检项关系列表 +export const getRelationInspectionPlanItemPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/relation-inspection-plan-item/senior', data }) + } else { + return await request.get({ url: `/eam/relation-inspection-plan-item/page`, params }) + } +} + +// 查询巡检计划和巡检项关系详情 +export const getRelationInspectionPlanItem = async (id: number) => { + return await request.get({ url: `/eam/relation-inspection-plan-item/get?id=` + id }) +} + +// 新增巡检计划和巡检项关系 +export const createRelationInspectionPlanItem = async (data: RelationInspectionPlanItemVO) => { + return await request.post({ url: `/eam/relation-inspection-plan-item/create`, data }) +} + +// 修改巡检计划和巡检项关系 +export const updateRelationInspectionPlanItem = async (data: RelationInspectionPlanItemVO) => { + return await request.put({ url: `/eam/relation-inspection-plan-item/update`, data }) +} + +// 删除巡检计划和巡检项关系 +export const deleteRelationInspectionPlanItem = async (id: number) => { + return await request.delete({ url: `/eam/relation-inspection-plan-item/delete?id=` + id }) +} + +// 导出巡检计划和巡检项关系 Excel +export const exportRelationInspectionPlanItem = async (params) => { + return await request.download({ url: `/eam/relation-inspection-plan-item/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/relation-inspection-plan-item/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/eam/relationSpotCheckPlanItem/index.ts b/src/api/eam/relationSpotCheckPlanItem/index.ts new file mode 100644 index 000000000..7293e4713 --- /dev/null +++ b/src/api/eam/relationSpotCheckPlanItem/index.ts @@ -0,0 +1,57 @@ +import request from '@/config/axios' + +export interface RelationSpotCheckPlanItemVO { + id: number + planNumber: string + itemCode: string + itemName: string + isSelectd: boolean + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询点检计划表和巡检项关系列表 +export const getRelationSpotCheckPlanItemPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/relation-spot-check-plan-item/senior', data }) + } else { + return await request.get({ url: `/eam/relation-spot-check-plan-item/page`, params }) + } +} + +// 查询点检计划表和巡检项关系详情 +export const getRelationSpotCheckPlanItem = async (id: number) => { + return await request.get({ url: `/eam/relation-spot-check-plan-item/get?id=` + id }) +} + +// 新增点检计划表和巡检项关系 +export const createRelationSpotCheckPlanItem = async (data: RelationSpotCheckPlanItemVO) => { + return await request.post({ url: `/eam/relation-spot-check-plan-item/create`, data }) +} + +// 修改点检计划表和巡检项关系 +export const updateRelationSpotCheckPlanItem = async (data: RelationSpotCheckPlanItemVO) => { + return await request.put({ url: `/eam/relation-spot-check-plan-item/update`, data }) +} + +// 删除点检计划表和巡检项关系 +export const deleteRelationSpotCheckPlanItem = async (id: number) => { + return await request.delete({ url: `/eam/relation-spot-check-plan-item/delete?id=` + id }) +} + +// 导出点检计划表和巡检项关系 Excel +export const exportRelationSpotCheckPlanItem = async (params) => { + return await request.download({ url: `/eam/relation-spot-check-plan-item/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/relation-spot-check-plan-item/get-import-template' }) +} diff --git a/src/api/eam/repairExperience/index.ts b/src/api/eam/repairExperience/index.ts new file mode 100644 index 000000000..5433a47c8 --- /dev/null +++ b/src/api/eam/repairExperience/index.ts @@ -0,0 +1,49 @@ +import request from '@/config/axios' + +export interface RepairExperienceVO { + id: number + name: string + content: string + repairNumber: string +} + +// 查询维修经验记录列表 +export const getRepairExperiencePage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/record/repair-experience/senior', data }) + } else { + return await request.get({ url: `/record/repair-experience/page`, params }) + } +} + +// 查询维修经验记录详情 +export const getRepairExperience = async (id: number) => { + return await request.get({ url: `/record/repair-experience/get?id=` + id }) +} + +// 新增维修经验记录 +export const createRepairExperience = async (data: RepairExperienceVO) => { + return await request.post({ url: `/record/repair-experience/create`, data }) +} + +// 修改维修经验记录 +export const updateRepairExperience = async (data: RepairExperienceVO) => { + return await request.put({ url: `/record/repair-experience/update`, data }) +} + +// 删除维修经验记录 +export const deleteRepairExperience = async (id: number) => { + return await request.delete({ url: `/record/repair-experience/delete?id=` + id }) +} + +// 导出维修经验记录 Excel +export const exportRepairExperience = async (params) => { + return await request.download({ url: `/record/repair-experience/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/record/repair-experience/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/eam/sparePartsApplyDetail/index.ts b/src/api/eam/sparePartsApplyDetail/index.ts deleted file mode 100644 index ae94831de..000000000 --- a/src/api/eam/sparePartsApplyDetail/index.ts +++ /dev/null @@ -1,63 +0,0 @@ -import request from '@/config/axios' - -export interface SparePartsApplyDetailVO { - id: number - number: string - masterId: number - sparePartsCode: string - isRadeIn: string - applyQty: number - currentQty: number - type: string - currentSinglePrice: number - equipmentCode: byte[] - jobNumber: byte[] - departmentCode: string - remark: string - siteId: string - available: string - deletionTime: Date - deleterId: byte[] - concurrencyStamp: number -} - -// 查询备件领用申请子列表 -export const getSparePartsApplyDetailPage = async (params) => { - if (params.isSearch) { - delete params.isSearch - const data = {...params} - return await request.post({ url: '/eam/spare-parts-apply-detail/senior', data }) - } else { - return await request.get({ url: `/eam/spare-parts-apply-detail/page`, params }) - } -} - -// 查询备件领用申请子详情 -export const getSparePartsApplyDetail = async (id: number) => { - return await request.get({ url: `/eam/spare-parts-apply-detail/get?id=` + id }) -} - -// 新增备件领用申请子 -export const createSparePartsApplyDetail = async (data: SparePartsApplyDetailVO) => { - return await request.post({ url: `/eam/spare-parts-apply-detail/create`, data }) -} - -// 修改备件领用申请子 -export const updateSparePartsApplyDetail = async (data: SparePartsApplyDetailVO) => { - return await request.put({ url: `/eam/spare-parts-apply-detail/update`, data }) -} - -// 删除备件领用申请子 -export const deleteSparePartsApplyDetail = async (id: number) => { - return await request.delete({ url: `/eam/spare-parts-apply-detail/delete?id=` + id }) -} - -// 导出备件领用申请子 Excel -export const exportSparePartsApplyDetail = async (params) => { - return await request.download({ url: `/eam/spare-parts-apply-detail/export-excel`, params }) -} - -// 下载用户导入模板 -export const importTemplate = () => { - return request.download({ url: '/eam/spare-parts-apply-detail/get-import-template' }) -} \ No newline at end of file diff --git a/src/api/eam/sparePartsApplyMain/index.ts b/src/api/eam/sparePartsApplyMain/index.ts deleted file mode 100644 index c69234979..000000000 --- a/src/api/eam/sparePartsApplyMain/index.ts +++ /dev/null @@ -1,65 +0,0 @@ -import request from '@/config/axios' - -export interface SparePartsApplyMainVO { - id: number - number: string - description: string - applyDeptId: string - sumVal: number - status: string - applyer: string - approver: number - approveContent: string - approveTime: Date - autoExamine: string - autoAgree: string - directCreateRecord: string - departmentCode: string - remark: string - siteId: string - available: string - deletionTime: Date - deleterId: byte[] - concurrencyStamp: number -} - -// 查询备件领用申请列表 -export const getSparePartsApplyMainPage = async (params) => { - if (params.isSearch) { - delete params.isSearch - const data = {...params} - return await request.post({ url: '/eam/spare-parts-apply-main/senior', data }) - } else { - return await request.get({ url: `/eam/spare-parts-apply-main/page`, params }) - } -} - -// 查询备件领用申请详情 -export const getSparePartsApplyMain = async (id: number) => { - return await request.get({ url: `/eam/spare-parts-apply-main/get?id=` + id }) -} - -// 新增备件领用申请 -export const createSparePartsApplyMain = async (data: SparePartsApplyMainVO) => { - return await request.post({ url: `/eam/spare-parts-apply-main/create`, data }) -} - -// 修改备件领用申请 -export const updateSparePartsApplyMain = async (data: SparePartsApplyMainVO) => { - return await request.put({ url: `/eam/spare-parts-apply-main/update`, data }) -} - -// 删除备件领用申请 -export const deleteSparePartsApplyMain = async (id: number) => { - return await request.delete({ url: `/eam/spare-parts-apply-main/delete?id=` + id }) -} - -// 导出备件领用申请 Excel -export const exportSparePartsApplyMain = async (params) => { - return await request.download({ url: `/eam/spare-parts-apply-main/export-excel`, params }) -} - -// 下载用户导入模板 -export const importTemplate = () => { - return request.download({ url: '/eam/spare-parts-apply-main/get-import-template' }) -} \ No newline at end of file diff --git a/src/api/eam/sparePartsInLocationDetail/index.ts b/src/api/eam/sparePartsInLocationDetail/index.ts deleted file mode 100644 index 827687a36..000000000 --- a/src/api/eam/sparePartsInLocationDetail/index.ts +++ /dev/null @@ -1,58 +0,0 @@ -import request from '@/config/axios' - -export interface SparePartsInLocationDetailVO { - id: number - number: string - masterId: number - sparePartsCode: string - isRadeIn: string - applyQty: number - departmentCode: string - remark: string - siteId: string - available: string - deletionTime: Date - deleterId: byte[] - concurrencyStamp: number -} - -// 查询备件入库记录子列表 -export const getSparePartsInLocationDetailPage = async (params) => { - if (params.isSearch) { - delete params.isSearch - const data = {...params} - return await request.post({ url: '/eam/spare-parts-in-location-detail/senior', data }) - } else { - return await request.get({ url: `/eam/spare-parts-in-location-detail/page`, params }) - } -} - -// 查询备件入库记录子详情 -export const getSparePartsInLocationDetail = async (id: number) => { - return await request.get({ url: `/eam/spare-parts-in-location-detail/get?id=` + id }) -} - -// 新增备件入库记录子 -export const createSparePartsInLocationDetail = async (data: SparePartsInLocationDetailVO) => { - return await request.post({ url: `/eam/spare-parts-in-location-detail/create`, data }) -} - -// 修改备件入库记录子 -export const updateSparePartsInLocationDetail = async (data: SparePartsInLocationDetailVO) => { - return await request.put({ url: `/eam/spare-parts-in-location-detail/update`, data }) -} - -// 删除备件入库记录子 -export const deleteSparePartsInLocationDetail = async (id: number) => { - return await request.delete({ url: `/eam/spare-parts-in-location-detail/delete?id=` + id }) -} - -// 导出备件入库记录子 Excel -export const exportSparePartsInLocationDetail = async (params) => { - return await request.download({ url: `/eam/spare-parts-in-location-detail/export-excel`, params }) -} - -// 下载用户导入模板 -export const importTemplate = () => { - return request.download({ url: '/eam/spare-parts-in-location-detail/get-import-template' }) -} \ No newline at end of file diff --git a/src/api/eam/sparePartsInLocationMain/index.ts b/src/api/eam/sparePartsInLocationMain/index.ts deleted file mode 100644 index 2365b84e3..000000000 --- a/src/api/eam/sparePartsInLocationMain/index.ts +++ /dev/null @@ -1,87 +0,0 @@ -import request from '@/config/axios' - -export interface SparePartsInLocationMainVO { - id: number - number: string - theme: string - status: string - applyer: string - approver: number - approveContent: string - approveTime: Date - autoExamine: string - autoAgree: string - directCreateRecord: string - areaCode: string - locationCode: string - departmentCode: string - remark: string - siteId: string - available: string - deletionTime: Date - deleterId: byte[] - concurrencyStamp: number -} - -// 查询备件入库记录主列表 -export const getSparePartsInLocationMainPage = async (params) => { - if (params.isSearch) { - delete params.isSearch - const data = {...params} - return await request.post({ url: '/eam/spare-parts-in-location-main/senior', data }) - } else { - return await request.get({ url: `/eam/spare-parts-in-location-main/page`, params }) - } -} - -// 查询备件入库记录主详情 -export const getSparePartsInLocationMain = async (id: number) => { - return await request.get({ url: `/eam/spare-parts-in-location-main/get?id=` + id }) -} - -// 新增备件入库记录主 -export const createSparePartsInLocationMain = async (data: SparePartsInLocationMainVO) => { - return await request.post({ url: `/eam/spare-parts-in-location-main/create`, data }) -} - -// 修改备件入库记录主 -export const updateSparePartsInLocationMain = async (data: SparePartsInLocationMainVO) => { - return await request.put({ url: `/eam/spare-parts-in-location-main/update`, data }) -} - -// 删除备件入库记录主 -export const deleteSparePartsInLocationMain = async (id: number) => { - return await request.delete({ url: `/eam/spare-parts-in-location-main/delete?id=` + id }) -} - -// 导出备件入库记录主 Excel -export const exportSparePartsInLocationMain = async (params) => { - if (params.isSearch) { - const data = {...params} - return await request.downloadPost({ url: `/eam/spare-parts-in-location-main/export-excel-senior`, data }) - }else{ - return await request.download({ url: `/eam/spare-parts-in-location-main/export-excel`, params }) - } -} - -// 下载用户导入模板 -export const importTemplate = () => { - return request.download({ url: '/eam/spare-parts-in-location-main/get-import-template' }) -} - -// 撤回 -export const cancelSparePartsInLocation = async (id) => { - return await request.get({ url: `/eam/spare-parts-in-location-main/cancel?id=` + id }) -} -// 审核 -export const submitExamineSparePartsInLocation = async (id) => { - return await request.get({ url: `/eam/spare-parts-in-location-main/submitExamine?id=` + id }) -} -// 审核驳回 -export const rejectSparePartsInLocation = async (id) => { - return await request.get({ url: `/eam/spare-parts-in-location-main/reject?id=` + id }) -} -// 审核通过 -export const approveSparePartsInLocation = async (data) => { - return await request.post({ url: `/eam/spare-parts-in-location-main/approve`,data }) -} diff --git a/src/api/eam/sparePartsInLocationRecordDetail/index.ts b/src/api/eam/sparePartsInLocationRecordDetail/index.ts deleted file mode 100644 index 55c8eba4a..000000000 --- a/src/api/eam/sparePartsInLocationRecordDetail/index.ts +++ /dev/null @@ -1,58 +0,0 @@ -import request from '@/config/axios' - -export interface SparePartsInLocationDetailRecordVO { - id: number - number: string - masterId: number - sparePartsCode: string - isRadeIn: string - applyQty: number - departmentCode: string - remark: string - siteId: string - available: string - deletionTime: Date - deleterId: byte[] - concurrencyStamp: number -} - -// 查询备件入库记录子列表 -export const getSparePartsInLocationDetailRecordPage = async (params) => { - if (params.isSearch) { - delete params.isSearch - const data = {...params} - return await request.post({ url: '/eam/spare-parts-in-location-detail-record/senior', data }) - } else { - return await request.get({ url: `/eam/spare-parts-in-location-detail-record/page`, params }) - } -} - -// 查询备件入库记录子详情 -export const getSparePartsInLocationDetailRecord = async (id: number) => { - return await request.get({ url: `/eam/spare-parts-in-location-detail-record/get?id=` + id }) -} - -// 新增备件入库记录子 -export const createSparePartsInLocationDetailRecord = async (data: SparePartsInLocationDetailRecordVO) => { - return await request.post({ url: `/eam/spare-parts-in-location-detail-record/create`, data }) -} - -// 修改备件入库记录子 -export const updateSparePartsInLocationDetailRecord = async (data: SparePartsInLocationDetailRecordVO) => { - return await request.put({ url: `/eam/spare-parts-in-location-detail-record/update`, data }) -} - -// 删除备件入库记录子 -export const deleteSparePartsInLocationDetailRecord = async (id: number) => { - return await request.delete({ url: `/eam/spare-parts-in-location-detail-record/delete?id=` + id }) -} - -// 导出备件入库记录子 Excel -export const exportSparePartsInLocationDetailRecord = async (params) => { - return await request.download({ url: `/eam/spare-parts-in-location-detail-record/export-excel`, params }) -} - -// 下载用户导入模板 -export const importTemplate = () => { - return request.download({ url: '/eam/spare-parts-in-location-detail-record/get-import-template' }) -} \ No newline at end of file diff --git a/src/api/eam/sparePartsInLocationRecordMain/index.ts b/src/api/eam/sparePartsInLocationRecordMain/index.ts deleted file mode 100644 index 27ce7fb95..000000000 --- a/src/api/eam/sparePartsInLocationRecordMain/index.ts +++ /dev/null @@ -1,72 +0,0 @@ -import request from '@/config/axios' - -export interface SparePartsInLocationMainRecordVO { - id: number - number: string - theme: string - status: string - applyer: string - approver: number - approveContent: string - approveTime: Date - autoExamine: string - autoAgree: string - directCreateRecord: string - areaCode: string - locationCode: string - departmentCode: string - remark: string - siteId: string - available: string - deletionTime: Date - deleterId: byte[] - concurrencyStamp: number -} - -// 查询备件入库记录主列表 -export const getSparePartsInLocationMainRecordPage = async (params) => { - if (params.isSearch) { - delete params.isSearch - const data = { ...params } - return await request.post({ url: '/eam/spare-parts-in-location-main-record/senior', data }) - } else { - return await request.get({ url: `/eam/spare-parts-in-location-main-record/page`, params }) - } -} - -// 查询备件入库记录主详情 -export const getSparePartsInLocationMainRecord = async (id: number) => { - return await request.get({ url: `/eam/spare-parts-in-location-main-record/get?id=` + id }) -} - -// 新增备件入库记录主 -export const createSparePartsInLocationMainRecord = async ( - data: SparePartsInLocationMainRecordVO -) => { - return await request.post({ url: `/eam/spare-parts-in-location-main-record/create`, data }) -} - -// 修改备件入库记录主 -export const updateSparePartsInLocationMainRecord = async ( - data: SparePartsInLocationMainRecordVO -) => { - return await request.put({ url: `/eam/spare-parts-in-location-main-record/update`, data }) -} - -// 删除备件入库记录主 -export const deleteSparePartsInLocationMainRecord = async (id: number) => { - return await request.delete({ url: `/eam/spare-parts-in-location-main-record/delete?id=` + id }) -} - -// 导出备件入库记录主 Excel -export const exportSparePartsInLocationMainRecord = async (params) => { - return await request.download({ - url: `/eam/spare-parts-in-location-main-record/export-excel`, - params - }) -} - -// 下载用户导入模板 -export const importTemplate = () => { - return request.download({ url: '/eam/spare-parts-in-location-main-record/get-import-template' }) -} diff --git a/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js b/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js deleted file mode 100644 index 4e84a9429..000000000 --- a/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js +++ /dev/null @@ -1,54 +0,0 @@ -import request from '@/config/axios' - -// 创建领用出库记录子 -export function createSparePartsOutLocationRecordDetail(data) { - return request({ - url: '/eam/spare-parts-out-location-detail-record/create', - method: 'post', - data: data - }) -} - -// 更新领用出库记录子 -export function updateSparePartsOutLocationRecordDetail(data) { - return request({ - url: '/eam/spare-parts-out-location-detail-record/update', - method: 'put', - data: data - }) -} - -// 删除领用出库记录子 -export function deleteSparePartsOutLocationRecordDetail(id) { - return request({ - url: '/eam/spare-parts-out-location-detail-record/delete?id=' + id, - method: 'delete' - }) -} - -// 获得领用出库记录子 -export function getSparePartsOutLocationRecordDetail(id) { - return request({ - url: '/eam/spare-parts-out-location-detail-record/get?id=' + id, - method: 'get' - }) -} - -// 获得领用出库记录子分页 -export function getSparePartsOutLocationRecordDetailPage(query) { - return request({ - url: '/eam/spare-parts-out-location-detail-record/page', - method: 'get', - params: query - }) -} - -// 导出领用出库记录子 Excel -export function exportSparePartsOutLocationRecordDetailExcel(query) { - return request({ - url: '/eam/spare-parts-out-location-detail-record/export-excel', - method: 'get', - params: query, - responseType: 'blob' - }) -} diff --git a/src/api/eam/sparePartsOutLocationRecordMain/index.ts b/src/api/eam/sparePartsOutLocationRecordMain/index.ts deleted file mode 100644 index 4f075cce1..000000000 --- a/src/api/eam/sparePartsOutLocationRecordMain/index.ts +++ /dev/null @@ -1,71 +0,0 @@ -import request from '@/config/axios' - -export interface SparePartsOutLocationRecordMainVO { - id: number - number: string - theme: string - applyer: string - approver: number - approveContent: string - approveTime: Date - autoExamine: string - autoAgree: string - directCreateRecord: string - areaCode: string - locationCode: string - departmentCode: string - remark: string - siteId: string - available: string - deletionTime: Date - deleterId: byte[] - concurrencyStamp: number -} - -// 查询领用出库记录主列表 -export const getSparePartsOutLocationRecordMainPage = async (params) => { - if (params.isSearch) { - delete params.isSearch - const data = { ...params } - return await request.post({ url: '/eam/spare-parts-out-location-main-record/senior', data }) - } else { - return await request.get({ url: `/eam/spare-parts-out-location-main-record/page`, params }) - } -} - -// 查询领用出库记录主详情 -export const getSparePartsOutLocationRecordMain = async (id: number) => { - return await request.get({ url: `/eam/spare-parts-out-location-main-record/get?id=` + id }) -} - -// 新增领用出库记录主 -export const createSparePartsOutLocationRecordMain = async ( - data: SparePartsOutLocationRecordMainVO -) => { - return await request.post({ url: `/eam/spare-parts-out-location-main-record/create`, data }) -} - -// 修改领用出库记录主 -export const updateSparePartsOutLocationRecordMain = async ( - data: SparePartsOutLocationRecordMainVO -) => { - return await request.put({ url: `/eam/spare-parts-out-location-main-record/update`, data }) -} - -// 删除领用出库记录主 -export const deleteSparePartsOutLocationRecordMain = async (id: number) => { - return await request.delete({ url: `/eam/spare-parts-out-location-main-record/delete?id=` + id }) -} - -// 导出领用出库记录主 Excel -export const exportSparePartsOutLocationRecordMain = async (params) => { - return await request.download({ - url: `/eam/spare-parts-out-location-main-record/export-excel`, - params - }) -} - -// 下载用户导入模板 -export const importTemplate = () => { - return request.download({ url: '/eam/spare-parts-out-location-main-record/get-import-template' }) -} diff --git a/src/api/wms/agvLocationrelation/index.ts b/src/api/wms/agvLocationrelation/index.ts index 5422aac82..3bc7533f9 100644 --- a/src/api/wms/agvLocationrelation/index.ts +++ b/src/api/wms/agvLocationrelation/index.ts @@ -47,7 +47,7 @@ export const exportAgvLocationrelation = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/agv-locationrelation/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/agv-locationrelation/export-excel-senior', data }) } else { return await request.download({ url: `/wms/agv-locationrelation/export-excel`, params }) } @@ -56,4 +56,4 @@ export const exportAgvLocationrelation = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/agv-locationrelation/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/barbasic/index.ts b/src/api/wms/barbasic/index.ts index e5a23798d..0f7e161fd 100644 --- a/src/api/wms/barbasic/index.ts +++ b/src/api/wms/barbasic/index.ts @@ -47,10 +47,16 @@ export const deleteBarbasic = async (id: number) => { // 导出条码实体基类 Excel export const exportBarbasic = async (params) => { - return await request.download({ url: `/wms/barbasic/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.downloadPost({ url: '/wms/barbasic/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/barbasic/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/barbasic/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/barcode/index.ts b/src/api/wms/barcode/index.ts index 80739036c..38d00d6d6 100644 --- a/src/api/wms/barcode/index.ts +++ b/src/api/wms/barcode/index.ts @@ -50,10 +50,16 @@ export const deleteBarcode = async (id: number) => { // 导出条码片段 Excel export const exportBarcode = async (params) => { - return await request.download({ url: `/label/barcode/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.downloadPost({ url: '/label/barcode/export-excel-senior', data }) + } else { + return await request.download({ url: `/label/barcode/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/label/barcode/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/businesstype/index.ts b/src/api/wms/businesstype/index.ts index 09f9dddef..422a82802 100644 --- a/src/api/wms/businesstype/index.ts +++ b/src/api/wms/businesstype/index.ts @@ -62,4 +62,9 @@ export const exportBusinesstype = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/businesstype/get-import-template' }) -} \ No newline at end of file +} + +// 库存状态 +export const getBusinesstypeCode = async (businessCode: string) => { + return await request.get({ url: `/wms/businesstype/getBusinesstypeCode?businessCode=` + businessCode }) +} diff --git a/src/api/wms/callmaterials/index.ts b/src/api/wms/callmaterials/index.ts index 88f0f0cf6..198efd9cc 100644 --- a/src/api/wms/callmaterials/index.ts +++ b/src/api/wms/callmaterials/index.ts @@ -44,10 +44,16 @@ export const deleteCallmaterials = async (id: number) => { // 导出叫料标签 Excel export const exportCallmaterials = async (params) => { - return await request.download({ url: `/wms/callmaterials/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.downloadPost({ url: '/wms/callmaterials/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/callmaterials/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/callmaterials/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/countJobMain/index.ts b/src/api/wms/countJobMain/index.ts index c5f532bd9..6e2b5845b 100644 --- a/src/api/wms/countJobMain/index.ts +++ b/src/api/wms/countJobMain/index.ts @@ -91,6 +91,14 @@ export const importTemplate = () => { export const closeCountJobMain = (id: number) => { return request.put({ url: '/wms/count-job-main/close?id=' + id }) } +// 承接盘点任务主 +export const acceptCountJobMain = (id: number) => { + return request.put({ url: '/wms/count-job-main/accept?id=' + id }) +} +// 取消承接盘点任务主 +export const abandonCountJobMain = (id: number) => { + return request.put({ url: '/wms/count-job-main/abandon?id=' + id }) +} // 关闭盘点任务主 export const handleExportCountJob = async (id: number) => { diff --git a/src/api/wms/customersettleRecordMain/index.ts b/src/api/wms/customersettleRecordMain/index.ts index daaa33fce..ac7a40483 100644 --- a/src/api/wms/customersettleRecordMain/index.ts +++ b/src/api/wms/customersettleRecordMain/index.ts @@ -61,7 +61,7 @@ export const exportCustomersettleRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/customersettle-record-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/customersettle-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/customersettle-record-main/export-excel`, params }) } @@ -70,4 +70,4 @@ export const exportCustomersettleRecordMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/customersettle-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/deliverPlanMain/index.ts b/src/api/wms/deliverPlanMain/index.ts index 83363172a..47e96247a 100644 --- a/src/api/wms/deliverPlanMain/index.ts +++ b/src/api/wms/deliverPlanMain/index.ts @@ -51,9 +51,15 @@ export const deleteDeliverPlanMain = async (id: number) => { export const exportDeliverPlanMain = async (params) => { params.businessType = 'Deliver' if (params.isSearch) { + // const cmd = { + // 'column':'businessType', + // 'action':'==', + // 'value':'Deliver' + // } + // params.filters.push(cmd) delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/deliver-plan-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/deliver-plan-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/deliver-plan-main/export-excel`, params }) } @@ -63,9 +69,15 @@ export const exportDeliverPlanMain = async (params) => { export const exportZZBJDeliverPlanMain = async (params) => { params.businessType = 'ZZBJDeliver' if (params.isSearch) { + // const cmd = { + // 'column':'businessType', + // 'action':'==', + // 'value':'ZZBJDeliver' + // } + // params.filters.push(cmd) delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/deliver-plan-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/deliver-plan-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/deliver-plan-main/export-excel`, params }) } @@ -109,4 +121,4 @@ export const publish = (id) => { // 重置 export const resetting = (id) => { return request.put({ url: '/wms/deliver-plan-main/resetting?id=' + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/deliverRecordMain/index.ts b/src/api/wms/deliverRecordMain/index.ts index 405efa539..c7c01cb3f 100644 --- a/src/api/wms/deliverRecordMain/index.ts +++ b/src/api/wms/deliverRecordMain/index.ts @@ -70,7 +70,7 @@ export const exportDeliverRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/deliver-record-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/deliver-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/deliver-record-main/export-excel`, params }) } @@ -79,4 +79,4 @@ export const exportDeliverRecordMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/deliver-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/deliverRequestMain/index.ts b/src/api/wms/deliverRequestMain/index.ts index 714df74e3..621e9122d 100644 --- a/src/api/wms/deliverRequestMain/index.ts +++ b/src/api/wms/deliverRequestMain/index.ts @@ -69,7 +69,7 @@ export const exportDeliverRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/deliver-request-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/deliver-request-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/deliver-request-main/export-excel`, params }) } @@ -81,7 +81,7 @@ export const exportZZBJDeliverRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/deliver-request-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/deliver-request-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/deliver-request-main/export-excel`, params }) } @@ -119,4 +119,4 @@ export const agree = (id) => { // 处理 export const handle = (id) => { return request.put({ url: '/wms/deliver-request-main/handle?id=' + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/expectin/index.ts b/src/api/wms/expectin/index.ts index 2c4d72908..ab98fbc19 100644 --- a/src/api/wms/expectin/index.ts +++ b/src/api/wms/expectin/index.ts @@ -44,12 +44,22 @@ export const deleteExpectin = async (id: number) => { return await request.delete({ url: `/wms/expectin/delete?id=` + id }) } +// 批量删除预计出库存 +export const deleteExpectinIds = async (ids: string) => { + return await request.delete({ url: `/wms/expectin/deleteIds?ids=` + ids }) +} + // 导出预计入库存 Excel export const exportExpectin = async (params) => { - return await request.download({ url: `/wms/expectin/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/expectin/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/expectin/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/expectin/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/expectout/index.ts b/src/api/wms/expectout/index.ts index 0ebab0b96..64329d4d5 100644 --- a/src/api/wms/expectout/index.ts +++ b/src/api/wms/expectout/index.ts @@ -45,12 +45,22 @@ export const deleteExpectout = async (id: number) => { return await request.delete({ url: `/wms/expectout/delete?id=` + id }) } +// 批量删除预计出库存 +export const deleteExpectoutIds = async (ids: string) => { + return await request.delete({ url: `/wms/expectout/deleteIds?ids=` + ids }) +} + // 导出预计出库存 Excel export const exportExpectout = async (params) => { - return await request.download({ url: `/wms/expectout/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/expectout/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/expectout/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/expectout/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/inventorychangeRecordMain/index.ts b/src/api/wms/inventorychangeRecordMain/index.ts index afdc21151..dea0dc241 100644 --- a/src/api/wms/inventorychangeRecordMain/index.ts +++ b/src/api/wms/inventorychangeRecordMain/index.ts @@ -56,7 +56,7 @@ export const exportInventorychangeRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorychange-record-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorychange-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorychange-record-main/export-excel`, params }) } @@ -65,4 +65,4 @@ export const exportInventorychangeRecordMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/inventorychange-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/inventorychangeRequestMain/index.ts b/src/api/wms/inventorychangeRequestMain/index.ts index 0bfea72fc..4d531a3c5 100644 --- a/src/api/wms/inventorychangeRequestMain/index.ts +++ b/src/api/wms/inventorychangeRequestMain/index.ts @@ -55,7 +55,7 @@ export const exportInventorychangeRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorychange-request-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorychange-request-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorychange-request-main/export-excel`, params }) } @@ -94,4 +94,4 @@ export const agree = (id) => { // 处理 export const handle = (id) => { return request.put({ url: '/wms/inventorychange-request-main/handle?id=' + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/inventorymoveJobMain/index.ts b/src/api/wms/inventorymoveJobMain/index.ts index 83eb4f4e5..724b20757 100644 --- a/src/api/wms/inventorymoveJobMain/index.ts +++ b/src/api/wms/inventorymoveJobMain/index.ts @@ -78,7 +78,7 @@ export const exportInventorymoveJobMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params }) } @@ -90,7 +90,7 @@ export const exportOkToHoldJobMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params }) } @@ -102,7 +102,7 @@ export const exportHoldToOkJobMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params }) } @@ -114,7 +114,7 @@ export const exportHoldToScrapJobMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params }) } @@ -126,7 +126,7 @@ export const exportOkToScrapJobMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params }) } @@ -138,7 +138,7 @@ export const exportScrapToHoldJobMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params }) } @@ -166,4 +166,4 @@ export const closeInventorymoveMain = async (id) => { // 执行库存转移任务 export const executeInventorymoveMain = async (data) => { return await request.put({ url: `/wms/inventorymove-job-main/execute`, data}) -} \ No newline at end of file +} diff --git a/src/api/wms/inventorymoveRecordMain/index.ts b/src/api/wms/inventorymoveRecordMain/index.ts index 18bb292e3..885baae74 100644 --- a/src/api/wms/inventorymoveRecordMain/index.ts +++ b/src/api/wms/inventorymoveRecordMain/index.ts @@ -60,7 +60,14 @@ export const deleteInventorymoveRecordMain = async (id: number) => { // 导出库存转移记录主 Excel export const exportInventorymoveRecordMain = async (params) => { - return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params }) + params.businessType = 'Move' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.downloadPost({ url: '/wms/inventorymove-record-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params }) + } } // 导出合格转隔离记录主 Excel @@ -69,7 +76,7 @@ export const exportOkToHoldRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorymove-record-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorymove-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params }) } @@ -81,7 +88,7 @@ export const exportHoldToOkRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorymove-record-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorymove-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params }) } @@ -93,7 +100,7 @@ export const exportHoldToScrapRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorymove-record-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorymove-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params }) } @@ -105,7 +112,7 @@ export const exportOkToScrapRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorymove-record-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorymove-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params }) } @@ -117,7 +124,7 @@ export const exportScrapToHoldRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorymove-record-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorymove-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params }) } diff --git a/src/api/wms/inventorymoveRequestMain/index.ts b/src/api/wms/inventorymoveRequestMain/index.ts index 55e3537bc..68784d189 100644 --- a/src/api/wms/inventorymoveRequestMain/index.ts +++ b/src/api/wms/inventorymoveRequestMain/index.ts @@ -62,7 +62,7 @@ export const exportInventorymoveRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorymove-request-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorymove-request-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params }) } @@ -74,7 +74,7 @@ export const exportOkToHoldRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorymove-request-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorymove-request-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params }) } @@ -86,7 +86,7 @@ export const exportHoldToOkRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorymove-request-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorymove-request-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params }) } @@ -98,7 +98,7 @@ export const exportHoldToScrapRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorymove-request-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorymove-request-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params }) } @@ -110,7 +110,7 @@ export const exportOkToScrapRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorymove-request-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorymove-request-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params }) } @@ -122,7 +122,7 @@ export const exportScrapToHoldRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/inventorymove-request-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/inventorymove-request-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params }) } @@ -166,4 +166,4 @@ export const agree = (id) => { // 处理 export const handle = (id) => { return request.put({ url: '/wms/inventorymove-request-main/handle?id=' + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/issueJobMain/index.ts b/src/api/wms/issueJobMain/index.ts index d47210412..0ae3e11c7 100644 --- a/src/api/wms/issueJobMain/index.ts +++ b/src/api/wms/issueJobMain/index.ts @@ -89,17 +89,17 @@ export const importTemplate = () => { // 承接发料任务 export const acceptIssueMain = async (id) => { - return await request.get({ url: `/wms/issue-job-main/accept?id=` + id }) + return await request.put({ url: `/wms/issue-job-main/accept?id=` + id }) } // 放弃发料任务 export const abandonIssueMain = async (id) => { - return await request.get({ url: `/wms/issue-job-main/abandon?id=` + id }) + return await request.put({ url: `/wms/issue-job-main/abandon?id=` + id }) } // 关闭发料任务 export const closeIssueMain = async (id) => { - return await request.get({ url: `/wms/issue-job-main/close?id=` + id }) + return await request.put({ url: `/wms/issue-job-main/close?id=` + id }) } // 执行发料任务 diff --git a/src/api/wms/locationcapacity/index.ts b/src/api/wms/locationcapacity/index.ts index 40df8ca47..38d7039cb 100644 --- a/src/api/wms/locationcapacity/index.ts +++ b/src/api/wms/locationcapacity/index.ts @@ -42,10 +42,16 @@ export const deleteLocationcapacity = async (id: number) => { // 导出库位容量 Excel export const exportLocationcapacity = async (params) => { - return await request.download({ url: `/wms/locationcapacity/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.downloadPost({ url: '/wms/locationcapacity/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/locationcapacity/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/locationcapacity/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/mesBarCode/index.ts b/src/api/wms/mesBarCode/index.ts index ba37485d6..4d1e9b9c5 100644 --- a/src/api/wms/mesBarCode/index.ts +++ b/src/api/wms/mesBarCode/index.ts @@ -56,10 +56,16 @@ export const deleteMesBarCode = async (id: number) => { // 导出生产条码清单 Excel export const exportMesBarCode = async (params) => { - return await request.download({ url: `/wms/mes-bar-code/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.downloadPost({ url: '/wms/mes-bar-code/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/mes-bar-code/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/mes-bar-code/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts index 11531274d..571a67ab9 100644 --- a/src/api/wms/package/index.ts +++ b/src/api/wms/package/index.ts @@ -79,7 +79,7 @@ export const deletePackage = async (id: number) => { export const exportPackage = async (params) => { if (params.isSearch) { const data = {...params} - return await request.download({ url: `/wms/package/export-excel-senior`, data }) + return await request.downloadPost({ url: `/wms/package/export-excel-senior`, data }) } else { return await request.download({ url: `/wms/package/export-excel`, params }) } @@ -120,4 +120,4 @@ export const getBalanceToPackage = async (packingNumber: String) => { // 根据库存余额获取包装信息进行打印标签--批量打印 export const getBalanceToPackageSelection = async (data: any) => { return await request.post({ url: `/wms/balance/batchPrintLabel` ,data}) -} \ No newline at end of file +} diff --git a/src/api/wms/packageunit/index.ts b/src/api/wms/packageunit/index.ts index ae9b04f92..940fabef9 100644 --- a/src/api/wms/packageunit/index.ts +++ b/src/api/wms/packageunit/index.ts @@ -39,17 +39,17 @@ export const getPackageunit = async (id: number) => { return await request.get({ url: `/wms/packageunit/get?id=` + id }) } -// 新增物品包装规格信息 +// 新增物品包装规格信息 export const createPackageunit = async (data: PackageunitVO) => { return await request.post({ url: `/wms/packageunit/create`, data }) } -// 修改物品包装规格信息 +// 修改物品包装规格信息 export const updatePackageunit = async (data: PackageunitVO) => { return await request.put({ url: `/wms/packageunit/update`, data }) } -// 删除物品包装规格信息 +// 删除物品包装规格信息 export const deletePackageunit = async (id: number) => { return await request.delete({ url: `/wms/packageunit/delete?id=` + id }) } @@ -59,7 +59,7 @@ export const exportPackageunit = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/packageunit/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/packageunit/export-excel-senior', data }) } else { return await request.download({ url: `/wms/packageunit/export-excel`, params }) } @@ -68,4 +68,4 @@ export const exportPackageunit = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/packageunit/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/processproductionRecordMain/index.ts b/src/api/wms/processproductionRecordMain/index.ts index f2d6002ac..7470d2a58 100644 --- a/src/api/wms/processproductionRecordMain/index.ts +++ b/src/api/wms/processproductionRecordMain/index.ts @@ -48,10 +48,15 @@ export const deleteProcessproductionRecordMain = async (id: number) => { // 导出工序报产记录主 Excel export const exportProcessproductionRecordMain = async (params) => { - return await request.download({ url: `/wms/processproduction-record-main/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/processproduction-record-main/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/processproduction-record-main/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/processproduction-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/processproductionRequestMain/index.ts b/src/api/wms/processproductionRequestMain/index.ts index 4075041cb..8783aebdb 100644 --- a/src/api/wms/processproductionRequestMain/index.ts +++ b/src/api/wms/processproductionRequestMain/index.ts @@ -48,7 +48,12 @@ export const deleteProcessproductionRequestMain = async (id: number) => { // 导出工序报产申请主 Excel export const exportProcessproductionRequestMain = async (params) => { - return await request.download({ url: `/wms/processproduction-request-main/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/processproduction-request-main/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/processproduction-request-main/export-excel`, params }) + } } // 下载用户导入模板 @@ -84,4 +89,4 @@ export const agreeProcessproductionRequestMain = async (id) => { // 处理 export const handleProcessproductionRequestMain = async (id) => { return await request.put({ url: `/wms/processproduction-request-main/handle?id=` + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/productionreceiptJobMain/index.ts b/src/api/wms/productionreceiptJobMain/index.ts index 4096d39b7..34c3e07bf 100644 --- a/src/api/wms/productionreceiptJobMain/index.ts +++ b/src/api/wms/productionreceiptJobMain/index.ts @@ -89,17 +89,17 @@ export const importTemplate = () => { // 承接发料任务 export const acceptIssueMain = async (id) => { - return await request.get({ url: `/wms/productionreceipt-job-main/accept?id=` + id }) + return await request.put({ url: `/wms/productionreceipt-job-main/accept?id=` + id }) } // 放弃发料任务 export const abandonIssueMain = async (id) => { - return await request.get({ url: `/wms/productionreceipt-job-main/abandon?id=` + id }) + return await request.put({ url: `/wms/productionreceipt-job-main/abandon?id=` + id }) } // 关闭发料任务 export const closeIssueMain = async (id) => { - return await request.get({ url: `/wms/productionreceipt-job-main/close?id=` + id }) + return await request.put({ url: `/wms/productionreceipt-job-main/close?id=` + id }) } // 执行发料任务 diff --git a/src/api/wms/productionreceiptRecordMain/index.ts b/src/api/wms/productionreceiptRecordMain/index.ts index cd2002af1..c17a65c2b 100644 --- a/src/api/wms/productionreceiptRecordMain/index.ts +++ b/src/api/wms/productionreceiptRecordMain/index.ts @@ -61,10 +61,16 @@ export const deleteProductionreceiptRecordMain = async (id: number) => { // 导出生产收料记录主 Excel export const exportProductionreceiptRecordMain = async (params) => { - return await request.download({ url: `/wms/productionreceipt-record-main/export-excel`, params }) + if (params.isSearch){ + const data = {...params} + return await request.downloadPost({ url: `/wms/productionreceipt-record-main/export-excel-senior`, data }) + }else { + return await request.download({ url: `/wms/productionreceipt-record-main/export-excel`, params }) + } + } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productionreceipt-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/productionreturnRecordMain/index.ts b/src/api/wms/productionreturnRecordMain/index.ts index 328415e2c..9908d416e 100644 --- a/src/api/wms/productionreturnRecordMain/index.ts +++ b/src/api/wms/productionreturnRecordMain/index.ts @@ -60,10 +60,15 @@ export const deleteProductionreturnRecordMain = async (id: number) => { // 导出生产退料记录主 Excel export const exportProductionreturnRecordMain = async (params) => { - return await request.download({ url: `/wms/productionreturn-record-main/export-excel`, params }) + if (params.isSearch){ + const data = {...params} + return await request.downloadPost({ url: `/wms/productionreturn-record-main/export-excel-senior`, data }) + }else { + return await request.download({ url: `/wms/productionreturn-record-main/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productionreturn-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/productputawayJobDetail/index.ts b/src/api/wms/productputawayJobDetail/index.ts index b6008e1c0..70cb9fcb9 100644 --- a/src/api/wms/productputawayJobDetail/index.ts +++ b/src/api/wms/productputawayJobDetail/index.ts @@ -76,4 +76,4 @@ export const exportProductputawayJobDetail = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productputaway-job-detail/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/productputawayRecordDetail/index.ts b/src/api/wms/productputawayRecordDetail/index.ts index 008a7aa60..4464c5c7e 100644 --- a/src/api/wms/productputawayRecordDetail/index.ts +++ b/src/api/wms/productputawayRecordDetail/index.ts @@ -38,6 +38,12 @@ export interface ProductputawayRecordDetailVO { export const getProductputawayRecordDetailPage = async (params) => { params.type = 'predict' if (params.isSearch) { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'predict' + } + params.filters.push(cmd) delete params.isSearch const data = {...params} return await request.post({ url: '/wms/productputaway-record-detail/senior', data }) @@ -50,6 +56,12 @@ export const getProductputawayRecordDetailPage = async (params) => { export const getProductputawayRecordDetailPageAssemble = async (params) => {   params.type = 'assemble' if (params.isSearch) { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'assemble' + } + params.filters.push(cmd) delete params.isSearch const data = {...params} return await request.post({ url: '/wms/productputaway-record-detail/senior', data }) @@ -85,4 +97,4 @@ export const exportProductputawayRecordDetail = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productputaway-record-detail/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/productputawayRecordMain/index.ts b/src/api/wms/productputawayRecordMain/index.ts index 716646115..897de3153 100644 --- a/src/api/wms/productputawayRecordMain/index.ts +++ b/src/api/wms/productputawayRecordMain/index.ts @@ -78,7 +78,7 @@ export const exportProductputawayRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/productputaway-record-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/productputaway-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params }) } @@ -90,7 +90,7 @@ export const exportProductputawayRecordMainAssemble = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/productputaway-record-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/productputaway-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params }) } @@ -99,4 +99,4 @@ export const exportProductputawayRecordMainAssemble = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productputaway-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/productputawayRequestMain/index.ts b/src/api/wms/productputawayRequestMain/index.ts index 6696beea6..78b21d945 100644 --- a/src/api/wms/productputawayRequestMain/index.ts +++ b/src/api/wms/productputawayRequestMain/index.ts @@ -74,6 +74,12 @@ export const deleteProductputawayRequestMain = async (id: number) => { export const exportProductputawayRequestMain = async (params) => { params.type = 'predict' if (params.isSearch) { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'predict' + } + params.filters.push(cmd) const data = {...params} return await request.downloadPost({ url: `/wms/productputaway-request-main/export-excel-senior`, data }) } else { @@ -85,6 +91,12 @@ export const exportProductputawayRequestMain = async (params) => { export const exportProductputawayRequestMainAssemble = async (params) => { params.type = 'assemble' if (params.isSearch) { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'assemble' + } + params.filters.push(cmd) const data = {...params} return await request.downloadPost({ url: `/wms/productputaway-request-main/export-excel-senior`, data }) } else { @@ -126,4 +138,4 @@ export const agree = (id) => { // 处理 export const handle = (id) => { return request.put({ url: '/wms/productputaway-request-main/handle?id=' + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/productreceiptJobMain/index.ts b/src/api/wms/productreceiptJobMain/index.ts index 8f06b62f8..3464939cc 100644 --- a/src/api/wms/productreceiptJobMain/index.ts +++ b/src/api/wms/productreceiptJobMain/index.ts @@ -103,6 +103,12 @@ export const deleteProductreceiptJobMain = async (id: number) => { export const exportProductreceiptJobMain = async (params) => { params.type = 'predict' if (params.isSearch) { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'predict' + } + params.filters.push(cmd) const data = {...params} return await request.downloadPost({ url: `/wms/productreceipt-job-main/export-excel-senior`, data }) } else { @@ -145,4 +151,4 @@ export const closeProductreceiptMain = async (id) => { // 执行发料任务 export const executeProductreceiptMain = async (data) => { return await request.put({ url: `/wms/productreceipt-job-main/execute`, data}) -} \ No newline at end of file +} diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts index 102bef055..074f47423 100644 --- a/src/api/wms/productreceiptRecordMain/index.ts +++ b/src/api/wms/productreceiptRecordMain/index.ts @@ -87,6 +87,12 @@ export const deleteProductreceiptRecordMain = async (id: number) => { export const exportProductreceiptRecordMain = async (params) => { params.type = 'predict' if (params.isSearch) { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'predict' + } + params.filters.push(cmd) delete params.isSearch const data = {...params} return await request.post({ url: '/wms/productreceipt-record-main/export-excel-senior', data }) @@ -119,4 +125,4 @@ export const createPutawayRequest = async (number:string) => { // 创建检验申请 export const createInspectRequest = async (number:string) => { return await request.post({ url: `/wms/productreceipt-record-main/createInspectRequest?number=`+number }) -} \ No newline at end of file +} diff --git a/src/api/wms/productredressJobMain/index.ts b/src/api/wms/productredressJobMain/index.ts index 40311c5c8..bbbddcbd9 100644 --- a/src/api/wms/productredressJobMain/index.ts +++ b/src/api/wms/productredressJobMain/index.ts @@ -75,6 +75,18 @@ export const updateProductredressJobMain = async (data: ProductredressJobMainVO) export const deleteProductredressJobMain = async (id: number) => { return await request.delete({ url: `/wms/productredress-job-main/delete?id=` + id }) } +// 承接制品回收任务主 +export const acceptProductredressJobMain = async (id: number) => { + return await request.put({ url: `/wms/productredress-job-main/accept?id=` + id }) +} +// 关闭制品回收任务主 +export const closeProductredressJobMain = async (id: number) => { + return await request.put({ url: `/wms/productredress-job-main/close?id=` + id }) +} +// 取消承接制品回收任务主 +export const abandonProductredressJobMain = async (id: number) => { + return await request.put({ url: `/wms/productredress-job-main/abandon?id=` + id }) +} // 导出制品回收任务主 Excel export const exportProductredressJobMain = async (params) => { diff --git a/src/api/wms/productredressRecordMain/index.ts b/src/api/wms/productredressRecordMain/index.ts index e935de9c9..076155908 100644 --- a/src/api/wms/productredressRecordMain/index.ts +++ b/src/api/wms/productredressRecordMain/index.ts @@ -61,10 +61,15 @@ export const deleteProductredressRecordMain = async (id: number) => { // 导出制品回收记录主 Excel export const exportProductredressRecordMain = async (params) => { - return await request.download({ url: `/wms/productredress-record-main/export-excel`, params }) + if (params.isSearch){ + const data = {...params} + return await request.downloadPost({ url: `/wms/productredress-record-main/export-excel-senior`, data }) + }else { + return await request.download({ url: `/wms/productredress-record-main/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productredress-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/productredressRequestMain/index.ts b/src/api/wms/productredressRequestMain/index.ts index 933a72def..d5402d7e2 100644 --- a/src/api/wms/productredressRequestMain/index.ts +++ b/src/api/wms/productredressRequestMain/index.ts @@ -60,7 +60,12 @@ export const deleteProductredressRequestMain = async (id: number) => { // 导出制品回收申请主 Excel export const exportProductredressRequestMain = async (params) => { - return await request.download({ url: `/wms/productredress-request-main/export-excel`, params }) + if (params.isSearch){ + const data = {...params} + return await request.downloadPost({ url: `/wms/productredress-request-main/export-excel-senior`, data }) + }else { + return await request.download({ url: `/wms/productredress-request-main/export-excel`, params }) + } } // 下载用户导入模板 @@ -97,4 +102,4 @@ export const agree = (id) => { // 处理 export const handle = (id) => { return request.put({ url: '/wms/productredress-request-main/handle?id=' + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/productrepairRecordMain/index.ts b/src/api/wms/productrepairRecordMain/index.ts index 3469be295..ecdfc4754 100644 --- a/src/api/wms/productrepairRecordMain/index.ts +++ b/src/api/wms/productrepairRecordMain/index.ts @@ -61,7 +61,7 @@ export const exportProductrepairRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/productrepair-record-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/productrepair-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/productrepair-record-main/export-excel`, params }) } @@ -70,4 +70,4 @@ export const exportProductrepairRecordMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productrepair-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/productrepairRequestMain/index.ts b/src/api/wms/productrepairRequestMain/index.ts index 0a5fb8315..87ff80cd3 100644 --- a/src/api/wms/productrepairRequestMain/index.ts +++ b/src/api/wms/productrepairRequestMain/index.ts @@ -57,7 +57,13 @@ export const deleteProductrepairRequestMain = async (id: number) => { // 导出制品返修申请主 Excel export const exportProductrepairRequestMain = async (params) => { - return await request.download({ url: `/wms/productrepair-request-main/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.downloadPost({ url: '/wms/productrepair-request-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/productrepair-request-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/wms/productscrapRequestMain/index.ts b/src/api/wms/productscrapRequestMain/index.ts index dfed6c9f7..6d49382bf 100644 --- a/src/api/wms/productscrapRequestMain/index.ts +++ b/src/api/wms/productscrapRequestMain/index.ts @@ -57,7 +57,7 @@ export const exportProductscrapRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/productscrap-request-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/productscrap-request-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/productscrap-request-main/export-excel`, params }) } diff --git a/src/api/wms/purchaseclaimRequestMain/index.ts b/src/api/wms/purchaseclaimRequestMain/index.ts index 392f87385..b17dfb970 100644 --- a/src/api/wms/purchaseclaimRequestMain/index.ts +++ b/src/api/wms/purchaseclaimRequestMain/index.ts @@ -77,7 +77,13 @@ export const genRecordsPurchaseclaimRequestMain = async (id) => { } // 导出采购索赔申请主 Excel export const exportPurchaseclaimRequestMain = async (params) => { - return await request.download({ url: `/wms/purchaseclaim-request-main/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.downloadPost({ url: `/wms/purchaseclaim-request-main/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/purchaseclaim-request-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/wms/purchasereturnJobMain/index.ts b/src/api/wms/purchasereturnJobMain/index.ts index 6b43ab046..d452888a3 100644 --- a/src/api/wms/purchasereturnJobMain/index.ts +++ b/src/api/wms/purchasereturnJobMain/index.ts @@ -98,3 +98,11 @@ export const importTemplate = () => { export const closePurchasereturnJobMain = (id: number) => { return request.put({ url: '/wms/purchasereturn-job-main/close?id=' + id }) } +// 承接采购退货任务主 +export const acceptPurchasereturnJobMain = (id: number) => { + return request.put({ url: '/wms/purchasereturn-job-main/accept?id=' + id }) +} +// 取消承接采购退货任务主 +export const abandonPurchasereturnJobMain = (id: number) => { + return request.put({ url: '/wms/purchasereturn-job-main/abandon?id=' + id }) +} diff --git a/src/api/wms/putawayJobMain/index.ts b/src/api/wms/putawayJobMain/index.ts index 88959b43f..b6fb266d8 100644 --- a/src/api/wms/putawayJobMain/index.ts +++ b/src/api/wms/putawayJobMain/index.ts @@ -91,3 +91,13 @@ export const importTemplate = () => { export const closePutawayJobMain = (id: number) => { return request.put({ url: '/wms/putaway-job-main/close?id=' + id }) } + +// 承接上架任务主 +export const acceptPutawayJobMain = (id: number) => { + return request.put({ url: '/wms/putaway-job-main/accept?id=' + id }) +} + +// 取消承接上架任务主 +export const abandonPutawayJobMain = (id: number) => { + return request.put({ url: '/wms/putaway-job-main/abandon?id=' + id }) +} diff --git a/src/api/wms/qadProject/index.ts b/src/api/wms/qadProject/index.ts index ce9cd6e8e..1cf09d892 100644 --- a/src/api/wms/qadProject/index.ts +++ b/src/api/wms/qadProject/index.ts @@ -56,4 +56,9 @@ export const exportQadProject = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/qad-project/get-import-template' }) -} \ No newline at end of file +} + +export const getProjectType = async () => { + return await request.get({ url: `/wms/qad-costcentre/queryCostcentreType` }) +} + diff --git a/src/api/wms/qadproductionplan/index.ts b/src/api/wms/qadproductionplan/index.ts index 5eda9dfeb..a54e226ae 100644 --- a/src/api/wms/qadproductionplan/index.ts +++ b/src/api/wms/qadproductionplan/index.ts @@ -60,7 +60,12 @@ export const deleteQadProductionPlanMain = async (id: number) => { // 导出QAD生产计划主 Excel export const exportQadProductionPlanMain = async (params) => { - return await request.download({ url: `/wms/qad-production-plan-main/export-excel`, params }) + if (params.isSearch){ + const data = {...params} + return await request.downloadPost({ url: `/wms/qad-production-plan-main/export-excel-senior`, data }) + }else { + return await request.download({ url: `/wms/qad-production-plan-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/wms/repleinshRecordMain/index.ts b/src/api/wms/repleinshRecordMain/index.ts index 654f84618..f9b00a155 100644 --- a/src/api/wms/repleinshRecordMain/index.ts +++ b/src/api/wms/repleinshRecordMain/index.ts @@ -59,10 +59,15 @@ export const deleteRepleinshRecordMain = async (id: number) => { // 导出补料记录主 Excel export const exportRepleinshRecordMain = async (params) => { - return await request.download({ url: `/wms/repleinsh-record-main/export-excel`, params }) + if (params.isSearch){ + const data = {...params} + return await request.downloadPost({ url: `/wms/repleinsh-record-main/export-excel-senior`, data }) + }else { + return await request.download({ url: `/wms/repleinsh-record-main/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/repleinsh-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/saleMain/index.ts b/src/api/wms/saleMain/index.ts index 75b3ca168..0fd80a7b2 100644 --- a/src/api/wms/saleMain/index.ts +++ b/src/api/wms/saleMain/index.ts @@ -54,10 +54,16 @@ export const deleteSaleMain = async (id: number) => { // 导出销售订单主 Excel export const exportSaleMain = async (params) => { - return await request.download({ url: `/wms/sale-main/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.downloadPost({ url: '/wms/sale-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/sale-main/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/sale-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/saleShipmentDetail/index.ts b/src/api/wms/saleShipmentDetail/index.ts index 88f1b443f..5fd25f2ef 100644 --- a/src/api/wms/saleShipmentDetail/index.ts +++ b/src/api/wms/saleShipmentDetail/index.ts @@ -23,7 +23,7 @@ export interface SaleShipmentDetailVO { siteId: number } -// 查询销售发运申请子列表 +// 查询结算出库申请子列表 export const getSaleShipmentDetailPage = async (params) => { if (params.isSearch) { delete params.isSearch @@ -34,27 +34,27 @@ export const getSaleShipmentDetailPage = async (params) => { } } -// 查询销售发运申请子详情 +// 查询结算出库申请子详情 export const getSaleShipmentDetail = async (id: number) => { return await request.get({ url: `/wms/sale-shipment-detail-request/get?id=` + id }) } -// 新增销售发运申请子 +// 新增结算出库申请子 export const createSaleShipmentDetail = async (data: SaleShipmentDetailVO) => { return await request.post({ url: `/wms/sale-shipment-detail-request/create`, data }) } -// 修改销售发运申请子 +// 修改结算出库申请子 export const updateSaleShipmentDetail = async (data: SaleShipmentDetailVO) => { return await request.put({ url: `/wms/sale-shipment-detail-request/update`, data }) } -// 删除销售发运申请子 +// 删除结算出库申请子 export const deleteSaleShipmentDetail = async (id: number) => { return await request.delete({ url: `/wms/sale-shipment-detail-request/delete?id=` + id }) } -// 导出销售发运申请子 Excel +// 导出结算出库申请子 Excel export const exportSaleShipmentDetail = async (params) => { return await request.download({ url: `/wms/sale-shipment-detail-request/export-excel`, params }) } diff --git a/src/api/wms/saleShipmentDetailRecord/index.ts b/src/api/wms/saleShipmentDetailRecord/index.ts index 4f22239d0..a87f477a7 100644 --- a/src/api/wms/saleShipmentDetailRecord/index.ts +++ b/src/api/wms/saleShipmentDetailRecord/index.ts @@ -23,7 +23,7 @@ export interface SaleShipmentDetailRecordVO { siteId: number } -// 查询销售发运记录子列表 +// 查询结算出库记录子列表 export const getSaleShipmentDetailRecordPage = async (params) => { if (params.isSearch) { delete params.isSearch @@ -34,27 +34,27 @@ export const getSaleShipmentDetailRecordPage = async (params) => { } } -// 查询销售发运记录子详情 +// 查询结算出库记录子详情 export const getSaleShipmentDetailRecord = async (id: number) => { return await request.get({ url: `/wms/sale-shipment-detail-record/get?id=` + id }) } -// 新增销售发运记录子 +// 新增结算出库记录子 export const createSaleShipmentDetailRecord = async (data: SaleShipmentDetailRecordVO) => { return await request.post({ url: `/wms/sale-shipment-detail-record/create`, data }) } -// 修改销售发运记录子 +// 修改结算出库记录子 export const updateSaleShipmentDetailRecord = async (data: SaleShipmentDetailRecordVO) => { return await request.put({ url: `/wms/sale-shipment-detail-record/update`, data }) } -// 删除销售发运记录子 +// 删除结算出库记录子 export const deleteSaleShipmentDetailRecord = async (id: number) => { return await request.delete({ url: `/wms/sale-shipment-detail-record/delete?id=` + id }) } -// 导出销售发运记录子 Excel +// 导出结算出库记录子 Excel export const exportSaleShipmentDetailRecord = async (params) => { return await request.download({ url: `/wms/sale-shipment-detail-record/export-excel`, params }) } diff --git a/src/api/wms/saleShipmentMain/index.ts b/src/api/wms/saleShipmentMain/index.ts index c2b08c819..a3e3c94eb 100644 --- a/src/api/wms/saleShipmentMain/index.ts +++ b/src/api/wms/saleShipmentMain/index.ts @@ -22,7 +22,7 @@ export interface SaleShipmentMainVO { serialNumber: string } -// 查询销售发运申请主列表 +// 查询结算出库申请主列表 export const getSaleShipmentMainPage = async (params) => { if (params.isSearch) { delete params.isSearch @@ -33,29 +33,35 @@ export const getSaleShipmentMainPage = async (params) => { } } -// 查询销售发运申请主详情 +// 查询结算出库申请主详情 export const getSaleShipmentMain = async (id: number) => { return await request.get({ url: `/wms/sale-shipment-main-request/get?id=` + id }) } -// 新增销售发运申请主 +// 新增结算出库申请主 export const createSaleShipmentMain = async (data: SaleShipmentMainVO) => { return await request.post({ url: `/wms/sale-shipment-main-request/create`, data }) } -// 修改销售发运申请主 +// 修改结算出库申请主 export const updateSaleShipmentMain = async (data: SaleShipmentMainVO) => { return await request.put({ url: `/wms/sale-shipment-main-request/update`, data }) } -// 删除销售发运申请主 +// 删除结算出库申请主 export const deleteSaleShipmentMain = async (id: number) => { return await request.delete({ url: `/wms/sale-shipment-main-request/delete?id=` + id }) } -// 导出销售发运申请主 Excel +// 导出结算出库申请主 Excel export const exportSaleShipmentMain = async (params) => { - return await request.download({ url: `/wms/sale-shipment-main-request/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.downloadPost({ url: '/wms/sale-shipment-main-request/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/sale-shipment-main-request/export-excel`, params }) + } } // 下载用户导入模板 @@ -63,32 +69,32 @@ export const importTemplate = () => { return request.download({ url: '/wms/sale-shipment-main-request/get-import-template' }) } -// 关闭-销售发运申请 +// 关闭-结算出库申请 export const close = async (id) => { return await request.put({ url: `/wms/sale-shipment-main-request/close?id=` + id }) } -// 重新添加-销售发运申请 +// 重新添加-结算出库申请 export const reAdd = async (id) => { return await request.put({ url: `/wms/sale-shipment-main-request/reAdd?id=` + id }) } -// 提交审批-销售发运申请 +// 提交审批-结算出库申请 export const submit = async (id) => { return await request.put({ url: `/wms/sale-shipment-main-request/submit?id=` + id }) } -// 审批驳回-销售发运申请 +// 审批驳回-结算出库申请 export const refused = async (id) => { return await request.put({ url: `/wms/sale-shipment-main-request/refused?id=` + id }) } -// 审批通过-销售发运申请 +// 审批通过-结算出库申请 export const agree = async (id) => { return await request.put({ url: `/wms/sale-shipment-main-request/agree?id=` + id }) } -// 处理-销售发运申请 +// 处理-结算出库申请 export const handle = async (id) => { return await request.put({ url: `/wms/sale-shipment-main-request/handle?id=` + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/saleShipmentMainRecord/index.ts b/src/api/wms/saleShipmentMainRecord/index.ts index 60a87d971..d21937a41 100644 --- a/src/api/wms/saleShipmentMainRecord/index.ts +++ b/src/api/wms/saleShipmentMainRecord/index.ts @@ -14,7 +14,7 @@ export interface SaleShipmentMainRecordVO { siteId: string } -// 查询销售发运记录主列表 +// 查询结算出库记录主列表 export const getSaleShipmentMainRecordPage = async (params) => { if (params.isSearch) { delete params.isSearch @@ -25,32 +25,38 @@ export const getSaleShipmentMainRecordPage = async (params) => { } } -// 查询销售发运记录主详情 +// 查询结算出库记录主详情 export const getSaleShipmentMainRecord = async (id: number) => { return await request.get({ url: `/wms/sale-shipment-main-record/get?id=` + id }) } -// 新增销售发运记录主 +// 新增结算出库记录主 export const createSaleShipmentMainRecord = async (data: SaleShipmentMainRecordVO) => { return await request.post({ url: `/wms/sale-shipment-main-record/create`, data }) } -// 修改销售发运记录主 +// 修改结算出库记录主 export const updateSaleShipmentMainRecord = async (data: SaleShipmentMainRecordVO) => { return await request.put({ url: `/wms/sale-shipment-main-record/update`, data }) } -// 删除销售发运记录主 +// 删除结算出库记录主 export const deleteSaleShipmentMainRecord = async (id: number) => { return await request.delete({ url: `/wms/sale-shipment-main-record/delete?id=` + id }) } -// 导出销售发运记录主 Excel +// 导出结算出库记录主 Excel export const exportSaleShipmentMainRecord = async (params) => { - return await request.download({ url: `/wms/sale-shipment-main-record/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.downloadPost({ url: '/wms/sale-shipment-main-record/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/sale-shipment-main-record/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/sale-shipment-main-record/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/scrapJobMain/index.ts b/src/api/wms/scrapJobMain/index.ts index e4b0dfa1e..e2cc48093 100644 --- a/src/api/wms/scrapJobMain/index.ts +++ b/src/api/wms/scrapJobMain/index.ts @@ -67,6 +67,18 @@ export const updateScrapJobMain = async (data: ScrapJobMainVO) => { export const deleteScrapJobMain = async (id: number) => { return await request.delete({ url: `/wms/scrap-job-main/delete?id=` + id }) } +// 承接报废出库任务主 +export const acceptScrapJobMain = async (id: number) => { + return await request.put({ url: `/wms/scrap-job-main/accept?id=` + id }) +} +// 取消承接报废出库任务主 +export const abandonScrapJobMain = async (id: number) => { + return await request.put({ url: `/wms/scrap-job-main/abandon?id=` + id }) +} +// 关闭报废出库任务主 +export const closeScrapJobMain = async (id: number) => { + return await request.put({ url: `/wms/scrap-job-main/close?id=` + id }) +} // 导出报废出库任务主 Excel export const exportScrapJobMain = async (params) => { diff --git a/src/api/wms/supplierdeliverRequestMain/index.ts b/src/api/wms/supplierdeliverRequestMain/index.ts index b85ae51c6..57e8b703f 100644 --- a/src/api/wms/supplierdeliverRequestMain/index.ts +++ b/src/api/wms/supplierdeliverRequestMain/index.ts @@ -121,3 +121,7 @@ export const importTemplate = () => { return request.download({ url: '/wms/supplierdeliver-request-main/get-import-template' }) } +// 删除之前的包装和标签 +export const deleteOldLabels = async (id) => { + return await request.post({ url: `/wms/supplierdeliver-request-main/deleteOldLabels?id=` + id }) +} \ No newline at end of file diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts index 9dd8e60e8..ec37ab88c 100644 --- a/src/api/wms/supplierinvoiceRequestMain/index.ts +++ b/src/api/wms/supplierinvoiceRequestMain/index.ts @@ -141,3 +141,9 @@ export const queryUserInfoByRoleCode = async (params) => { return await request.get({ url: `/wms/supplierinvoice-request-main/queryUserInfoByRoleCodePage`, params }) } +// 获取供应商角色 +export const getLoginUserRoleList = async () => { + return await request.get({ url: `/wms/supplierinvoice-request-main/getLoginUserRoleList`}) + +} + diff --git a/src/api/wms/transaction/index.ts b/src/api/wms/transaction/index.ts index 98b4a8aea..1581755c6 100644 --- a/src/api/wms/transaction/index.ts +++ b/src/api/wms/transaction/index.ts @@ -65,7 +65,7 @@ export const exportTransaction = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/transaction/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/transaction/export-excel-senior', data }) } else { return await request.download({ url: `/wms/transaction/export-excel`, params }) } @@ -74,4 +74,4 @@ export const exportTransaction = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/transaction/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/transferissueJobMain/index.ts b/src/api/wms/transferissueJobMain/index.ts index b24c424ab..56464584d 100644 --- a/src/api/wms/transferissueJobMain/index.ts +++ b/src/api/wms/transferissueJobMain/index.ts @@ -93,15 +93,15 @@ export const importTemplate = () => { // 关闭-调拨出库任务主 export const closeTransferissueJobMain = (id: number) => { - return request.download({ url: '/wms/transferissue-job-main/close?id=' + id }) + return request.put({ url: '/wms/transferissue-job-main/close?id=' + id }) } // 承接-调拨出库任务主 export const acceptTransferissueJobMain = (id: number) => { - return request.download({ url: '/wms/transferissue-job-main/accept?id=' + id }) + return request.put({ url: '/wms/transferissue-job-main/accept?id=' + id }) } // 放弃-调拨出库任务主 export const abandonTransferissueJobMain = (id: number) => { - return request.download({ url: '/wms/transferissue-job-main/abandon?id=' + id }) + return request.put({ url: '/wms/transferissue-job-main/abandon?id=' + id }) } diff --git a/src/api/wms/transferlog/index.ts b/src/api/wms/transferlog/index.ts index f24fc1e3b..8d13c84e9 100644 --- a/src/api/wms/transferlog/index.ts +++ b/src/api/wms/transferlog/index.ts @@ -74,7 +74,7 @@ export const exportTransferlog = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/transferlog/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/transferlog/export-excel-senior', data }) } else { return await request.download({ url: `/wms/transferlog/export-excel`, params }) } @@ -83,4 +83,4 @@ export const exportTransferlog = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/transferlog/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/transferreceiptJobMain/index.ts b/src/api/wms/transferreceiptJobMain/index.ts index ab8fe4e41..a86aa1f99 100644 --- a/src/api/wms/transferreceiptJobMain/index.ts +++ b/src/api/wms/transferreceiptJobMain/index.ts @@ -73,6 +73,18 @@ export const updateTransferreceiptJobMain = async (data: TransferreceiptJobMainV export const deleteTransferreceiptJobMain = async (id: number) => { return await request.delete({ url: `/wms/transferreceipt-job-main/delete?id=` + id }) } +// 承接调拨入库任务主 +export const acceptTransferreceiptJobMain = async (id: number) => { + return await request.put({ url: `/wms/transferreceipt-job-main/accept?id=` + id }) +} +// 取消承接调拨入库任务主 +export const abandonTransferreceiptJobMain = async (id: number) => { + return await request.put({ url: `/wms/transferreceipt-job-main/abandon?id=` + id }) +} +// 关闭调拨入库任务主 +export const closeTransferreceiptJobMain = async (id: number) => { + return await request.put({ url: `/wms/transferreceipt-job-main/close?id=` + id }) +} // 导出调拨入库任务主 Excel export const exportTransferreceiptJobMain = async (params) => { diff --git a/src/api/wms/unplannedissueJobMain/index.ts b/src/api/wms/unplannedissueJobMain/index.ts index 5a230b649..041520357 100644 --- a/src/api/wms/unplannedissueJobMain/index.ts +++ b/src/api/wms/unplannedissueJobMain/index.ts @@ -67,6 +67,18 @@ export const updateUnplannedissueJobMain = async (data: UnplannedissueJobMainVO) export const deleteUnplannedissueJobMain = async (id: number) => { return await request.delete({ url: `/wms/unplannedissue-job-main/delete?id=` + id }) } +// 承接计划外出库任务主 +export const acceptUnplannedissueJobMain = async (id: number) => { + return await request.put({ url: `/wms/unplannedissue-job-main/accept?id=` + id }) +} +// 取消承接计划外出库任务主 +export const abandonUnplannedissueJobMain = async (id: number) => { + return await request.put({ url: `/wms/unplannedissue-job-main/abandon?id=` + id }) +} +// 关闭计划外出库任务主 +export const closeUnplannedissueJobMain = async (id: number) => { + return await request.put({ url: `/wms/unplannedissue-job-main/close?id=` + id }) +} // 导出计划外出库任务主 Excel export const exportUnplannedissueJobMain = async (params) => { diff --git a/src/api/wms/unplannedreceiptJobMain/index.ts b/src/api/wms/unplannedreceiptJobMain/index.ts index 0868c7db4..fd2c91743 100644 --- a/src/api/wms/unplannedreceiptJobMain/index.ts +++ b/src/api/wms/unplannedreceiptJobMain/index.ts @@ -68,6 +68,19 @@ export const deleteUnplannedreceiptJobMain = async (id: number) => { return await request.delete({ url: `/wms/unplannedreceipt-job-main/delete?id=` + id }) } +// 承接计划外入库任务主 +export const acceptUnplannedreceiptJobMain = async (id: number) => { + return await request.put({ url: `/wms/unplannedreceipt-job-main/accept?id=` + id }) +} +// 取消承接计划外入库任务主 +export const abandonUnplannedreceiptJobMain = async (id: number) => { + return await request.put({ url: `/wms/unplannedreceipt-job-main/abandon?id=` + id }) +} +// 关闭计划外入库任务主 +export const closeUnplannedreceiptJobMain = async (id: number) => { + return await request.put({ url: `/wms/unplannedreceipt-job-main/close?id=` + id }) +} + // 导出计划外入库任务主 Excel export const exportUnplannedreceiptJobMain = async (params) => { if (params.isSearch) { diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue index 1a1b128a6..2c7f75bfe 100644 --- a/src/components/Annex/src/Annex.vue +++ b/src/components/Annex/src/Annex.vue @@ -33,6 +33,7 @@ import PreviewPDF from '@/components/PreviewPDF/index.vue' import UploadFile from '@/components/UploadFile/src/UploadFile.vue' import { formatDate } from '@/utils/formatTime' import * as FileApi from '@/api/wms/file' +import { getBaseUrl } from '@/utils/systemParam' const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 defineComponent({ @@ -91,7 +92,7 @@ const deleteAnnex = async (id) => { emit('deleteAnnexSuccess') } const downFile = (item)=>{ - window.open(import.meta.env.VITE_BASE_URL + '/admin-api/infra/file/0/get/' + item.path) + window.open(getBaseUrl() + '/admin-api/infra/file/0/get/' + item.path) } const previewRef = ref>() diff --git a/src/components/Annex/src/AnnexLedger.vue b/src/components/Annex/src/AnnexLedger.vue index 94435ce56..c364747fd 100644 --- a/src/components/Annex/src/AnnexLedger.vue +++ b/src/components/Annex/src/AnnexLedger.vue @@ -34,6 +34,7 @@ import PreviewPDF from '@/components/PreviewPDF/index.vue' import UploadFile from '@/components/UploadFile/src/UploadFile.vue' import { formatDate } from '@/utils/formatTime' import * as FileApi from '@/api/wms/file' +import { getBaseUrl } from '@/utils/systemParam' const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 defineComponent({ @@ -94,7 +95,7 @@ const deleteAnnex = async (id) => { emit('deleteAnnexSuccess',id) } const downFile = (item)=>{ - window.open(import.meta.env.VITE_BASE_URL + '/admin-api/infra/file/0/get/' + item.path) + window.open(getBaseUrl() + '/admin-api/infra/file/0/get/' + item.path) } const previewRef = ref>() diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 07ef4a755..854ededeb 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -22,8 +22,9 @@ @onBlur="onBlur" @onEnter="onEnter" > -