diff --git a/src/api/mes/wm/outsourceissue/detail/index.ts b/src/api/mes/wm/outsourceissue/detail/index.ts new file mode 100644 index 000000000..a2d51defd --- /dev/null +++ b/src/api/mes/wm/outsourceissue/detail/index.ts @@ -0,0 +1,53 @@ +import request from '@/config/axios' + +// MES 外协发料单明细 VO +export interface WmOutsourceIssueDetailVO { + id: number + lineId: number + issueId: number + materialStockId: number + itemId: number + itemCode: string + itemName: string + specification: string + unitMeasureName: string + quantity: number + batchId: number + batchCode: string + warehouseId: number + warehouseName: string + locationId: number + locationName: string + areaId: number + areaName: string + remark: string + createTime: string +} + +// MES 外协发料单明细 API +export const WmOutsourceIssueDetailApi = { + // 查询外协发料单明细列表（按行编号） + getOutsourceIssueDetailListByLineId: async (lineId: number) => { + return await request.get({ url: '/mes/wm/outsource-issue-detail/list-by-line', params: { lineId } }) + }, + + // 查询外协发料单明细详情 + getOutsourceIssueDetail: async (id: number) => { + return await request.get({ url: '/mes/wm/outsource-issue-detail/get?id=' + id }) + }, + + // 新增外协发料单明细 + createOutsourceIssueDetail: async (data: WmOutsourceIssueDetailVO) => { + return await request.post({ url: '/mes/wm/outsource-issue-detail/create', data }) + }, + + // 修改外协发料单明细 + updateOutsourceIssueDetail: async (data: WmOutsourceIssueDetailVO) => { + return await request.put({ url: '/mes/wm/outsource-issue-detail/update', data }) + }, + + // 删除外协发料单明细 + deleteOutsourceIssueDetail: async (id: number) => { + return await request.delete({ url: '/mes/wm/outsource-issue-detail/delete?id=' + id }) + } +} diff --git a/src/api/mes/wm/outsourceissue/index.ts b/src/api/mes/wm/outsourceissue/index.ts new file mode 100644 index 000000000..2eb04a140 --- /dev/null +++ b/src/api/mes/wm/outsourceissue/index.ts @@ -0,0 +1,56 @@ +import request from '@/config/axios' + +// MES 外协发料单 VO +export interface WmOutsourceIssueVO { + id: number + code: string + name: string + vendorId: number + vendorCode: string + vendorName: string + workorderId: number + workorderCode: string + workorderName: string + issueDate: string + status: number + remark: string + createTime: string +} + +// MES 外协发料单 API +export const WmOutsourceIssueApi = { + // 查询外协发料单分页 + getOutsourceIssuePage: async (params: any) => { + return await request.get({ url: '/mes/wm/outsource-issue/page', params }) + }, + + // 查询外协发料单详情 + getOutsourceIssue: async (id: number) => { + return await request.get({ url: '/mes/wm/outsource-issue/get?id=' + id }) + }, + + // 新增外协发料单 + createOutsourceIssue: async (data: WmOutsourceIssueVO) => { + return await request.post({ url: '/mes/wm/outsource-issue/create', data }) + }, + + // 修改外协发料单 + updateOutsourceIssue: async (data: WmOutsourceIssueVO) => { + return await request.put({ url: '/mes/wm/outsource-issue/update', data }) + }, + + // 删除外协发料单 + deleteOutsourceIssue: async (id: number) => { + return await request.delete({ url: '/mes/wm/outsource-issue/delete?id=' + id }) + }, + + // 执行外协发料出库 + executeOutsourceIssue: async (id: number) => { + return await request.put({ url: '/mes/wm/outsource-issue/execute?id=' + id }) + }, + + // 导出外协发料单 Excel + exportOutsourceIssue: async (params: any) => { + return await request.download({ url: '/mes/wm/outsource-issue/export-excel', params }) + } +} diff --git a/src/api/mes/wm/outsourceissue/line/index.ts b/src/api/mes/wm/outsourceissue/line/index.ts new file mode 100644 index 000000000..f00c8e861 --- /dev/null +++ b/src/api/mes/wm/outsourceissue/line/index.ts @@ -0,0 +1,46 @@ +import request from '@/config/axios' + +// MES 外协发料单行 VO +export interface WmOutsourceIssueLineVO { + id: number + issueId: number + materialStockId: number + itemId: number + itemCode: string + itemName: string + specification: string + unitMeasureName: string + quantity: number + batchId: number + batchCode: string + remark: string + createTime: string +} + +// MES 外协发料单行 API +export const WmOutsourceIssueLineApi = { + // 查询外协发料单行分页 + getOutsourceIssueLinePage: async (params: any) => { + return await request.get({ url: '/mes/wm/outsource-issue-line/page', params }) + }, + + // 查询外协发料单行详情 + getOutsourceIssueLine: async (id: number) => { + return await request.get({ url: '/mes/wm/outsource-issue-line/get?id=' + id }) + }, + + // 新增外协发料单行 + createOutsourceIssueLine: async (data: WmOutsourceIssueLineVO) => { + return await request.post({ url: '/mes/wm/outsource-issue-line/create', data }) + }, + + // 修改外协发料单行 + updateOutsourceIssueLine: async (data: WmOutsourceIssueLineVO) => { + return await request.put({ url: '/mes/wm/outsource-issue-line/update', data }) + }, + + // 删除外协发料单行 + deleteOutsourceIssueLine: async (id: number) => { + return await request.delete({ url: '/mes/wm/outsource-issue-line/delete?id=' + id }) + } +} diff --git a/src/utils/dict.ts b/src/utils/dict.ts index ec7b9de44..bd9c59d3a 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -305,4 +305,5 @@ export enum DICT_TYPE { MES_WM_RETURN_SALES_STATUS = 'mes_wm_return_sales_status', // MES 销售退货单状态 MES_WM_PRODUCT_SALES_STATUS = 'mes_wm_product_sales_status', // MES 销售出库单状态 MES_SALES_NOTICE_STATUS = 'mes_sales_notice_status', // MES 发货通知单状态 + MES_WM_MISC_ISSUE_TYPE = 'mes_wm_misc_issue_type', // MES 杂项单类型 } diff --git a/src/views/mes/wm/miscissue/MiscIssueDetailList.vue b/src/views/mes/wm/miscissue/MiscIssueDetailList.vue deleted file mode 100644 index c1c9d2544..000000000 --- a/src/views/mes/wm/miscissue/MiscIssueDetailList.vue +++ /dev/null @@ -1,220 +0,0 @@ - - - - - diff --git a/src/views/mes/wm/miscissue/MiscIssueForm.vue b/src/views/mes/wm/miscissue/MiscIssueForm.vue index 751aeae51..72d4bbe43 100644 --- a/src/views/mes/wm/miscissue/MiscIssueForm.vue +++ b/src/views/mes/wm/miscissue/MiscIssueForm.vue @@ -32,17 +32,16 @@ /> - - + - - + - - @@ -119,7 +116,7 @@ />