diff --git a/src/api/mes/pro/workorder/bom/index.ts b/src/api/mes/pro/workorder/bom/index.ts index 6d76153c8..6d5059ca1 100644 --- a/src/api/mes/pro/workorder/bom/index.ts +++ b/src/api/mes/pro/workorder/bom/index.ts @@ -1,44 +1,43 @@ import request from '@/config/axios' // MES 生产工单 BOM VO -export interface ProWorkorderBomVO { +export interface ProWorkOrderBomVO { id: number // 编号 - workorderId: number // 生产工单编号 + workOrderId: number // 生产工单编号 itemId: number // BOM 物料编号 itemName: string // 物料名称 itemCode: string // 物料编码 itemSpec: string // 规格型号 unitMeasureId: number // 单位编号 unitMeasureName: string // 单位名称 - itemOrProduct: string // 物料产品标识 quantity: number // 预计使用量 remark: string // 备注 } // MES 生产工单 BOM API -export const ProWorkorderBomApi = { +export const ProWorkOrderBomApi = { // 查询工单 BOM 分页 - getWorkorderBomPage: async (params: any) => { - return await request.get({ url: `/mes/pro/workorder-bom/page`, params }) + getWorkOrderBomPage: async (params: any) => { + return await request.get({ url: `/mes/pro/work-order-bom/page`, params }) }, // 查询工单 BOM 详情 - getWorkorderBom: async (id: number) => { - return await request.get({ url: `/mes/pro/workorder-bom/get?id=` + id }) + getWorkOrderBom: async (id: number) => { + return await request.get({ url: `/mes/pro/work-order-bom/get?id=` + id }) }, // 新增工单 BOM - createWorkorderBom: async (data: ProWorkorderBomVO) => { - return await request.post({ url: `/mes/pro/workorder-bom/create`, data }) + createWorkOrderBom: async (data: ProWorkOrderBomVO) => { + return await request.post({ url: `/mes/pro/work-order-bom/create`, data }) }, // 修改工单 BOM - updateWorkorderBom: async (data: ProWorkorderBomVO) => { - return await request.put({ url: `/mes/pro/workorder-bom/update`, data }) + updateWorkOrderBom: async (data: ProWorkOrderBomVO) => { + return await request.put({ url: `/mes/pro/work-order-bom/update`, data }) }, // 删除工单 BOM - deleteWorkorderBom: async (id: number) => { - return await request.delete({ url: `/mes/pro/workorder-bom/delete?id=` + id }) + deleteWorkOrderBom: async (id: number) => { + return await request.delete({ url: `/mes/pro/work-order-bom/delete?id=` + id }) } } diff --git a/src/api/mes/pro/workorder/index.ts b/src/api/mes/pro/workorder/index.ts index b7f197017..f56f22922 100644 --- a/src/api/mes/pro/workorder/index.ts +++ b/src/api/mes/pro/workorder/index.ts @@ -1,7 +1,7 @@ import request from '@/config/axios' // MES 生产工单 VO -export interface ProWorkorderVO { +export interface ProWorkOrderVO { id: number // 编号 code: string // 工单编码 name: string // 工单名称 @@ -25,7 +25,6 @@ export interface ProWorkorderVO { batchCode: string // 批次号 requestDate: Date // 需求日期 parentId: number // 父工单编号 - ancestors: string // 所有父节点编号 finishDate: Date // 完成时间 cancelDate: Date // 取消时间 status: number // 工单状态 @@ -33,44 +32,44 @@ export interface ProWorkorderVO { } // MES 生产工单 API -export const ProWorkorderApi = { +export const ProWorkOrderApi = { // 查询生产工单分页 - getWorkorderPage: async (params: any) => { - return await request.get({ url: `/mes/pro/workorder/page`, params }) + getWorkOrderPage: async (params: any) => { + return await request.get({ url: `/mes/pro/work-order/page`, params }) }, // 查询生产工单详情 - getWorkorder: async (id: number) => { - return await request.get({ url: `/mes/pro/workorder/get?id=` + id }) + getWorkOrder: async (id: number) => { + return await request.get({ url: `/mes/pro/work-order/get?id=` + id }) }, // 新增生产工单 - createWorkorder: async (data: ProWorkorderVO) => { - return await request.post({ url: `/mes/pro/workorder/create`, data }) + createWorkOrder: async (data: ProWorkOrderVO) => { + return await request.post({ url: `/mes/pro/work-order/create`, data }) }, // 修改生产工单 - updateWorkorder: async (data: ProWorkorderVO) => { - return await request.put({ url: `/mes/pro/workorder/update`, data }) + updateWorkOrder: async (data: ProWorkOrderVO) => { + return await request.put({ url: `/mes/pro/work-order/update`, data }) }, // 删除生产工单 - deleteWorkorder: async (id: number) => { - return await request.delete({ url: `/mes/pro/workorder/delete?id=` + id }) + deleteWorkOrder: async (id: number) => { + return await request.delete({ url: `/mes/pro/work-order/delete?id=` + id }) }, // 导出生产工单 Excel - exportWorkorder: async (params: any) => { - return await request.download({ url: `/mes/pro/workorder/export-excel`, params }) + exportWorkOrder: async (params: any) => { + return await request.download({ url: `/mes/pro/work-order/export-excel`, params }) }, // 完成工单 - finishWorkorder: async (id: number) => { - return await request.put({ url: `/mes/pro/workorder/finish?id=` + id }) + finishWorkOrder: async (id: number) => { + return await request.put({ url: `/mes/pro/work-order/finish?id=` + id }) }, // 取消工单 - cancelWorkorder: async (id: number) => { - return await request.put({ url: `/mes/pro/workorder/cancel?id=` + id }) + cancelWorkOrder: async (id: number) => { + return await request.put({ url: `/mes/pro/work-order/cancel?id=` + id }) } } diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 7cfce22a2..7d8caecf0 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -266,7 +266,7 @@ export enum DICT_TYPE { MES_INDEX_TYPE = 'mes_index_type', // MES 检测项类型 MES_QC_RESULT_TYPE = 'mes_qc_result_type', // MES 质检结果值类型 MES_DEFECT_LEVEL = 'mes_defect_level', // MES 缺陷等级 - MES_PRO_WORKORDER_STATUS = 'mes_pro_workorder_status', // MES 生产工单状态 - MES_PRO_WORKORDER_SOURCE_TYPE = 'mes_pro_workorder_source_type', // MES 工单来源类型 - MES_PRO_WORKORDER_TYPE = 'mes_pro_workorder_type' // MES 工单类型 + MES_PRO_WORK_ORDER_STATUS = 'mes_pro_work_order_status', // MES 生产工单状态 + MES_PRO_WORK_ORDER_SOURCE_TYPE = 'mes_pro_work_order_source_type', // MES 工单来源类型 + MES_PRO_WORK_ORDER_TYPE = 'mes_pro_work_order_type' // MES 工单类型 } diff --git a/src/views/mes/pro/workorder/WorkorderBom.vue b/src/views/mes/pro/workorder/WorkorderBom.vue index 8683ad246..f33280167 100644 --- a/src/views/mes/pro/workorder/WorkorderBom.vue +++ b/src/views/mes/pro/workorder/WorkorderBom.vue @@ -13,11 +13,7 @@ - - - + @@ -36,6 +32,8 @@ /> + + - - - - - -