diff --git a/src/api/mes/wm/productionissue/detail/index.ts b/src/api/mes/wm/productionissue/detail/index.ts deleted file mode 100644 index ebc3843cb..000000000 --- a/src/api/mes/wm/productionissue/detail/index.ts +++ /dev/null @@ -1,48 +0,0 @@ -import request from '@/config/axios' - -// MES 领料出库明细 VO -export interface WmProductionIssueDetailVO { - id?: number - issueId: number - lineId: number - materialStockId: number - itemId: number - quantity: number - batchId?: number - batchCode?: string - warehouseId: number - warehouseName?: string - locationId?: number - locationName?: string - areaId?: number - areaName?: string - remark?: string -} - -// MES 领料出库明细 API -export const WmProductionIssueDetailApi = { - // 查询领料出库明细列表（按行编号） - getProductionIssueDetailListByLineId: async (lineId: number) => { - return await request.get({ url: '/mes/wm/production-issue-detail/list-by-line', params: { lineId } }) - }, - - // 查询领料出库明细详情 - getProductionIssueDetail: async (id: number) => { - return await request.get({ url: '/mes/wm/production-issue-detail/get?id=' + id }) - }, - - // 新增领料出库明细 - createProductionIssueDetail: async (data: WmProductionIssueDetailVO) => { - return await request.post({ url: '/mes/wm/production-issue-detail/create', data }) - }, - - // 修改领料出库明细 - updateProductionIssueDetail: async (data: WmProductionIssueDetailVO) => { - return await request.put({ url: '/mes/wm/production-issue-detail/update', data }) - }, - - // 删除领料出库明细 - deleteProductionIssueDetail: async (id: number) => { - return await request.delete({ url: '/mes/wm/production-issue-detail/delete?id=' + id }) - } -} diff --git a/src/api/mes/wm/productionissue/index.ts b/src/api/mes/wm/productionissue/index.ts deleted file mode 100644 index 0bb77fafe..000000000 --- a/src/api/mes/wm/productionissue/index.ts +++ /dev/null @@ -1,75 +0,0 @@ -import request from '@/config/axios' - -// MES 领料出库单 VO -export interface WmProductionIssueVO { - id?: number - code?: string - name: string - workstationId?: number - workstationCode?: string - workstationName?: string - workOrderId?: number - workOrderCode?: string - requiredTime?: string - status?: number - remark?: string - createTime?: string -} - -// MES 领料出库单 API -export const WmProductionIssueApi = { - // 查询领料出库单分页 - getProductionIssuePage: async (params: any) => { - return await request.get({ url: '/mes/wm/production-issue/page', params }) - }, - - // 查询领料出库单详情 - getProductionIssue: async (id: number) => { - return await request.get({ url: '/mes/wm/production-issue/get?id=' + id }) - }, - - // 新增领料出库单 - createProductionIssue: async (data: WmProductionIssueVO) => { - return await request.post({ url: '/mes/wm/production-issue/create', data }) - }, - - // 修改领料出库单 - updateProductionIssue: async (data: WmProductionIssueVO) => { - return await request.put({ url: '/mes/wm/production-issue/update', data }) - }, - - // 删除领料出库单 - deleteProductionIssue: async (id: number) => { - return await request.delete({ url: '/mes/wm/production-issue/delete?id=' + id }) - }, - - // 提交领料出库单（进入审批流程） - submitProductionIssue: async (id: number) => { - return await request.put({ url: '/mes/wm/production-issue/submit?id=' + id }) - }, - - // 执行拣货 - stockProductionIssue: async (id: number) => { - return await request.put({ url: '/mes/wm/production-issue/stock?id=' + id }) - }, - - // 取消领料出库单 - cancelProductionIssue: async (id: number) => { - return await request.put({ url: '/mes/wm/production-issue/cancel?id=' + id }) - }, - - // 完成领料出库单（执行出库） - finishProductionIssue: async (id: number) => { - return await request.put({ url: '/mes/wm/production-issue/finish?id=' + id }) - }, - - // 校验领料出库单数量（每行明细数量之和是否等于行领料数量） - checkProductionIssueQuantity: async (id: number) => { - return await request.get({ url: '/mes/wm/production-issue/check-quantity?id=' + id }) - }, - - // 导出领料出库单 Excel - exportProductionIssue: async (params: any) => { - return await request.download({ url: '/mes/wm/production-issue/export-excel', params }) - } -} diff --git a/src/api/mes/wm/productionissue/line/index.ts b/src/api/mes/wm/productionissue/line/index.ts deleted file mode 100644 index 4d280f71a..000000000 --- a/src/api/mes/wm/productionissue/line/index.ts +++ /dev/null @@ -1,43 +0,0 @@ -import request from '@/config/axios' - -// MES 领料出库单行 VO -export interface WmProductionIssueLineVO { - id?: number - issueId: number - itemId: number - itemCode?: string - itemName?: string - specification?: string - unitMeasureName?: string - quantity: number - batchId?: number - remark?: string -} - -// MES 领料出库单行 API -export const WmProductionIssueLineApi = { - // 查询领料出库单行分页 - getProductionIssueLinePage: async (params: any) => { - return await request.get({ url: '/mes/wm/production-issue-line/page', params }) - }, - - // 查询领料出库单行详情 - getProductionIssueLine: async (id: number) => { - return await request.get({ url: '/mes/wm/production-issue-line/get?id=' + id }) - }, - - // 新增领料出库单行 - createProductionIssueLine: async (data: WmProductionIssueLineVO) => { - return await request.post({ url: '/mes/wm/production-issue-line/create', data }) - }, - - // 修改领料出库单行 - updateProductionIssueLine: async (data: WmProductionIssueLineVO) => { - return await request.put({ url: '/mes/wm/production-issue-line/update', data }) - }, - - // 删除领料出库单行 - deleteProductionIssueLine: async (id: number) => { - return await request.delete({ url: '/mes/wm/production-issue-line/delete?id=' + id }) - } -} diff --git a/src/api/mes/wm/productissue/detail/index.ts b/src/api/mes/wm/productissue/detail/index.ts new file mode 100644 index 000000000..41a350a9c --- /dev/null +++ b/src/api/mes/wm/productissue/detail/index.ts @@ -0,0 +1,48 @@ +import request from '@/config/axios' + +// MES 领料出库明细 VO +export interface WmProductIssueDetailVO { + id?: number + issueId: number + lineId: number + materialStockId: number + itemId: number + quantity: number + batchId?: number + batchCode?: string + warehouseId: number + warehouseName?: string + locationId?: number + locationName?: string + areaId?: number + areaName?: string + remark?: string +} + +// MES 领料出库明细 API +export const WmProductIssueDetailApi = { + // 查询领料出库明细列表（按行编号） + getProductIssueDetailListByLineId: async (lineId: number) => { + return await request.get({ url: '/mes/wm/product-issue-detail/list-by-line', params: { lineId } }) + }, + + // 查询领料出库明细详情 + getProductIssueDetail: async (id: number) => { + return await request.get({ url: '/mes/wm/product-issue-detail/get?id=' + id }) + }, + + // 新增领料出库明细 + createProductIssueDetail: async (data: WmProductIssueDetailVO) => { + return await request.post({ url: '/mes/wm/product-issue-detail/create', data }) + }, + + // 修改领料出库明细 + updateProductIssueDetail: async (data: WmProductIssueDetailVO) => { + return await request.put({ url: '/mes/wm/product-issue-detail/update', data }) + }, + + // 删除领料出库明细 + deleteProductIssueDetail: async (id: number) => { + return await request.delete({ url: '/mes/wm/product-issue-detail/delete?id=' + id }) + } +} diff --git a/src/api/mes/wm/productissue/index.ts b/src/api/mes/wm/productissue/index.ts new file mode 100644 index 000000000..83747a536 --- /dev/null +++ b/src/api/mes/wm/productissue/index.ts @@ -0,0 +1,75 @@ +import request from '@/config/axios' + +// MES 领料出库单 VO +export interface WmProductIssueVO { + id?: number + code?: string + name: string + workstationId?: number + workstationCode?: string + workstationName?: string + workOrderId?: number + workOrderCode?: string + requiredTime?: string + status?: number + remark?: string + createTime?: string +} + +// MES 领料出库单 API +export const WmProductIssueApi = { + // 查询领料出库单分页 + getProductIssuePage: async (params: any) => { + return await request.get({ url: '/mes/wm/product-issue/page', params }) + }, + + // 查询领料出库单详情 + getProductIssue: async (id: number) => { + return await request.get({ url: '/mes/wm/product-issue/get?id=' + id }) + }, + + // 新增领料出库单 + createProductIssue: async (data: WmProductIssueVO) => { + return await request.post({ url: '/mes/wm/product-issue/create', data }) + }, + + // 修改领料出库单 + updateProductIssue: async (data: WmProductIssueVO) => { + return await request.put({ url: '/mes/wm/product-issue/update', data }) + }, + + // 删除领料出库单 + deleteProductIssue: async (id: number) => { + return await request.delete({ url: '/mes/wm/product-issue/delete?id=' + id }) + }, + + // 提交领料出库单（进入审批流程） + submitProductIssue: async (id: number) => { + return await request.put({ url: '/mes/wm/product-issue/submit?id=' + id }) + }, + + // 执行拣货 + stockProductIssue: async (id: number) => { + return await request.put({ url: '/mes/wm/product-issue/stock?id=' + id }) + }, + + // 取消领料出库单 + cancelProductIssue: async (id: number) => { + return await request.put({ url: '/mes/wm/product-issue/cancel?id=' + id }) + }, + + // 完成领料出库单（执行出库） + finishProductIssue: async (id: number) => { + return await request.put({ url: '/mes/wm/product-issue/finish?id=' + id }) + }, + + // 校验领料出库单数量（每行明细数量之和是否等于行领料数量） + checkProductIssueQuantity: async (id: number) => { + return await request.get({ url: '/mes/wm/product-issue/check-quantity?id=' + id }) + }, + + // 导出领料出库单 Excel + exportProductIssue: async (params: any) => { + return await request.download({ url: '/mes/wm/product-issue/export-excel', params }) + } +} diff --git a/src/api/mes/wm/productissue/line/index.ts b/src/api/mes/wm/productissue/line/index.ts new file mode 100644 index 000000000..9a808d4f5 --- /dev/null +++ b/src/api/mes/wm/productissue/line/index.ts @@ -0,0 +1,43 @@ +import request from '@/config/axios' + +// MES 领料出库单行 VO +export interface WmProductIssueLineVO { + id?: number + issueId: number + itemId: number + itemCode?: string + itemName?: string + specification?: string + unitMeasureName?: string + quantity: number + batchId?: number + remark?: string +} + +// MES 领料出库单行 API +export const WmProductIssueLineApi = { + // 查询领料出库单行分页 + getProductIssueLinePage: async (params: any) => { + return await request.get({ url: '/mes/wm/product-issue-line/page', params }) + }, + + // 查询领料出库单行详情 + getProductIssueLine: async (id: number) => { + return await request.get({ url: '/mes/wm/product-issue-line/get?id=' + id }) + }, + + // 新增领料出库单行 + createProductIssueLine: async (data: WmProductIssueLineVO) => { + return await request.post({ url: '/mes/wm/product-issue-line/create', data }) + }, + + // 修改领料出库单行 + updateProductIssueLine: async (data: WmProductIssueLineVO) => { + return await request.put({ url: '/mes/wm/product-issue-line/update', data }) + }, + + // 删除领料出库单行 + deleteProductIssueLine: async (id: number) => { + return await request.delete({ url: '/mes/wm/product-issue-line/delete?id=' + id }) + } +} diff --git a/src/api/mes/wm/returnvendor/detail/index.ts b/src/api/mes/wm/return-vendor/detail/index.ts similarity index 100% rename from src/api/mes/wm/returnvendor/detail/index.ts rename to src/api/mes/wm/return-vendor/detail/index.ts diff --git a/src/api/mes/wm/returnvendor/index.ts b/src/api/mes/wm/return-vendor/index.ts similarity index 100% rename from src/api/mes/wm/returnvendor/index.ts rename to src/api/mes/wm/return-vendor/index.ts diff --git a/src/api/mes/wm/returnvendor/line/index.ts b/src/api/mes/wm/return-vendor/line/index.ts similarity index 100% rename from src/api/mes/wm/returnvendor/line/index.ts rename to src/api/mes/wm/return-vendor/line/index.ts diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 70f1eb5f9..e4bbc7bdc 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -302,7 +302,7 @@ export enum DICT_TYPE { MES_WM_STOCK_TAKING_LINE_STATUS = 'mes_wm_stock_taking_task_line_status', // MES 盘点任务行状态 MES_WM_STOCK_TAKING_PLAN_PARAM_TYPE = 'mes_wm_stock_taking_plan_param_type', // MES 盘点方案参数类型 MES_WM_OUTSOURCE_RECPT_STATUS = 'mes_wm_outsource_recpt_status', // MES 外协入库单状态 - MES_WM_PRODUCTION_ISSUE_STATUS = 'mes_wm_production_issue_status', // MES 领料出库单状态 + MES_WM_PRODUCT_ISSUE_STATUS = 'mes_wm_product_issue_status', // MES 领料出库单状态 MES_PRODUCT_PRODUCE_STATUS = 'mes_product_produce_status', // MES 生产入库单状态 MES_RETURN_VENDOR_STATUS = 'mes_return_vendor_status', // MES 供应商退货单状态 MES_WM_QUALITY_STATUS = 'mes_wm_quality_status', // MES 质量状态 diff --git a/src/views/mes/qc/iqc/index.vue b/src/views/mes/qc/iqc/index.vue index ad55d1bb3..099afe7b5 100644 --- a/src/views/mes/qc/iqc/index.vue +++ b/src/views/mes/qc/iqc/index.vue @@ -268,7 +268,7 @@ const openForm = (type: string, id?: number) => { const handleComplete = async (id: number) => { try { await message.confirm('是否完成来料检验单编制？【完成后将不能更改】') - await QcIqcApi.completeIqc(id) + await QcIqcApi.finishIqc(id) message.success('完成成功') await getList() } catch {} diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts index f5c1f25bc..5bb206472 100644 --- a/src/views/mes/utils/constants.ts +++ b/src/views/mes/utils/constants.ts @@ -269,7 +269,7 @@ export const MesWmOutsourceRecptStatusEnum = { } /** MES 生产领料出库单状态枚举 */ -export const MesWmProductionIssueStatusEnum = { +export const MesWmProductIssueStatusEnum = { PREPARE: MesOrderStatusConstants.DRAFT, APPROVING: MesOrderStatusConstants.APPROVING, APPROVED: MesOrderStatusConstants.APPROVED, diff --git a/src/views/mes/wm/productionissue/ProductionIssueDetailForm.vue b/src/views/mes/wm/productissue/ProductIssueDetailForm.vue similarity index 91% rename from src/views/mes/wm/productionissue/ProductionIssueDetailForm.vue rename to src/views/mes/wm/productissue/ProductIssueDetailForm.vue index 898c1e0d8..a8e2b4d15 100644 --- a/src/views/mes/wm/productionissue/ProductionIssueDetailForm.vue +++ b/src/views/mes/wm/productissue/ProductIssueDetailForm.vue @@ -45,15 +45,15 @@