diff --git a/.env.development b/.env.development index 0baf5cba7..13dee5d41 100644 --- a/.env.development +++ b/.env.development @@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html' VITE_JMREPORT_BASE_URL='http://localhost:12080' # 租户配置 -VITE_TENANT='["长春","成都"]' +VITE_TENANT='["长春1379","成都1397","长春2379"]' # 查看质检报告环境 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' diff --git a/.env.prod b/.env.prod index dabaa224f..cb7c3aa46 100644 --- a/.env.prod +++ b/.env.prod @@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html' VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310' # 租户配置 -VITE_TENANT='["长春","成都"]' +VITE_TENANT='["长春1379","成都1397","长春2379"]' # 查看质检报告环境 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' diff --git a/.env.test b/.env.test index 02d51a0d7..2c1e25575 100644 --- a/.env.test +++ b/.env.test @@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html' VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310' # 租户配置 -VITE_TENANT='["长春","成都"]' +VITE_TENANT='["长春1379","成都1397","长春2379"]' # 查看质检报告环境 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' diff --git a/.env.test-scp b/.env.test-scp index c97b58331..9c02faed0 100644 --- a/.env.test-scp +++ b/.env.test-scp @@ -38,7 +38,7 @@ VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25311' # 租户配置 -VITE_TENANT='["长春","成都"]' +VITE_TENANT='["长春1379","成都1397","长春2379"]' # 查看质检报告环境 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' diff --git a/README.md b/README.md index 7c997d5fa..b50a3f14d 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ form: { isFormModel:true, // filters中添加筛选的数据--取于formModel required:true, // 前置添加必有，和isFormModel结合使用 message: '请选择客户代码！', // 前置添加没填的提示语 + }, { key: 'itemCode', @@ -44,7 +45,16 @@ form: { value:'TRUE', // 指查询具体值 isMainValue: false // 表示查询条件不是主表的字段的值 } - ] + ], + // 失去焦点校验参数 + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: 'true', + isFormModel: true + }] } } **tableForm明细列表查询弹窗配置** diff --git a/package.json b/package.json index 5646cfe76..d99ee0b98 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "vue": "^3.3.4", "vue-dompurify-html": "^4.1.4", "vue-i18n": "^9.4.1", + "vue-next-focus": "^0.0.12", "vue-router": "^4.2.5", "vue-types": "^5.1.1", "vuedraggable": "^4.1.0", diff --git a/src/api/eam/basicEamProductionline/index.ts b/src/api/eam/basicEamProductionline/index.ts new file mode 100644 index 000000000..9f410aea3 --- /dev/null +++ b/src/api/eam/basicEamProductionline/index.ts @@ -0,0 +1,73 @@ +import request from '@/config/axios' +import {BasicEamWorkshopVO} from "@/api/eam/basicEamWorkshop"; + +export interface BasicEamProductionlineVO { + id: number + code: string + name: string + description: string + type: string + workshopCode: string + rawLocationCode: string + fgLocationCode: string + available: string + activeTime: Date + expireTime: Date + remark: string + deletionTime: Date + deleterId: string + extraProperties: string + concurrencyStamp: number + siteId: string +} + +// 查询生产线列表 +export const getBasicEamProductionlinePage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/basic-eam-productionline/senior', data }) + } else { + return await request.get({ url: `/eam/basic-eam-productionline/page`, params }) + } +} + +// 查询生产线详情 +export const getBasicEamProductionline = async (id: number) => { + return await request.get({ url: `/eam/basic-eam-productionline/get?id=` + id }) +} + +// 新增生产线 +export const createBasicEamProductionline = async (data: BasicEamProductionlineVO) => { + return await request.post({ url: `/eam/basic-eam-productionline/create`, data }) +} + +// 修改生产线 +export const updateBasicEamProductionline = async (data: BasicEamProductionlineVO) => { + return await request.put({ url: `/eam/basic-eam-productionline/update`, data }) +} + +// 删除生产线 +export const deleteBasicEamProductionline = async (id: number) => { + return await request.delete({ url: `/eam/basic-eam-productionline/delete?id=` + id }) +} + +// 导出生产线 Excel +export const exportBasicEamProductionline = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/eam/basic-eam-productionline/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/eam/basic-eam-productionline/export-excel`, params }) + } +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/basic-eam-productionline/get-import-template' }) +} + +// 启用 / 禁用 +export const updateEnableCode = async (data: BasicEamProductionlineVO) => { + return await request.post({ url: `/eam/basic-eam-productionline/ables` , data }) +} diff --git a/src/api/eam/basicEamWorkshop/index.ts b/src/api/eam/basicEamWorkshop/index.ts new file mode 100644 index 000000000..729ea6dae --- /dev/null +++ b/src/api/eam/basicEamWorkshop/index.ts @@ -0,0 +1,69 @@ +import request from '@/config/axios' + +export interface BasicEamWorkshopVO { + id: number + code: string + name: string + description: string + type: string + available: string + activeTime: Date + expireTime: Date + remark: string + deletionTime: Date + deleterId: string + extraProperties: string + concurrencyStamp: number + siteId: string +} + +// 查询EAM车间列表 +export const getBasicEamWorkshopPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/basic-eam-workshop/senior', data }) + } else { + return await request.get({ url: `/eam/basic-eam-workshop/page`, params }) + } +} + +// 查询EAM车间详情 +export const getBasicEamWorkshop = async (id: number) => { + return await request.get({ url: `/eam/basic-eam-workshop/get?id=` + id }) +} + +// 新增EAM车间 +export const createBasicEamWorkshop = async (data: BasicEamWorkshopVO) => { + return await request.post({ url: `/eam/basic-eam-workshop/create`, data }) +} + +// 修改EAM车间 +export const updateBasicEamWorkshop = async (data: BasicEamWorkshopVO) => { + return await request.put({ url: `/eam/basic-eam-workshop/update`, data }) +} + +// 删除EAM车间 +export const deleteBasicEamWorkshop = async (id: number) => { + return await request.delete({ url: `/eam/basic-eam-workshop/delete?id=` + id }) +} + +// 导出EAM车间 Excel +export const exportBasicEamWorkshop = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/eam/basic-eam-workshop/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/eam/basic-eam-workshop/export-excel`, params }) + } +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/basic-eam-workshop/get-import-template' }) +} + +// 启用 / 禁用 +export const updateEnableCode = async (data: BasicEamWorkshopVO) => { + return await request.post({ url: `/eam/basic-eam-workshop/ables` , data }) +} diff --git a/src/api/eam/classTypeRole/index.ts b/src/api/eam/classTypeRole/index.ts index 506a8abe3..c6dd9393c 100644 --- a/src/api/eam/classTypeRole/index.ts +++ b/src/api/eam/classTypeRole/index.ts @@ -61,4 +61,10 @@ export const exportClassTypeRole = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/eam/basic/class-type-role/get-import-template' }) -} \ No newline at end of file +} + + +// 启用 / 禁用 +export const updateEnableCode = async (data: ClassTypeRoleVO) => { + return await request.post({ url: `/eam/basic/class-type-role/ables` , data }) +} diff --git a/src/api/eam/documentTypeSelectSet/index.ts b/src/api/eam/documentTypeSelectSet/index.ts index 13b7164d6..c776a99dd 100644 --- a/src/api/eam/documentTypeSelectSet/index.ts +++ b/src/api/eam/documentTypeSelectSet/index.ts @@ -1,5 +1,4 @@ import request from '@/config/axios' -import {BasicSpotCheckSelectSetVO} from "@/api/eam/spotCheckSelectSet"; export interface DocumentTypeSelectSetVO { id: number diff --git a/src/api/eam/equipmentAccounts/index.ts b/src/api/eam/equipmentAccounts/index.ts index d1e9e401a..6f76580dc 100644 --- a/src/api/eam/equipmentAccounts/index.ts +++ b/src/api/eam/equipmentAccounts/index.ts @@ -15,6 +15,7 @@ export interface EquipmentAccountsVO { principal: string principalTelephone: string status: string + changeReason: string startDate: Date supplierCode: string purchaseTime: Date @@ -81,4 +82,9 @@ export const importTemplate = () => { // 查询设备台账列表 export const getEquipmentAccountsNoPage = async (params) => { return await request.get({ url: `/eam/device/equipment-accounts/noPage`, params }) -} \ No newline at end of file +} + +//停用启用 +export const ableEquipmentAccountsMain = async (data: EquipmentAccountsVO) => { + return await request.post({ url: `/eam/device/equipment-accounts/ables`, data }) +} diff --git a/src/api/eam/equipmentInspectionMain/index.ts b/src/api/eam/equipmentInspectionMain/index.ts index 5ea08a095..6f2550029 100644 --- a/src/api/eam/equipmentInspectionMain/index.ts +++ b/src/api/eam/equipmentInspectionMain/index.ts @@ -68,9 +68,9 @@ export const updateEquipmentInspectionMain = async (data: EquipmentInspectionMai 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 verifyEquipmentInspectionMain = async (data: EquipmentInspectionMainVO) => { + return await request.post({ url: `/eam/equipment-inspection-main/verifyOrder`, data }) } // 删除巡检工单主 diff --git a/src/api/eam/equipmentMaintenanceMain/index.ts b/src/api/eam/equipmentMaintenanceMain/index.ts index e257dd16a..e8b449834 100644 --- a/src/api/eam/equipmentMaintenanceMain/index.ts +++ b/src/api/eam/equipmentMaintenanceMain/index.ts @@ -70,9 +70,9 @@ export const updateEquipmentMaintenanceMain = async (data: EquipmentMaintenanceM return await request.put({ url: `/eam/equipment-maintenance-main/update`, data }) } -// 修改设备保养工单主 -export const updateEquipmentMaintenance = async (data: EquipmentMaintenanceMainVO) => { - return await request.post({ url: `/eam/equipment-maintenance-main/updateOrders`, data }) +// 验证设备保养工单主 +export const verifyEquipmentMaintenanceMain = async (data: EquipmentMaintenanceMainVO) => { + return await request.post({ url: `/eam/equipment-maintenance-main/verifyOrder`, data }) } // 删除设备保养工单主 diff --git a/src/api/eam/equipmentRepairJobMain/index.ts b/src/api/eam/equipmentRepairJobMain/index.ts index e06982c20..0a77ee4eb 100644 --- a/src/api/eam/equipmentRepairJobMain/index.ts +++ b/src/api/eam/equipmentRepairJobMain/index.ts @@ -69,6 +69,11 @@ export const createEquipmentRepairJobMain = async (data: EquipmentRepairJobMainV return await request.post({ url: `/eam/equipment-repair-job-main/create`, data }) } +// 维修验证更新工单主 +export const wxVerifyEquipmentRepairJobMain = async (data: EquipmentRepairJobMainVO) => { + return await request.post({ url: `/eam/equipment-repair-job-main/wxVerify`, data }) +} + // 修改维修工单主 export const updateEquipmentRepairJobMain = async (data: EquipmentRepairJobMainVO) => { return await request.put({ url: `/eam/equipment-repair-job-main/update`, data }) @@ -110,7 +115,7 @@ export const backEquipmentRepairOrder = async (data: EquipmentRepairJobMainVO) = return await request.post({ url: `/eam/equipment-repair-job-main/fallback`, data }) } -//报修验证不通过,生成新工单 +//报修验证 export const createEquipmentRepairNewOrder = async (data: EquipmentRepairJobMainVO) => { return await request.post({ url: `/eam/equipment-repair-job-main/createNew`, data }) } diff --git a/src/api/eam/equipmentReportRepairRequest/index.ts b/src/api/eam/equipmentReportRepairRequest/index.ts index 10542bbf9..c804cc467 100644 --- a/src/api/eam/equipmentReportRepairRequest/index.ts +++ b/src/api/eam/equipmentReportRepairRequest/index.ts @@ -77,6 +77,11 @@ export const updateEquipmentReportRepairOrder = async (data: EquipmentReportRepa return await request.post({ url: `/eam/equipment-report-repair-request/updateOrder`, data }) } +// 审核报修工单状态 +export const audiEquipmentReportRepairOrder = async (data: EquipmentReportRepairRequestVO) => { + return await request.post({ url: `/eam/equipment-report-repair-request/audiOrder`, data }) +} + // 完成并创建维修工单 export const createEquipmentWeixiuOrder = async (data: EquipmentReportRepairRequestVO) => { return await request.post({ url: `/eam/equipment-report-repair-request/updateCreateOrder`, data }) diff --git a/src/api/eam/equipmentSigning/index.ts b/src/api/eam/equipmentSigning/index.ts index e9db1653b..b33bcc99f 100644 --- a/src/api/eam/equipmentSigning/index.ts +++ b/src/api/eam/equipmentSigning/index.ts @@ -50,6 +50,10 @@ export const getEquipmentSigning = async (id: number) => { export const createEquipmentSigning = async (data: EquipmentSigningVO) => { return await request.post({ url: `/eam/equipment-signing/create`, data }) } +export const createsEquipmentSigning = async (data: EquipmentSigningVO) => { + return await request.post({ url: `/eam/equipment-signing/creates`, data }) +} + // 修改设备到货签收记录 export const updateEquipmentSigning = async (data: EquipmentSigningVO) => { @@ -69,4 +73,4 @@ export const exportEquipmentSigning = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/eam/equipment-signing/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 index 9403acf8d..bd0c0d547 100644 --- a/src/api/eam/equipmentSpotCheckMain/index.ts +++ b/src/api/eam/equipmentSpotCheckMain/index.ts @@ -66,9 +66,9 @@ export const updateEquipmentSpotCheckMain = async (data: EquipmentSpotCheckMainV 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 verifyEquipmentSpotCheckMain = async (data: EquipmentSpotCheckMainVO) => { + return await request.post({ url: `/eam/equipment-spot-check-main/verifyOrder`, data }) } // 删除点检工单主 diff --git a/src/api/eam/inspectionItem/index.ts b/src/api/eam/inspectionItem/index.ts index ddf8cf80f..98f14dc05 100644 --- a/src/api/eam/inspectionItem/index.ts +++ b/src/api/eam/inspectionItem/index.ts @@ -1,5 +1,4 @@ import request from '@/config/axios' -import {InspectionItemSelectSetVO} from "@/api/eam/inspectionItemSelectSet"; export interface InspectionItemVO { id: number diff --git a/src/api/eam/inspectionItemSelectSet/index.ts b/src/api/eam/inspectionItemSelectSet/index.ts index c3e897706..f02a16672 100644 --- a/src/api/eam/inspectionItemSelectSet/index.ts +++ b/src/api/eam/inspectionItemSelectSet/index.ts @@ -58,3 +58,13 @@ export const importTemplate = () => { export const updateEnableCode = async (data: InspectionItemSelectSetVO) => { return await request.post({ url: `/eam/basic/inspection-item-select-set/ables` , data }) } + +// 查询巡检项选择集列表 +export const getInspectionItemSelectSetList = async (params) => { + return await request.get({ url: `/eam/basic/inspection-item/getList`, params }) +} + +// 查询巡检方案项列表 +export const getRalInspectionOptionItemList = async (params) => { + return await request.get({url: `/eam/relation-inspection-option-item/getList?optionCode=` + params}) +} diff --git a/src/api/eam/maintenanceItemSelectSet/index.ts b/src/api/eam/maintenanceItemSelectSet/index.ts index 35f0c9817..b3a67ce24 100644 --- a/src/api/eam/maintenanceItemSelectSet/index.ts +++ b/src/api/eam/maintenanceItemSelectSet/index.ts @@ -56,5 +56,15 @@ export const importTemplate = () => { // 启用 / 禁用 export const updateEnableCode = async (data: MaintenanceItemSelectSetVO) => { - return await request.post({ url: `/eam/basic/inspection-item-select-set/ables` , data }) + return await request.post({ url: `/eam/basic/maintenance-item-select-set/ables` , data }) +} + +// 查询保养项选择集列表 +export const getMaintenanceItemSelectSetList = async (params) => { + return await request.get({ url: `/eam/basic/maintenance-item/getList`, params }) +} + +// 查询保养方案项列表 +export const getRalMaintenanceOptionItemList = async (params) => { + return await request.get({url: `/eam/relation-maintenance-option-item/getList?optionCode=` + params}) } diff --git a/src/api/eam/recordDeviceChanged/index.ts b/src/api/eam/recordDeviceChanged/index.ts new file mode 100644 index 000000000..a7fe656b6 --- /dev/null +++ b/src/api/eam/recordDeviceChanged/index.ts @@ -0,0 +1,59 @@ +import request from '@/config/axios' + +export interface RecordDeviceChangedVO { + id: number + code: string + name: string + statusBefore: string + statusAfter: string + operator: number + operateTime: Date + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询设备变更记录列表 +export const getRecordDeviceChangedPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/record-device-changed/senior', data }) + } else { + return await request.get({ url: `/eam/record-device-changed/page`, params }) + } +} + +// 查询设备变更记录详情 +export const getRecordDeviceChanged = async (id: number) => { + return await request.get({ url: `/eam/record-device-changed/get?id=` + id }) +} + +// 新增设备变更记录 +export const createRecordDeviceChanged = async (data: RecordDeviceChangedVO) => { + return await request.post({ url: `/eam/record-device-changed/create`, data }) +} + +// 修改设备变更记录 +export const updateRecordDeviceChanged = async (data: RecordDeviceChangedVO) => { + return await request.put({ url: `/eam/record-device-changed/update`, data }) +} + +// 删除设备变更记录 +export const deleteRecordDeviceChanged = async (id: number) => { + return await request.delete({ url: `/eam/record-device-changed/delete?id=` + id }) +} + +// 导出设备变更记录 Excel +export const exportRecordDeviceChanged = async (params) => { + return await request.download({ url: `/eam/record-device-changed/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/record-device-changed/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/eam/repairExperience/index.ts b/src/api/eam/repairExperience/index.ts index 5433a47c8..b0fe57f6b 100644 --- a/src/api/eam/repairExperience/index.ts +++ b/src/api/eam/repairExperience/index.ts @@ -4,7 +4,7 @@ export interface RepairExperienceVO { id: number name: string content: string - repairNumber: string + repairRecordNumber: string } // 查询维修经验记录列表 diff --git a/src/api/eam/sparePartsApplyDetail/index.ts b/src/api/eam/sparePartsApplyDetail/index.ts new file mode 100644 index 000000000..ae94831de --- /dev/null +++ b/src/api/eam/sparePartsApplyDetail/index.ts @@ -0,0 +1,63 @@ +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 new file mode 100644 index 000000000..80288a681 --- /dev/null +++ b/src/api/eam/sparePartsApplyMain/index.ts @@ -0,0 +1,87 @@ +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' }) +} + +// 撤回 +export const cancelSparePartsApplyMain = async (id) => { + return await request.get({ url: `/eam/spare-parts-apply-main/cancel?id=` + id }) +} +// 审核 +export const submitSparePartsApplyMain = async (id) => { + return await request.get({ url: `/eam/spare-parts-apply-main/submitExamine?id=` + id }) +} +// 审核驳回 +export const rejectSparePartsApplyMain = async (id) => { + return await request.get({ url: `/eam/spare-parts-apply-main/reject?id=` + id }) +} +// 审核通过 +export const approveSparePartsApplyMain = async (data) => { + return await request.post({ url: `/eam/spare-parts-apply-main/approve`, data }) +} + +// 完成 +export const finishSparePartsApplyMain = async (id) => { + return await request.post({ url: `/eam/spare-parts-apply-main/finish?id=` + id }) +} diff --git a/src/api/eam/sparePartsInLocationDetail/index.ts b/src/api/eam/sparePartsInLocationDetail/index.ts new file mode 100644 index 000000000..827687a36 --- /dev/null +++ b/src/api/eam/sparePartsInLocationDetail/index.ts @@ -0,0 +1,58 @@ +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 new file mode 100644 index 000000000..687d99a67 --- /dev/null +++ b/src/api/eam/sparePartsInLocationMain/index.ts @@ -0,0 +1,91 @@ +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 }) +} +// 完成 +export const finishSparePartsInLocation = async (id) => { + return await request.post({ url: `/eam/spare-parts-in-location-main/finish?id=` + id }) +} \ No newline at end of file diff --git a/src/api/eam/sparePartsInLocationRecordDetail/index.ts b/src/api/eam/sparePartsInLocationRecordDetail/index.ts new file mode 100644 index 000000000..9e4df6997 --- /dev/null +++ b/src/api/eam/sparePartsInLocationRecordDetail/index.ts @@ -0,0 +1,58 @@ +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 getSparePartsInLocationRecordDetailPage = 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 getSparePartsInLocationRecordDetail = async (id: number) => { + return await request.get({ url: `/eam/spare-parts-in-location-detail-record/get?id=` + id }) +} + +// 新增备件入库记录子 +export const createSparePartsInLocationRecordDetail= async (data: SparePartsInLocationDetailRecordVO) => { + return await request.post({ url: `/eam/spare-parts-in-location-detail-record/create`, data }) +} + +// 修改备件入库记录子 +export const updateSparePartsInLocationRecordDetail = async (data: SparePartsInLocationDetailRecordVO) => { + return await request.put({ url: `/eam/spare-parts-in-location-detail-record/update`, data }) +} + +// 删除备件入库记录子 +export const deleteSparePartsInLocationRecordDetail = async (id: number) => { + return await request.delete({ url: `/eam/spare-parts-in-location-detail-record/delete?id=` + id }) +} + +// 导出备件入库记录子 Excel +export const exportSparePartsInLocationRecordDetail = 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 new file mode 100644 index 000000000..42c7616fe --- /dev/null +++ b/src/api/eam/sparePartsInLocationRecordMain/index.ts @@ -0,0 +1,72 @@ +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 getSparePartsInLocationRecordMainPage = 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 getSparePartsInLocationRecordMain = async (id: number) => { + return await request.get({ url: `/eam/spare-parts-in-location-main-record/get?id=` + id }) +} + +// 新增备件入库记录主 +export const createSparePartsInLocationRecordMain = async ( + data: SparePartsInLocationMainRecordVO +) => { + return await request.post({ url: `/eam/spare-parts-in-location-main-record/create`, data }) +} + +// 修改备件入库记录主 +export const updateSparePartsInLocationRecordMain = async ( + data: SparePartsInLocationMainRecordVO +) => { + return await request.put({ url: `/eam/spare-parts-in-location-main-record/update`, data }) +} + +// 删除备件入库记录主 +export const deleteSparePartsInLocationRecordMain= async (id: number) => { + return await request.delete({ url: `/eam/spare-parts-in-location-main-record/delete?id=` + id }) +} + +// 导出备件入库记录主 Excel +export const exportSparePartsInLocationRecordMain = 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/sparePartsOutLocationDetail/index.ts b/src/api/eam/sparePartsOutLocationDetail/index.ts new file mode 100644 index 000000000..16b9fe4cc --- /dev/null +++ b/src/api/eam/sparePartsOutLocationDetail/index.ts @@ -0,0 +1,61 @@ +import request from '@/config/axios' + +export interface SparePartsOutLocationDetailVO { + 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 getSparePartsOutLocationDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/eam/spare-parts-out-location-detail/senior', data }) + } else { + return await request.get({ url: `/eam/spare-parts-out-location-detail/page`, params }) + } +} + +// 查询备件入库记录子详情 +export const getSparePartsOutLocationDetail = async (id: number) => { + return await request.get({ url: `/eam/spare-parts-out-location-detail/get?id=` + id }) +} + +// 新增备件入库记录子 +export const createSparePartsOutLocationDetail = async (data: SparePartsOutLocationDetailVO) => { + return await request.post({ url: `/eam/spare-parts-out-location-detail/create`, data }) +} + +// 修改备件入库记录子 +export const updateSparePartsOutLocationDetail = async (data: SparePartsOutLocationDetailVO) => { + return await request.put({ url: `/eam/spare-parts-out-location-detail/update`, data }) +} + +// 删除备件入库记录子 +export const deleteSparePartsOutLocationDetail = async (id: number) => { + return await request.delete({ url: `/eam/spare-parts-out-location-detail/delete?id=` + id }) +} + +// 导出备件入库记录子 Excel +export const exportSparePartsOutLocationDetail = async (params) => { + return await request.download({ + url: `/eam/spare-parts-out-location-detail/export-excel`, + params + }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/spare-parts-out-location-detail/get-import-template' }) +} diff --git a/src/api/eam/sparePartsOutLocationMain/index.ts b/src/api/eam/sparePartsOutLocationMain/index.ts new file mode 100644 index 000000000..1eeccf471 --- /dev/null +++ b/src/api/eam/sparePartsOutLocationMain/index.ts @@ -0,0 +1,81 @@ +import request from '@/config/axios' + +export interface SparePartsOutLocationMainVO { + 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 getSparePartsOutLocationMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/eam/spare-parts-out-location-main/senior', data }) + } else { + return await request.get({ url: `/eam/spare-parts-out-location-main/page`, params }) + } +} + +// 查询备件入库记录主详情 +export const getSparePartsOutLocationMain = async (id: number) => { + return await request.get({ url: `/eam/spare-parts-out-location-main/get?id=` + id }) +} + +// 新增备件入库记录主 +export const createSparePartsOutLocationMain = async (data: SparePartsOutLocationMainVO) => { + return await request.post({ url: `/eam/spare-parts-out-location-main/create`, data }) +} + +// 修改备件入库记录主 +export const updateSparePartsOutLocationMain = async (data: SparePartsOutLocationMainVO) => { + return await request.put({ url: `/eam/spare-parts-out-location-main/update`, data }) +} + +// 删除备件入库记录主 +export const deleteSparePartsOutLocationMain = async (id: number) => { + return await request.delete({ url: `/eam/spare-parts-out-location-main/delete?id=` + id }) +} + +// 出库 +export const outSparePartsOutLocationMain = async (id) => { + return await request.get({ url: `/eam/spare-parts-out-location-main/out?id=` + id }) +} + +// 导出备件入库记录主 Excel +export const exportSparePartsOutLocationMain = async (params) => { + if (params.isSearch) { + const data = { ...params } + return await request.downloadPost({ + url: `/eam/spare-parts-out-location-main/export-excel-senior`, + data + }) + } else { + return await request.download({ + url: `/eam/spare-parts-out-location-main/export-excel`, + params + }) + } +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/spare-parts-out-location-main/get-import-template' }) +} diff --git a/src/api/eam/sparePartsOutLocationRecordDetail/index.ts b/src/api/eam/sparePartsOutLocationRecordDetail/index.ts new file mode 100644 index 000000000..afffa390c --- /dev/null +++ b/src/api/eam/sparePartsOutLocationRecordDetail/index.ts @@ -0,0 +1,76 @@ +import request from '@/config/axios' + +export interface SparePartsOutLocationRecordDetailVO { + 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 getSparePartsOutLocationDetailRecordPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/eam/spare-parts-out-location-detail-record/senior', data }) + } else { + return await request.get({ url: `/eam/spare-parts-out-location-detail-record/page`, params }) + } +} + +// 查询备件入库记录主详情 +export const getSparePartsOutLocationDetailRecord = async (id: number) => { + return await request.get({ url: `/eam/spare-parts-out-location-detail-record/get?id=` + id }) +} + +// 新增备件入库记录主 +export const createSparePartsOutLocationDetailRecord = async ( + data: SparePartsOutLocationRecordDetailVO +) => { + return await request.post({ url: `/eam/spare-parts-out-location-detail-record/create`, data }) +} + +// 修改备件入库记录主 +export const updateSparePartsOutLocationDetailRecord = async ( + data: SparePartsOutLocationRecordDetailVO +) => { + return await request.put({ url: `/eam/spare-parts-out-location-detail-record/update`, data }) +} + +// 删除备件入库记录主 +export const deleteSparePartsOutLocationDetailRecord = async (id: number) => { + return await request.delete({ + url: `/eam/spare-parts-out-location-detail-record/delete?id=` + id + }) +} + +// 导出备件入库记录主 Excel +export const exportSparePartsOutLocationDetailRecord = async (params) => { + return await request.download({ + url: `/eam/spare-parts-out-location-detail-record/export-excel`, + params + }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ + url: '/eam/spare-parts-out-location-detail-record/get-import-template' + }) +} diff --git a/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js b/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js new file mode 100644 index 000000000..4e84a9429 --- /dev/null +++ b/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js @@ -0,0 +1,54 @@ +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 new file mode 100644 index 000000000..4f075cce1 --- /dev/null +++ b/src/api/eam/sparePartsOutLocationRecordMain/index.ts @@ -0,0 +1,71 @@ +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/eam/spotCheckSelectSet/index.ts b/src/api/eam/spotCheckSelectSet/index.ts index be9a0ccb3..dd6a604fa 100644 --- a/src/api/eam/spotCheckSelectSet/index.ts +++ b/src/api/eam/spotCheckSelectSet/index.ts @@ -59,3 +59,14 @@ export const importTemplate = () => { export const updateEnableCode = async (data: BasicSpotCheckSelectSetVO) => { return await request.post({ url: `/eam/basic/spot-check-select-set/ables` , data }) } + + +// 查询点检项选择集列表 +export const getSpotCheckSelectSetList = async (params) => { + return await request.get({ url: `/eam/basic/spot-check-item/getList`, params }) +} + +// 查询点检方案项列表 +export const getRalSpotCheckOptionItemList = async (params) => { + return await request.get({url: `/eam/relation-spotCheck-option-item/getList?optionCode=` + params}) +} diff --git a/src/api/qms/inspectionTemplate/index.ts b/src/api/qms/inspectionTemplate/index.ts index f3bf638d2..eb80285c8 100644 --- a/src/api/qms/inspectionTemplate/index.ts +++ b/src/api/qms/inspectionTemplate/index.ts @@ -37,3 +37,8 @@ export const enableInspectionTemplate = async (id: number) => { export const disableInspectionTemplate = async (id: number) => { return await request.disable({ url: `/qms/programme-template/disable?id=` + id }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/qms/programme-template/get-import-template' }) +} diff --git a/src/api/wms/areabasic/index.ts b/src/api/wms/areabasic/index.ts index 1295c4629..2a3e2bb07 100644 --- a/src/api/wms/areabasic/index.ts +++ b/src/api/wms/areabasic/index.ts @@ -65,4 +65,9 @@ export const exportArea = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/areabasic/get-import-template' }) +} + +// 根据code获取数据列表 +export const getAreabasicByCodes = async (params) => { + return await request.get({ url: `/wms/areabasic/listByCodes`, params }) } \ No newline at end of file diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts index 68161dc16..0aa246832 100644 --- a/src/api/wms/balance/index.ts +++ b/src/api/wms/balance/index.ts @@ -41,6 +41,18 @@ export const getBalancePage = async (params) => { return await request.get({ url: `/wms/balance/page`, params }) } } + +// 查询库存余额列表(包括已冻结，已失效的物料) +export const getBalancePageAll = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/balance/seniorAll', data }) + } else { + return await request.get({ url: `/wms/balance/pageAll`, params }) + } +} + // 查询库存余额列表 export const getBalancePageReturn= async (params) => { if (params.isSearch) { @@ -177,4 +189,12 @@ export const getBalanceByBusinessTypeByItemType = async (params) => { } else { return await request.get({ url: `/wms/balance/pageBusinessTypeToBalance`, params }) } +} +// 根据code获取数据列表 +export const getBalanceItemListByCodes = async (data) => { +   return await request.get({ url: `/wms/balance/listByCodes`,data }) +} +// 查询bom批次默认数据 +export const getBanchBomPage = async (params) => { + return await request.get({ url: `/wms/balance/pageBOM`, params }) } \ No newline at end of file diff --git a/src/api/wms/business/business.ts b/src/api/wms/business/business.ts new file mode 100644 index 000000000..6329afa0b --- /dev/null +++ b/src/api/wms/business/business.ts @@ -0,0 +1,524 @@ +// 获取供应商列表 +import { getSupplierListByCodes, importTemplate } from '@/api/wms/supplier' +// 获取物料列表 +import { getItemListByCodes } from '@/api/wms/itembasic' +// 获取供应商物料列表 +import { getSupplierItemListByCodes } from '@/api/wms/supplieritem' +// 获取生产线物料 +import { getProductionLineCodelistByCodes } from '@/api/wms/productionlineitem' +// 获取包装规格 +import { getPackageunitListByCodes } from '@/api/wms/packageunit' +// 获取物料包装规格 +import { getItemPackageunitListByCodes } from '@/api/wms/itempackage' +// 获取客户物料 +import { getCustomerItemListByCodes } from '@/api/wms/customeritem' +// 获取库存余额 +import { getBalanceItemListByCodes } from '@/api/wms/balance' +import { isString } from 'min-dash' +const message = useMessage() // 消息弹窗 +const { t } = useI18n() // 国际化 +/** + * 业务组件 + * tableFormBlur 表格表单失去焦点时候获取焦点 + * FormBlur 表格失去焦点时候获取焦点 + */ +export const tableFormBlurVer = async (headerItem, val, row, index,routeName,formRef,detailData,tableData,callback) => { + if ( + headerItem.field == 'fromPackingNumber' || + headerItem.field == 'packingNumber' || + headerItem.field == 'itemCode' || + headerItem.field == 'packUnit' || + headerItem.field == 'secondPackUnit' || + headerItem.field == 'fromPackUnit' || + headerItem.field == 'toPackUnit'|| + headerItem.field == 'toPackUnit'|| + headerItem.field == 'supplierItemCode' + + ) { + let searchField = headerItem.field + let pageApi = ref() + let params = ref() + + if (val && isString(val)) { + // const obj = props.tableAllSchemas.tableFormColumns.find((item) => item.field == headerItem.field) + if (val.indexOf(',') > -1) { + message.alert('该输入框只能输入一条数据') + row[headerItem.field] = '' + return + } + // 校验 + let params = ref({}) + let searchCondition1 = headerItem.tableForm.searchCondition //获取data.ts参数信息 + // 循环参数设置参数为key：value格式 + if (searchCondition1 && searchCondition1.length > 0) { + for (let i = 0; i < searchCondition1.length; i++) { + if (searchCondition1[i].isMainValue) { + params.value[searchCondition1[i].key] = formRef.formModel[ + searchCondition1[i].value + ] + ? formRef.formModel[searchCondition1[i].value] + : detailData + ? detailData[searchCondition1[i].value] + : row + ? row[searchCondition1[i].value] + : '' + // 是否含有空参数情况 + let isNull = false + if ( + params.value[searchCondition1[i].key] == '' || + params.value[searchCondition1[i].key] == undefined + ) { + isNull = true + } + if (isNull) { + message.warning( + searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！' + ) + row[headerItem.field] = '' + return + } + } else { + // 扩展 转换为筛选条件进行查询 + if (searchCondition1[i].isSearch) { + if (searchCondition1[i].isFormModel) { + //用formModel中的值 + if (searchCondition1[i].required) { + if ( + formRef.formModel[searchCondition1[i].value] == '' || + formRef.formModel[searchCondition1[i].value] == undefined + ) { + message.warning( + searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！' + ) + row[headerItem.field] = '' + return + } + } + } + } else { + params.value[searchCondition1[i].key] = searchCondition1[i].value + } + } + } + } + params.value[headerItem.field] = val?.trim() + // 判断改包装号是否已经添加 + const seen = new Set() + const repeatCode = new Set() + let arr = tableData.map((item) => item[headerItem.field]?.trim()) + arr.forEach((item) => { + if (seen.has(item)) { + repeatCode.add(item) + } else { + seen.add(item) + } + }) + const arr1 = Array.from(repeatCode) + if (arr1.length > 0) { + message.warning(`${arr1.join(',')}${t('ts.已经存在')}`) + row[headerItem.field] = '' + return + } + if ( + headerItem.field == 'fromPackingNumber' || + headerItem.field == 'packingNumber' || + headerItem.field == 'itemCode' + ) { + // 业务 + // 采购退货申请，制品拆解,调拨出库,报废出库申请，合格转隔离,隔离转合格，隔离转报废，合格转报废，报废转隔离，库存移动申请，库存修改申请 + if ( + routeName == 'PurchasereturnRequestMain' || + routeName == 'ProductdismantleRequestMain' || + routeName == 'TransferissueRequestMain' || + routeName == 'ScrapRequestMain' || + routeName == 'OktoholdRequestMain' || + routeName == 'HoldtookRequestMain' || + routeName == 'HoldtoscrapRequestMain' || + routeName == 'OktoscrapRequestMain' || + routeName == 'ScraptoholdRequestMain' || + routeName == 'InventorymoveRequestMain' || + routeName == 'InventorychangeRequestMain' + ) { + // //合格转隔离,隔离转合格，隔离转报废，合格转报废，报废转隔离，库存移动申请参数稍有不同 + // if ( + // routeName == 'OktoholdRequestMain' || + // routeName == 'HoldtookRequestMain' || + // routeName == 'HoldtoscrapRequestMain' || + // routeName == 'OktoscrapRequestMain' || + // routeName == 'ScraptoholdRequestMain' || + // routeName == 'InventorymoveRequestMain' || + // routeName == 'InventorychangeRequestMain' + // ) { + // searchField = 'packingNumber' + // params.value.packingNumber = val?.trim() + // } + // pageApi.value = getBalanceItemListByCodes + } else if ( + routeName == 'RepleinshRequestMain' || + routeName == 'IssueRequestMain' || + routeName == 'InventoryinitRequestMain' + ) { + // 补料申请业务 + pageApi.value = getItemListByCodes + searchField = 'code' + params.value.codes = val?.trim() + } else if ( + routeName == 'ProductionMainAssemble' || + routeName == 'ProductionMainASparePart' || + routeName == 'ProductionMainPredictSparePart' || + routeName == 'ProductreceiptRequestMain' || + routeName == 'ProductreceiptRequestMainA' || + routeName == 'ProductreceiptscrapRequestMain' || + routeName == 'ProductscrapRequestMain' + ) { + // 装配计划,裝配备件计划,预备产件计划，预生产收货申请,装配收货申请,报修收货申请,制品报废申请 + pageApi.value = getProductionLineCodelistByCodes + params.value.productionLineCode= + formRef.formModel.productionLine || formRef.formModel.productionLineCode || row.productionLine || row.productionLineCode, + params.value.itemCodes=val?.trim() + } + } else if ( + headerItem.field == 'packUnit' || + headerItem.field == 'secondPackUnit' || + headerItem.field == 'fromPackUnit' || + headerItem.field == 'toPackUnit' + ) { + searchField = 'packUnit' + //包装规格 + // 预生产收货申请,装配收货申请,报修收货申请,客户退货申请，计划外入库，计划外出库,翻包申请 + if ( + routeName == 'ProductreceiptRequestMain' || + routeName == 'ProductreceiptRequestMainA' || + routeName == 'ProductreceiptscrapRequestMain' || + routeName == 'CustomerreturnRequestMain' || + routeName == 'UnplannedreceiptRequestMain' || + routeName == 'UnplannedissueJobMain' || + routeName == 'PackageoverRequestMain' + ) { + params.value.itemCode= row.itemCode + params.value.packUnit= val?.trim() + pageApi.value = getItemPackageunitListByCodes + } + } else if ( + headerItem.field == 'supplierItemCode' + ) { + // 生产退料申请,隔离退料申请 + if ( + routeName == 'ProductionreturnRequestMain' || + routeName == 'ProductionreturnRequestMainNo' + ) { + searchField = 'supplierCode' + params.value.itemCodes= row.itemCode + params.value.supplierCode= val?.trim() + pageApi.value = getSupplierItemListByCodes + } + } + const list = ref() + // 调取包装接口 + await pageApi.value(params.value).then(async (res) => { + list.value = res ? res : [] + // 只查一条数据，多条数据查询默认显示不存在 + if (res.length == 1) { + callback(searchField,list.value) + } else { + message.alert('代码' + row[headerItem.field] + '没有找到对应数据') + row[headerItem.field] = '' + return + } + }) + } + } +} +export const FormBlur = async (formField, val,routeName,formRef,detailData,formSchema,callback) => { + let pageApi = ref() + let params = ref() + let setV = {} + setV[formField] = '' + if (val && isString(val)) { + if ( + formField == 'supplierCode' || + formField == 'itemCode' || + formField == 'productItemCode' || + formField == 'componentItemCode' || + formField == 'packUnit' || + formField == 'inPackUnit' || + formField == 'fromPackingNumber' + ) { + let searchField = 'code' + if (formField == 'supplierCode') { + params.value = val?.trim() + pageApi.value = getSupplierListByCodes + } else if ( + formField == 'itemCode' || + formField == 'productItemCode' || + formField == 'componentItemCode' + ) { + // 销售价格单 + if (routeName == 'Saleprice') { + params.value = { + customerCode: formRef.formModel.customerCode, + itemCodes: val?.trim() + } + pageApi.value = getCustomerItemListByCodes + searchField = 'itemCode' + }else if (routeName == 'ProductscrapRequestMain') { + // 制品报废申请 + params.value = { + productionLineCode: + detailData.productionLine || detailData.productionLineCode, + itemCodes: val?.trim() + } + pageApi.value = getProductionLineCodelistByCodes + searchField = 'itemCode' + }else { + // params.value = val.trim() + searchField = 'code' + + params.value={ + codes:val?.trim() + } + pageApi.value = getItemListByCodes + } + } else if (formField == 'packUnit') { + if(routeName == 'Itemwarehouse'||routeName == 'Callmaterials'){//物料仓库默认配置,叫料标签 + searchField = 'packUnit' + params.value = { + itemCode: formRef.formModel.itemCode, + packUnit: val?.trim() + } + pageApi.value = getItemPackageunitListByCodes + }else{ + params.value = val?.trim() + pageApi.value = getPackageunitListByCodes + } + } else if (formField == 'inPackUnit') { + params.value = { + itemCode: formRef.formModel.itemCode, + packUnit: val.trim() + } + pageApi.value = getItemPackageunitListByCodes + } + // else if (formField == 'fromPackingNumber') { + // params.value = { + // packingNumber: val?.trim() + // } + // pageApi.value = getBalanceItemListByCodes + // } + let obj = {} + let searchCondition1 = formSchema.find((item) => item.field == formField).componentProps + .searchCondition //获取data.ts参数信息 + // 循环参数设置参数为key：value格式 + if (searchCondition1 && searchCondition1.length > 0) { + for (let i = 0; i < searchCondition1.length; i++) { + if (searchCondition1[i].isMainValue) { + obj[searchCondition1[i].key] = formRef.formModel[searchCondition1[i].value] + ? formRef.formModel[searchCondition1[i].value] + : detailData + ? detailData[searchCondition1[i].value] + : '' + // 是否含有空参数情况 + let isNull = false + if (obj[searchCondition1[i].key] == '' || obj[searchCondition1[i].key] == undefined) { + isNull = true + } + if (isNull) { + message.warning( + searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！' + ) + return + } + } else { + // 扩展 转换为筛选条件进行查询 + if (searchCondition1[i].isSearch) { + if (searchCondition1[i].isFormModel) { + //用formModel中的值 + if (searchCondition1[i].required) { + if ( + formRef.formModel[searchCondition1[i].value] == '' || + formRef.formModel[searchCondition1[i].value] == undefined + ) { + message.warning( + searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！' + ) + return + } + } + } + } else { + obj[searchCondition1[i].key] = searchCondition1[i].value + } + } + } + } + + let obj1 = formSchema.find((item) => item.field == formField) + if (!obj1.componentProps.multiple && val.indexOf(',') > -1) { + message.alert('该输入框只能输入一条数据') + formRef.setValues(setV) + return + } + await pageApi.value(params.value).then((res) => { + let arr1 = val.split(',') + let list = ref([]) + list.value = res + if (list.value?.length == 0) { + message.alert('暂无数据') + formRef.setValues(setV) + return + } + if (arr1.length != list.value.length) { + let arr2 = list.value.map((item) => item.code) + let str = [ + ...arr1.filter((item) => !arr2.includes(item)), + ...arr2.filter((item) => !arr1.includes(item)) + ].join(',') + message.alert('代码' + str + '没有找到对应数据') + formRef.setValues(setV) + return + } + // emit('searchTableSuccess', formField, searchField, list.value, formRef.value, 'form') + callback(searchField,list.value) + }) + } + } +} + +// 根据下方输入框失去焦点校验信息 +export const getListByBottonInput = async (headerItem, val,row,routeName,formRef,detailData,tableData,callback) => { + let pageApi = ref() + let params = ref({}) + let list = ref([]) + let field = 'itemCode' + // scp采购订单 + if(!val)return; + if (routeName == 'PurchaseMain') { + pageApi.value = getSupplierItemListByCodes + params.value = { + supplierCode: formRef.formModel.supplierCode, + itemCodes: val?.trim(), + available: true + } + } else if (routeName == 'ProductionMain') { + pageApi.value = getProductionLineCodelistByCodes + params.value = { + productionLineCode: formRef.formModel.productionLine, + itemCodes: val?.trim() + } + } else if ( + routeName == 'ZZBJDeliverPlanMain' || + routeName == 'DeliverPlanMain' || + routeName == 'DeliverRequestMain' || + routeName == 'ZZBJDeliverRequestMain' + ) { + // 自制备件发货计划，发货计划，成品发货申请，自制备件发货申请 + pageApi.value = getCustomerItemListByCodes + params.value = { + customerCode: formRef.formModel.customerCode, + itemCodes: val?.trim() + } + } + // else if (routeName == 'UnplannedissueRequestMain') { + // // 计划外出库 + // pageApi.value = getBalanceItemListByCodes + // params.value = { + // packingNumber: val?.trim() + // } + // field = 'packingNumber' + // } + else { + params.value.codes = val?.trim() + pageApi.value = getItemListByCodes + } + let searchCondition1 = headerItem.tableForm.searchCondition //获取data.ts参数信息 + // 循环参数设置参数为key：value格式 + if (searchCondition1 && searchCondition1.length > 0) { + for (let i = 0; i < searchCondition1.length; i++) { + if (searchCondition1[i].isMainValue) { + params.value[searchCondition1[i].key] = formRef.formModel[ + searchCondition1[i].value + ] + ? formRef.formModel[searchCondition1[i].value] + : detailData + ? detailData[searchCondition1[i].value] + : '' + // 是否含有空参数情况 + let isNull = false + if ( + params.value[searchCondition1[i].key] == '' || + params.value[searchCondition1[i].key] == undefined + ) { + isNull = true + } + if (isNull) { + message.warning( + searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！' + ) + return + } + } else if (searchCondition1[i].isTableRowValue) { + if (searchCondition1[i].required) { + if (row[searchCondition1[i].value] == '' || row[searchCondition1[i].value] == undefined) { + message.warning( + searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！' + ) + return + } + } + row[searchCondition1[i].value] + //查询当前table表数据的值 + params.value[searchCondition1[i].key] = row[searchCondition1[i].value] + } else { + // 扩展 转换为筛选条件进行查询 + if (searchCondition1[i].isSearch) { + if (searchCondition1[i].isFormModel) { + //用formModel中的值 + if (searchCondition1[i].required) { + if ( + formRef.formModel[searchCondition1[i].value] == '' || + formRef.formModel[searchCondition1[i].value] == undefined + ) { + message.warning( + searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！' + ) + return + } + } + }else { + params.value[searchCondition1[i].key] = searchCondition1[i].value + } + } else { + params.value[searchCondition1[i].key] = searchCondition1[i].value + } + } + } + } + await pageApi.value(params.value).then(async (res) => { + list.value = res ? res : [] + let arr1 = val.split(',').map(item=>item.trim()) + if (arr1.length != res.length) { + let arr2 = res.map((item) => item[field]) + let str = [ + ...arr1.filter((item) => !arr2.includes(item)), + ...arr2.filter((item) => !arr1.includes(item)) + ].join(',') + message.alert('代码' + str + '没有找到对应数据') + return + } else { + let repeatCode = [] + if(tableData.length > 0){ + tableData.forEach((item) => { + const findIndex = arr1.findIndex(valItem=>valItem==item[field]) + if(findIndex > -1){ + arr1.splice(findIndex,1) + repeatCode.push(item.itemCode) + } + }) + } + if(repeatCode.length>0){ + message.warning(`${t('ts.代码')}${repeatCode.join(',')}${t('ts.已经存在')}`); + return; + } + callback(list.value) + } + }) +} diff --git a/src/api/wms/countPlanMain/index.ts b/src/api/wms/countPlanMain/index.ts index 69cc8d502..e292f6d42 100644 --- a/src/api/wms/countPlanMain/index.ts +++ b/src/api/wms/countPlanMain/index.ts @@ -8,6 +8,7 @@ export interface CountPlanMainVO { ignoreListOfItem: string ignoreListOfLocation: string scopeList: string + countSplitType: string number: string businessType: string remark: string diff --git a/src/api/wms/customeritem/index.ts b/src/api/wms/customeritem/index.ts index c4c27e8a7..b9af7035d 100644 --- a/src/api/wms/customeritem/index.ts +++ b/src/api/wms/customeritem/index.ts @@ -72,4 +72,9 @@ export const getPageBusinessTypeToItemCode = async (params) => { } else { return await request.get({ url: `/wms/customeritem/pageBusinessTypeToItemCode`, params }) } -} \ No newline at end of file +} + +// 根据code获取数据列表 +export const getCustomerItemListByCodes = async (data) => { + return await request.get({ url: `/wms/customeritem/listByCodes?itemCodes=` + data.itemCodes + '&customerCode='+data.customerCode + '&businessType='+(data.businessType?data.businessType:'') }) +} diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts index f45e61a27..e3303bbd1 100644 --- a/src/api/wms/demandforecastingDetail/index.ts +++ b/src/api/wms/demandforecastingDetail/index.ts @@ -1,4 +1,6 @@ import request from '@/config/axios' +import { isString } from '@/utils/is' +import dayjs from 'dayjs' export interface DemandforecastingDetailVO { predictTimeType: string @@ -15,6 +17,57 @@ export interface DemandforecastingDetailVO { available: string } +// 要货预测-列表和头部请求参数 +const getPageParams = (params)=>{ + // 到货日期 + if(params.dueDate&¶ms.dueDate.length>0){ + if(isString(params.dueDate[0])){ + params.startDate = params.dueDate[0] + }else{ + params.startDate = params.dueDate[0].format('YYYY-MM-DD') + } + + } + if(params.dueDate&¶ms.dueDate.length>1){ + if(isString(params.dueDate[1])){ + params.endDate = params.dueDate[1] + }else{ + params.endDate = params.dueDate[1].format('YYYY-MM-DD') + } + } + params.dueDate = '' + + //计划员 + if(params.planerId&¶ms.planerId.length>0){ + params.planers = params.planerId.join(',') + } + params.planerId = '' + // 供应商代码 + if(params.supplierCode&¶ms.supplierCode.length>0){ + let keyValue = params.supplierCode.split(' ') + keyValue.forEach(item=>{item = item.trim()}) + params.supplierCodes = keyValue.join(',') + } + params.supplierCode = '' + + // 物料代码 + if(params.itemCode&¶ms.itemCode.length>0){ + let keyValue = params.itemCode.split(' ') + keyValue.forEach(item=>{item = item.trim()}) + params.itemCodes = keyValue.join(',') + } + params.itemCode = '' + + // 版本号 + if(params.version&¶ms.version.length>0){ + let keyValue = params.version.split(' ') + keyValue.forEach(item=>{item = item.trim()}) + params.versions = keyValue.join(',') + } + params.version = '' + return params +} + // 查询要货预测子列表 export const getDemandforecastingDetailPage = async (params) => { if (params.isSearch) { @@ -22,6 +75,8 @@ export const getDemandforecastingDetailPage = async (params) => { const data = {...params} return await request.post({ url: '/wms/demandforecasting-detail/senior', data }) } else { + params = getPageParams(params) + console.log('params',params) return await request.get({ url: `/wms/demandforecasting-detail/page`, params }) } } @@ -50,3 +105,16 @@ export const deleteDemandforecastingDetail = async (id: number) => { export const exportDemandforecastingDetail = async (params) => { return await request.download({ url: `/wms/demandforecasting-detail/export-excel`, params }) } + +// 查询要货预测主列表 +export const getPageTableHead = async (params) => { + params = getPageParams(params) + console.log('params',params) + return await request.get({ url: `/wms/demandforecasting-detail/queryPageTableHead`, params }) +} + + +// 查询版本号 +export const queryVersion = async (params) => { + return await request.get({ url: `/wms/demandforecasting-detail/queryVersion`, params }) +} \ No newline at end of file diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts index 68b471769..7d5596a8f 100644 --- a/src/api/wms/demandforecastingMain/index.ts +++ b/src/api/wms/demandforecastingMain/index.ts @@ -80,4 +80,24 @@ export const exportDemandforecastingMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/demandforecasting-main/get-import-template' }) -} \ No newline at end of file +} + + +// 计划员 +export const queryUserPlanerList = async () => { + return await request.post({ url: `/wms/demandforecasting-main/queryUserPlanerList`,data:{} }) + +} + +// 供应商代码 +export const querySupplierList = async (data) => { + return await request.post({ url: `/wms/demandforecasting-main/querySupplierList`,data }) +} + + +// 是否已读接口 +export const updateIsRead = async (data) => { + return await request.post({ url: `/wms/demandforecasting-main/updateIsRead`,data }) +} + + diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts index 25f3566ec..efd0319f0 100644 --- a/src/api/wms/itembasic/index.ts +++ b/src/api/wms/itembasic/index.ts @@ -113,4 +113,9 @@ export const selectConfigToItembasic = async (params) => { // 根据物料代码查计量单位 export const getQueryItemCodeInfo = async (data) => { return await request.post({ url: 'wms/itembasic/queryItemCodeInfo', data }) -} \ No newline at end of file +} +// 根据code获取数据列表 +export const getItemListByCodes = async (params) => { + return await request.get({ url: `/wms/itembasic/listByCodes`,params}) +} + diff --git a/src/api/wms/itempackage/index.ts b/src/api/wms/itempackage/index.ts index 97eb8348e..352a0c9b1 100644 --- a/src/api/wms/itempackage/index.ts +++ b/src/api/wms/itempackage/index.ts @@ -29,7 +29,26 @@ export const getItempackagingPage = async (params) => { return await request.get({ url: `/wms/itempackage/page`, params }) } } - +// 查询物料包装信息树形列表 +export const getItempackagingPageTree = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/itempackage/seniorTree', data }) + } else { + return await request.get({ url: `/wms/itempackage/pageTree`, params }) + } +} +// 查询物料包装信息树形列表 +export const getItempackagingPageTreeSCP = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/itempackage/seniorTreeSCP', data }) + } else { + return await request.get({ url: `/wms/itempackage/pageTreeSCP`, params }) + } +} // 查询物料包装信息 列表--供应商发货申请 export const getItempackagingPageBySupplierdeliver = async (params) => { if (params.isSearch) { @@ -86,3 +105,7 @@ export const exportItempackaging = async (params) => { export const importTemplate = () => { return request.download({ url: '/wms/itempackage/get-import-template' }) } +// 根据code获取数据列表 +export const getItemPackageunitListByCodes = async (data) => { + return await request.get({ url: `/wms/itempackage/listByCodes?itemCode=` + data.itemCode + '&packUnit='+data.packUnit}) +} diff --git a/src/api/wms/mstr/index.ts b/src/api/wms/mstr/index.ts new file mode 100644 index 000000000..f34bc2a89 --- /dev/null +++ b/src/api/wms/mstr/index.ts @@ -0,0 +1,56 @@ +import request from '@/config/axios' + +export interface MstrVO { + id: number + hflccHflcd: string + plProdLine: string + plDesc: string + plMvarAcct: string + plCchgAcct: string + type: string + remark: string + extraProperties: string + concurrencyStamp: number + siteId: string +} + +// 查询产品类信息列表 +export const getMstrPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/mstr/senior', data }) + } else { + return await request.get({ url: `/wms/mstr/page`, params }) + } +} + +// 查询产品类信息详情 +export const getMstr = async (id: number) => { + return await request.get({ url: `/wms/mstr/get?id=` + id }) +} + +// 新增产品类信息 +export const createMstr = async (data: MstrVO) => { + return await request.post({ url: `/wms/mstr/create`, data }) +} + +// 修改产品类信息 +export const updateMstr = async (data: MstrVO) => { + return await request.put({ url: `/wms/mstr/update`, data }) +} + +// 删除产品类信息 +export const deleteMstr = async (id: number) => { + return await request.delete({ url: `/wms/mstr/delete?id=` + id }) +} + +// 导出产品类信息 Excel +export const exportMstr = async (params) => { + return await request.download({ url: `/wms/mstr/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/mstr/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/packageoverJobMain/index.ts b/src/api/wms/packageoverJobMain/index.ts index dcd1df373..6ce1b6c77 100644 --- a/src/api/wms/packageoverJobMain/index.ts +++ b/src/api/wms/packageoverJobMain/index.ts @@ -69,6 +69,10 @@ export const updatePackageoverJobMain = async (data: PackageoverJobMainVO) => { export const deletePackageoverJobMain = async (id: number) => { return await request.delete({ url: `/wms/packageover-job-main/delete?id=` + id }) } +// 关闭翻包任务主 +export const closePackageoverJobMain = async (id: number) => { + return await request.put({ url: `/wms/packageover-job-main/close?id=` + id }) +} // 导出翻包任务主 Excel export const exportPackageoverJobMain = async (params) => { diff --git a/src/api/wms/packageunit/index.ts b/src/api/wms/packageunit/index.ts index 940fabef9..94f053f3a 100644 --- a/src/api/wms/packageunit/index.ts +++ b/src/api/wms/packageunit/index.ts @@ -33,7 +33,26 @@ export const getPackageunitPage = async (params) => { return await request.get({ url: `/wms/packageunit/page`, params }) } } - +// 查询物品包装规格信息 列表树状图 +export const getPackageunitPageTree = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/packageunit/seniorTree', data }) + } else { + return await request.get({ url: `/wms/packageunit/pageTree`, params }) + } +} +// 查询物品父级包装规格信息 +export const getPackageunitPageParent = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/packageunit/seniorParent', data }) + } else { + return await request.get({ url: `/wms/packageunit/pageParent`, params }) + } +} // 查询物品包装规格信息 详情 export const getPackageunit = async (id: number) => { return await request.get({ url: `/wms/packageunit/get?id=` + id }) @@ -69,3 +88,8 @@ export const exportPackageunit = async (params) => { export const importTemplate = () => { return request.download({ url: '/wms/packageunit/get-import-template' }) } + +// 根据code获取数据列表 +export const getPackageunitListByCodes = async (codes: string) => { + return await request.get({ url: `/wms/packageunit/listByCodes?codes=` + codes }) +} diff --git a/src/api/wms/pickJobMain/index.ts b/src/api/wms/pickJobMain/index.ts index 20722e557..3cf2aa47f 100644 --- a/src/api/wms/pickJobMain/index.ts +++ b/src/api/wms/pickJobMain/index.ts @@ -75,7 +75,7 @@ export const exportPickJobMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/pick-job-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/pick-job-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/pick-job-main/export-excel`, params }) } @@ -84,4 +84,4 @@ export const exportPickJobMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/pick-job-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/pickRecordMain/index.ts b/src/api/wms/pickRecordMain/index.ts index bf291181c..78e83914e 100644 --- a/src/api/wms/pickRecordMain/index.ts +++ b/src/api/wms/pickRecordMain/index.ts @@ -62,7 +62,7 @@ export const exportPickRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/pick-record-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/pick-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/pick-record-main/export-excel`, params }) } @@ -71,4 +71,4 @@ export const exportPickRecordMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/pick-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/plansetting/index.ts b/src/api/wms/plansetting/index.ts index 1b703dadc..07badf234 100644 --- a/src/api/wms/plansetting/index.ts +++ b/src/api/wms/plansetting/index.ts @@ -51,7 +51,7 @@ export const exportPlansetting = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/plansetting/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/plansetting/export-excel-senior', data }) } else { return await request.download({ url: `/wms/plansetting/export-excel`, params }) } @@ -60,4 +60,4 @@ export const exportPlansetting = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/plansetting/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/preparetoissueMain/index.ts b/src/api/wms/preparetoissueMain/index.ts index b86b6fcd7..2dd0c8d66 100644 --- a/src/api/wms/preparetoissueMain/index.ts +++ b/src/api/wms/preparetoissueMain/index.ts @@ -107,3 +107,9 @@ export const publish = (id) => { export const resetting = (id) => { return request.put({ url: '/wms/preparetoissue-main/resetting?id=' + id }) } + + +// 创建发料申请 +export const generateIssueRequest = (number) => { + return request.post({ url: '/wms/preparetoissue-main/generateIssueRequest?number=' + number }) +} \ No newline at end of file diff --git a/src/api/wms/process/index.ts b/src/api/wms/process/index.ts index c9e5d1d5f..dda9c6de1 100644 --- a/src/api/wms/process/index.ts +++ b/src/api/wms/process/index.ts @@ -62,4 +62,9 @@ export const importTemplate = () => { // 查询工序列表 export const getProcessNoPage = async (params) => { return await request.get({ url: `/wms/process/noPage`, params }) +} + +// 根据code获取数据列表 +export const getProcessByCodes = async (params) => { + return await request.get({ url: `/wms/process/listByCodes`, params }) } \ No newline at end of file diff --git a/src/api/wms/productionMain/index.ts b/src/api/wms/productionMain/index.ts index 9e4fed120..372b1c85f 100644 --- a/src/api/wms/productionMain/index.ts +++ b/src/api/wms/productionMain/index.ts @@ -179,11 +179,20 @@ export const resetting = (id) => { return request.put({ url: '/wms/production-main/resetting?id=' + id }) } -// 创建备料计划/制品收货申请 -export const generateRequest = (number) => { - return request.post({ url: '/wms/production-main/generateRequest?number=' + number }) +// 创建备料计划 +export const generatePreparetoissue = (number) => { + return request.post({ url: '/wms/production-main/generatePreparetoissue?number=' + number }) } +// 创建制品收货申请 +export const generateProductreceiptRequest = (number) => { + return request.post({ url: '/wms/production-main/generateProductreceiptRequest?number=' + number }) +} + +// 创建发料申请 +export const generateIssueRequest = (number) => { + return request.post({ url: '/wms/preparetoissue-main/generateIssueRequest?number=' + number }) +} diff --git a/src/api/wms/productionlineitem/index.ts b/src/api/wms/productionlineitem/index.ts index cc9716fe3..0b3b03e20 100644 --- a/src/api/wms/productionlineitem/index.ts +++ b/src/api/wms/productionlineitem/index.ts @@ -67,3 +67,8 @@ export const exportProductionlineitem = async (params) => { export const importTemplate = () => { return request.download({ url: '/wms/productionlineitem/get-import-template' }) } + + +export const getProductionLineCodelistByCodes = (data) => { + return request.get({ url: `/wms/productionlineitem/listByCodes?productionLineCode=`+data.productionLineCode +'&itemCodes='+data.itemCodes}) +} diff --git a/src/api/wms/purchasePlanDetail/index.ts b/src/api/wms/purchasePlanDetail/index.ts index 3da2f8973..a436ab74a 100644 --- a/src/api/wms/purchasePlanDetail/index.ts +++ b/src/api/wms/purchasePlanDetail/index.ts @@ -15,7 +15,17 @@ export interface PurchasePlanDetailVO { updater: string available: string } +// 要货预测-列表和头部请求参数 +const getPageParams = (params)=>{ + console.log('params.status',params.status) + // 状态 + if(params.status&¶ms.status.length>0){ + params.statuss = params.status.join(',') + } + params.status = '' + return params +} // 查询要货计划子列表 export const getPurchasePlanDetailPage = async (params) => { if (params.isSearch) { @@ -23,6 +33,7 @@ export const getPurchasePlanDetailPage = async (params) => { const data = {...params} return await request.post({ url: '/wms/purchase-plan-detail/senior', data }) } else { + params = getPageParams(params) return await request.get({ url: `/wms/purchase-plan-detail/page`, params }) } } diff --git a/src/api/wms/purchasePlanMain/index.ts b/src/api/wms/purchasePlanMain/index.ts index 167e3ffd6..9d5e42230 100644 --- a/src/api/wms/purchasePlanMain/index.ts +++ b/src/api/wms/purchasePlanMain/index.ts @@ -85,7 +85,24 @@ export const exportPurchasePlanMain = async (params) => { return await request.download({ url: `/wms/purchase-plan-main/export-excel`, params }) } } - +// 导出明细要货计划主 Excel +export const exportDetailsPurchasePlanMain = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchase-plan-main/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/purchase-plan-main/export-excel-detail`, params }) + } +} +// 导出要货计划二维表 Excel +export const exportTablePurchasePlanMain = async (params) => { + // if (params.isSearch) { + // const data = {...params} + // return await request.downloadPost({ url: `/wms/purchase-plan-main/export-excel-senior`, data }) + // } else { + return await request.download({ url: `/wms/purchase-plan-main/export-excel`, params }) + //} +} // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/purchase-plan-main/get-import-template' }) diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts index 25f05c601..79e546090 100644 --- a/src/api/wms/purchasereceiptJobMain/index.ts +++ b/src/api/wms/purchasereceiptJobMain/index.ts @@ -136,6 +136,6 @@ export const acceptPurchasereceiptJobMain = (id: number) => { } // 拒收采购收货任务主 -export const refusalPurchasereceiptJobMain = (id: number) => { - return request.put({ url: '/wms/purchasereceipt-job-main/refusal?id=' + id }) +export const refusalPurchasereceiptJobMain = (data) => { + return request.post({ url: '/wms/purchasereceipt-job-main/refusal',data}) } diff --git a/src/api/wms/purchasereceiptRecordDetail/index.ts b/src/api/wms/purchasereceiptRecordDetail/index.ts index 41b7aa7b7..4dc9271e7 100644 --- a/src/api/wms/purchasereceiptRecordDetail/index.ts +++ b/src/api/wms/purchasereceiptRecordDetail/index.ts @@ -61,6 +61,19 @@ export const getPurchasereceiptRecordDetailPage = async (params) => { } } + +// 查询采购拒收记录 +export const getPurchasereceiptRecordDetailRefusePage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchasereceipt-record-detail/seniorRefuse', data }) + } else { + return await request.get({ url: `/wms/purchasereceipt-record-detail/pageRefuse`, params }) + } +} + + // 查询备件收货记录子列表 export const getPurchasereceiptRecordDetailPageSpare = async (params) => { if (params.isSearch) { diff --git a/src/api/wms/purchasereceiptRecordMain/index.ts b/src/api/wms/purchasereceiptRecordMain/index.ts index 684984333..017f12336 100644 --- a/src/api/wms/purchasereceiptRecordMain/index.ts +++ b/src/api/wms/purchasereceiptRecordMain/index.ts @@ -89,6 +89,17 @@ export const exportPurchasereceiptRecordMain = async (params) => { } } +// 导出采购收货记录主 Excel +export const exportPurchasereceiptRecordRefuseMain = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior-refuse`, data }) + } else { + return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel-refuse`, params }) + } +} + + // 导出备件收货记录 export const exportSparereceiptRecordMain = async (params) => { if (params.isSearch) { diff --git a/src/api/wms/purchasereceiptRequestDetail/index.ts b/src/api/wms/purchasereceiptRequestDetail/index.ts index 13ce13323..4d5789976 100644 --- a/src/api/wms/purchasereceiptRequestDetail/index.ts +++ b/src/api/wms/purchasereceiptRequestDetail/index.ts @@ -57,6 +57,18 @@ export const getPurchasereceiptRequestDetailPageSpare = async (params) => { } } + +// 查询M类型收货申请子列表 +export const getPurchasereceiptRequestDetailPageOrderMType = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchasereceipt-request-detail/seniorOrderMType', data }) + } else { + return await request.get({ url: `/wms/purchasereceipt-request-detail/pageOrderMType`, params }) + } +} + // 查询采购收货申请子详情 export const getPurchasereceiptRequestDetail = async (id: number) => { return await request.get({ url: `/wms/purchasereceipt-request-detail/get?id=` + id }) diff --git a/src/api/wms/scrapJobMain/index.ts b/src/api/wms/scrapJobMain/index.ts index e2cc48093..61a448a59 100644 --- a/src/api/wms/scrapJobMain/index.ts +++ b/src/api/wms/scrapJobMain/index.ts @@ -85,7 +85,7 @@ export const exportScrapJobMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/scrap-job-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/scrap-job-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/scrap-job-main/export-excel`, params }) } @@ -94,4 +94,4 @@ export const exportScrapJobMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/scrap-job-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/stockupMainJob/index.ts b/src/api/wms/stockupMainJob/index.ts index b9dffb7ff..150609126 100644 --- a/src/api/wms/stockupMainJob/index.ts +++ b/src/api/wms/stockupMainJob/index.ts @@ -84,7 +84,7 @@ export const exportStockupMainJob = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/stockup-main-job/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/stockup-main-job/export-excel-senior', data }) } else { return await request.download({ url: `/wms/stockup-main-job/export-excel`, params }) } @@ -113,4 +113,4 @@ export const closeStockupMainJob = async (id) => { // 执行发货任务主 export const executeStockupMainJob = async (data: StockupMainJobVO) => { return await request.put({ url: `/wms/stockup-main-job/execute`, data }) -} \ No newline at end of file +} diff --git a/src/api/wms/strategy/index.ts b/src/api/wms/strategy/index.ts index d10cd5108..bd26f0071 100644 --- a/src/api/wms/strategy/index.ts +++ b/src/api/wms/strategy/index.ts @@ -46,7 +46,7 @@ export const exportStrategy = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/strategy/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/strategy/export-excel-senior', data }) } else { return await request.download({ url: `/wms/strategy/export-excel`, params }) } diff --git a/src/api/wms/supplier/index.ts b/src/api/wms/supplier/index.ts index 961d949a0..1287bea73 100644 --- a/src/api/wms/supplier/index.ts +++ b/src/api/wms/supplier/index.ts @@ -93,3 +93,9 @@ export const exportSupplierSCP = async (params) => { export const importTemplate = () => { return request.download({ url: '/wms/supplier/get-import-template' }) } + +// 根据code获取数据列表 +export const getSupplierListByCodes = async (codes: string) => { + return await request.get({ url: `/wms/supplier/listByCodes?codes=` + codes }) +} + diff --git a/src/api/wms/supplierCycle/index.ts b/src/api/wms/supplierCycle/index.ts new file mode 100644 index 000000000..ddaf2013e --- /dev/null +++ b/src/api/wms/supplierCycle/index.ts @@ -0,0 +1,65 @@ +import request from '@/config/axios' + +export interface SupplierCycleVO { + id: number + supplierCode: string + monday: string + tuesday: string + wednesday: string + thursday: string + friday: string + saturday: string + sunday: string + version: string + remark: string + extraProperties: string + siteId: string + beginTime: Date + endTime: Date + available: string + status: string + concurrencyStamp: string + ruleUserId: number + departmentCode: string +} + +// 查询要货预测周期列表 +export const getSupplierCyclePage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/supplier-cycle/senior', data }) + } else { + return await request.get({ url: `/wms/supplier-cycle/page`, params }) + } +} + +// 查询要货预测周期详情 +export const getSupplierCycle = async (id: number) => { + return await request.get({ url: `/wms/supplier-cycle/get?id=` + id }) +} + +// 新增要货预测周期 +export const createSupplierCycle = async (data: SupplierCycleVO) => { + return await request.post({ url: `/wms/supplier-cycle/create`, data }) +} + +// 修改要货预测周期 +export const updateSupplierCycle = async (data: SupplierCycleVO) => { + return await request.put({ url: `/wms/supplier-cycle/update`, data }) +} + +// 删除要货预测周期 +export const deleteSupplierCycle = async (id: number) => { + return await request.delete({ url: `/wms/supplier-cycle/delete?id=` + id }) +} + +// 导出要货预测周期 Excel +export const exportSupplierCycle = async (params) => { + return await request.download({ url: `/wms/supplier-cycle/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/supplier-cycle/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/supplierdeliverRequestDetail/index.ts b/src/api/wms/supplierdeliverRequestDetail/index.ts index 64580a04e..ab0609463 100644 --- a/src/api/wms/supplierdeliverRequestDetail/index.ts +++ b/src/api/wms/supplierdeliverRequestDetail/index.ts @@ -43,7 +43,14 @@ export const getSupplierdeliverRequestDetailPage = async (params) => { return await request.get({ url: `/wms/supplierdeliver-request-detail/page`, params }) } } - +// 查询供应商发货申请子列表 +export const getGenerateLabelList = async (params) => { + return await request.get({ url: `/wms/supplierdeliver-request-detail/generateLabelList`, params }) +} +// 查询托规格列表 +export const getGenerateLabelParentList = async (params) => { + return await request.get({ url: `/wms/supplierdeliver-request-detail/generateLabelParentList`, params }) +} // 查询供应商发货申请子详情 export const getSupplierdeliverRequestDetail = async (id: number) => { return await request.get({ url: `/wms/supplierdeliver-request-detail/get?id=` + id }) diff --git a/src/api/wms/supplierinvoiceRequestDetail/index.ts b/src/api/wms/supplierinvoiceRequestDetail/index.ts index 0dd4c5343..f20a6fe16 100644 --- a/src/api/wms/supplierinvoiceRequestDetail/index.ts +++ b/src/api/wms/supplierinvoiceRequestDetail/index.ts @@ -41,7 +41,13 @@ export const getPoNumber = async (params) => { // 查询供应商发票明细数据 export const getPoNumberPoLineInfo = async (params) => { - return await request.get({ url: `/wms/supplierinvoice-request-detail/getPoNumberPoLineInfo`, params}) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: `/wms/supplierinvoice-request-detail/getPoNumbersenior`, data}) + }else{ + return await request.get({ url: `/wms/supplierinvoice-request-detail/getPoNumberPoLineInfo`, params}) + } } diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts index ec37ab88c..f9dbf4ee8 100644 --- a/src/api/wms/supplierinvoiceRequestMain/index.ts +++ b/src/api/wms/supplierinvoiceRequestMain/index.ts @@ -75,8 +75,8 @@ export const subSupplierinvoiceRequestMain = async (id: number) => { return await request.post({ url: `/wms/supplierinvoice-request-main/sub?id=` + id }) } // 采购--审批通过供应商发货申请主 -export const appSupplierinvoiceRequestMain = async (id: number) => { - return await request.post({ url: `/wms/supplierinvoice-request-main/app?id=` + id }) +export const appSupplierinvoiceRequestMain = async (id: number,balanceStatement:any) => { + return await request.post({ url: `/wms/supplierinvoice-request-main/app?id=` + id+ (balanceStatement?'&balanceStatement=' + balanceStatement:'')}) } // 采购--驳回供应商发货申请主 export const rejSupplierinvoiceRequestMain = async (data) => { @@ -89,8 +89,8 @@ export const invoiceSentOutSupplierinvoiceRequestMain = async (id: number) => { } // 财务--审批通过供应商发货申请主 -export const financeappSupplierinvoiceRequestMain = async (id: number) => { - return await request.post({ url: `/wms/supplierinvoice-request-main/financeApp?id=` + id }) +export const financeappSupplierinvoiceRequestMain = async (data) => { + return await request.post({ url: `/wms/supplierinvoice-request-main/financeApp`, data }) } // 财务--驳回供应商发货申请主 export const financerejSupplierinvoiceRequestMain = async (data) => { @@ -147,3 +147,8 @@ export const getLoginUserRoleList = async () => { } +// 编辑的时候计算主表系统税额 +export const getTaxAmount = async ({id,taxRate}) => { + return await request.get({ url: `/wms/supplierinvoice-request-main/computeById?id=${id}&taxRate=${taxRate}`}) + +} \ No newline at end of file diff --git a/src/api/wms/supplieritem/index.ts b/src/api/wms/supplieritem/index.ts index e6002d3c7..274469390 100644 --- a/src/api/wms/supplieritem/index.ts +++ b/src/api/wms/supplieritem/index.ts @@ -51,16 +51,27 @@ export const getSupplieritem = async (id: number) => { export const createSupplieritem = async (data: SupplieritemVO) => { return await request.post({ url: `/wms/supplieritem/create`, data }) } +export const createSupplieritemSCP = async (data: SupplieritemVO) => { + return await request.post({ url: `/wms/supplieritem/createSCP`, data }) +} // 修改供应商物料 export const updateSupplieritem = async (data: SupplieritemVO) => { return await request.put({ url: `/wms/supplieritem/update`, data }) } +// 修改供应商物料 +export const updateSupplieritemSCP = async (data: SupplieritemVO) => { + return await request.put({ url: `/wms/supplieritem/updateSCP`, data }) +} // 删除供应商物料 export const deleteSupplieritem = async (id: number) => { return await request.delete({ url: `/wms/supplieritem/delete?id=` + id }) } +export const deleteSupplieritemSCP = async (id: number) => { + return await request.delete({ url: `/wms/supplieritem/deleteSCP?id=` + id }) +} + // 导出供应商物料 Excel export const exportSupplieritem = async (params) => { @@ -99,4 +110,10 @@ export const selectItembasicTypeToSupplieritem = async (params) => { export const getDefaultLocationCode = async(data: SupplieritemVO)=> { return await request.post({ url: `/wms/supplieritem/getDefaultLocationCode`, data }) -} \ No newline at end of file +} + + +// 根据code获取数据列表 +export const getSupplierItemListByCodes = async (data) => { + return await request.get({ url: `/wms/supplieritem/listByCodes?supplierCode=`+data.supplierCode +'&itemCodes='+data.itemCodes }) +} diff --git a/src/api/wms/warehouse/index.ts b/src/api/wms/warehouse/index.ts index 96e64a813..6c0e25b15 100644 --- a/src/api/wms/warehouse/index.ts +++ b/src/api/wms/warehouse/index.ts @@ -69,4 +69,8 @@ export const pageBusinessTypeToWarehouse = async (params) => { } else { return await request.get({ url: `/wms/warehouse/pageBusinessTypeToWarehouse`, params }) } +} +// 根据code获取数据列表 +export const getWarehouseByCodes = async (params) => { + return await request.get({ url: `/wms/warehouse/listByCodes`, params }) } \ No newline at end of file diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue index 2c7f75bfe..a9f8b472b 100644 --- a/src/components/Annex/src/Annex.vue +++ b/src/components/Annex/src/Annex.vue @@ -3,7 +3,7 @@
-
@@ -56,6 +56,10 @@ const props = defineProps({ return ['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg'] } }, + fileSize:{ + type:Number, + required: false, + }, showPreview: { type: Boolean, required: false diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 854ededeb..e8a2d681f 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -5,126 +5,143 @@ :width="dialogWidth" :close-on-click-modal="false" :vLoading="formLoading" + @updateFullscreen="updateFullscreen" > - -
-
- - \ No newline at end of file diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index 7fb9ee6cf..8b9701825 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -62,8 +62,9 @@ export default defineComponent({ }, searchTableSelectionsList:[],//回显列表 selectionColor: propTypes.bool.def(false), + rowKey: propTypes.string.def(''), }, - emits: ['update:pageSize', 'update:currentPage', 'register', 'update:sort','getSelectionRows'], + emits: ['update:pageSize', 'update:currentPage', 'register', 'update:sort','getSelectionRows','rowClick'], setup(props, { attrs, slots, emit, expose }) { const elTableRef = ref>() @@ -120,12 +121,24 @@ export default defineComponent({ const sortRef = ref() // 选中某行 const selectRow = ()=>{ + console.log(currentPageRef.value,elTableRef.value?.getSelectionRows()) emit('getSelectionRows', currentPageRef.value,elTableRef.value?.getSelectionRows()) } //全选回调 const selectAll = ()=>{ emit('getSelectionRows', currentPageRef.value,elTableRef.value?.getSelectionRows()) } + const rowClick = (row: any, column: any, event: Event)=>{ + // const selected = elTableRef.value?.getSelectionRows().some(item => item.id === row.id) + // if (!selected) { + // elTableRef.value?.toggleRowSelection(row, true); + // } else { + // // 取消 + // elTableRef.value?.toggleRowSelection(row, false); + // } + // console.log(elTableRef.value?.getSelectionRows()) + emit('rowClick',row,column,event) + } //反选 const togglePageSelection = ()=>{ unref(getProps).data.forEach(row=>{ @@ -165,7 +178,8 @@ export default defineComponent({ selectAll, toggleAllSelection, togglePageSelection, - clearSelection + clearSelection, + elTableRef }) const pagination = computed(() => { @@ -388,6 +402,8 @@ export default defineComponent({ onSelect-all={selectAll} onSelection-change={selectionChange} onSort-change={sortChange} + row-key={unref(getProps).rowKey} + onRow-click={rowClick} {...unref(getBindValue)} > {{ @@ -397,7 +413,7 @@ export default defineComponent({ }} {unref(getProps).selectionTotal ? ( -
已选{selections.value.length}条数据
+
已选{selections.value.length}条数据
):undefined} {unref(getProps).pagination ? ( // update by 芋艿：保持和 Pagination 组件一致 @@ -416,18 +432,17 @@ export default defineComponent({ diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index c658bdbba..502cd36e1 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -1,337 +1,422 @@