diff --git a/src/api/mes/wm/outsourcereceipt/detail/index.ts b/src/api/mes/wm/outsourcereceipt/detail/index.ts new file mode 100644 index 000000000..bc44cc4a2 --- /dev/null +++ b/src/api/mes/wm/outsourcereceipt/detail/index.ts @@ -0,0 +1,45 @@ +import request from '@/config/axios' + +// MES 委外收货明细 VO +export interface WmOutsourceReceiptDetailVO { + id: number + lineId: number + receiptId: number + itemId: number + itemCode: string + itemName: string + batchCode: string + quantity: number + locationId: number + locationName: string + remark: string + createTime: string +} + +// MES 委外收货明细 API +export const WmOutsourceReceiptDetailApi = { + // 查询委外收货明细列表(按行编号) + getOutsourceReceiptDetailListByLineId: async (lineId: number) => { + return await request.get({ url: '/mes/wm/outsource-receipt-detail/list-by-line', params: { lineId } }) + }, + + // 查询委外收货明细详情 + getOutsourceReceiptDetail: async (id: number) => { + return await request.get({ url: '/mes/wm/outsource-receipt-detail/get?id=' + id }) + }, + + // 新增委外收货明细 + createOutsourceReceiptDetail: async (data: WmOutsourceReceiptDetailVO) => { + return await request.post({ url: '/mes/wm/outsource-receipt-detail/create', data }) + }, + + // 修改委外收货明细 + updateOutsourceReceiptDetail: async (data: WmOutsourceReceiptDetailVO) => { + return await request.put({ url: '/mes/wm/outsource-receipt-detail/update', data }) + }, + + // 删除委外收货明细 + deleteOutsourceReceiptDetail: async (id: number) => { + return await request.delete({ url: '/mes/wm/outsource-receipt-detail/delete?id=' + id }) + } +} diff --git a/src/api/mes/wm/outsourcereceipt/index.ts b/src/api/mes/wm/outsourcereceipt/index.ts new file mode 100644 index 000000000..83a457b66 --- /dev/null +++ b/src/api/mes/wm/outsourcereceipt/index.ts @@ -0,0 +1,93 @@ +import request from '@/config/axios' + +// MES 委外收货单 VO +export interface WmOutsourceReceiptVO { + id: number + code: string + name: string + vendorId: number + vendorName: string + warehouseId: number + warehouseName: string + receiptDate: string + status: number + remark: string + createTime: string +} + +// MES 委外收货单明细 VO +export interface WmOutsourceReceiptLineVO { + id: number + receiptId: number + itemId: number + itemCode: string + itemName: string + quantity: number + unitId: number + unitName: string + remark: string +} + +// MES 委外收货单详情 VO +export interface WmOutsourceReceiptDetailVO { + id: number + lineId: number + batchCode: string + quantity: number + locationId: number + locationName: string + remark: string +} + +// MES 委外收货单 API +export const WmOutsourceReceiptApi = { + // 查询委外收货单分页 + getOutsourceReceiptPage: async (params: any) => { + return await request.get({ url: '/mes/wm/outsource-receipt/page', params }) + }, + + // 查询委外收货单详情 + getOutsourceReceipt: async (id: number) => { + return await request.get({ url: '/mes/wm/outsource-receipt/get?id=' + id }) + }, + + // 新增委外收货单 + createOutsourceReceipt: async (data: WmOutsourceReceiptVO) => { + return await request.post({ url: '/mes/wm/outsource-receipt/create', data }) + }, + + // 修改委外收货单 + updateOutsourceReceipt: async (data: WmOutsourceReceiptVO) => { + return await request.put({ url: '/mes/wm/outsource-receipt/update', data }) + }, + + // 删除委外收货单 + deleteOutsourceReceipt: async (id: number) => { + return await request.delete({ url: '/mes/wm/outsource-receipt/delete?id=' + id }) + }, + + // 提交委外收货单 + submitOutsourceReceipt: async (id: number) => { + return await request.put({ url: '/mes/wm/outsource-receipt/submit?id=' + id }) + }, + + // 审批委外收货单 + approveOutsourceReceipt: async (id: number) => { + return await request.put({ url: '/mes/wm/outsource-receipt/approve?id=' + id }) + }, + + // 完成委外收货单 + finishOutsourceReceipt: async (id: number) => { + return await request.put({ url: '/mes/wm/outsource-receipt/finish?id=' + id }) + }, + + // 取消委外收货单 + cancelOutsourceReceipt: async (id: number) => { + return await request.put({ url: '/mes/wm/outsource-receipt/cancel?id=' + id }) + }, + + // 导出委外收货单 Excel + exportOutsourceReceipt: async (params: any) => { + return await request.download({ url: '/mes/wm/outsource-receipt/export-excel', params }) + } +} diff --git a/src/api/mes/wm/outsourcereceipt/line/index.ts b/src/api/mes/wm/outsourcereceipt/line/index.ts new file mode 100644 index 000000000..e8d21aaf4 --- /dev/null +++ b/src/api/mes/wm/outsourcereceipt/line/index.ts @@ -0,0 +1,43 @@ +import request from '@/config/axios' + +// MES 委外收货单行 VO +export interface WmOutsourceReceiptLineVO { + id: number + receiptId: number + itemId: number + itemCode: string + itemName: string + quantity: number + unitId: number + unitName: string + remark: string + createTime: string +} + +// MES 委外收货单行 API +export const WmOutsourceReceiptLineApi = { + // 查询委外收货单行分页 + getOutsourceReceiptLinePage: async (params: any) => { + return await request.get({ url: '/mes/wm/outsource-receipt-line/page', params }) + }, + + // 查询委外收货单行详情 + getOutsourceReceiptLine: async (id: number) => { + return await request.get({ url: '/mes/wm/outsource-receipt-line/get?id=' + id }) + }, + + // 新增委外收货单行 + createOutsourceReceiptLine: async (data: WmOutsourceReceiptLineVO) => { + return await request.post({ url: '/mes/wm/outsource-receipt-line/create', data }) + }, + + // 修改委外收货单行 + updateOutsourceReceiptLine: async (data: WmOutsourceReceiptLineVO) => { + return await request.put({ url: '/mes/wm/outsource-receipt-line/update', data }) + }, + + // 删除委外收货单行 + deleteOutsourceReceiptLine: async (id: number) => { + return await request.delete({ url: '/mes/wm/outsource-receipt-line/delete?id=' + id }) + } +} diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts index 5309c4e13..bc01691e1 100644 --- a/src/views/mes/utils/constants.ts +++ b/src/views/mes/utils/constants.ts @@ -236,6 +236,14 @@ export const MesWmProductionIssueStatusEnum = { CANCELED: MesOrderStatusConstants.CANCELLED } +/** MES 杂项入库单状态枚举 */ +export const MesWmMiscReceiptStatusEnum = { + PREPARE: MesOrderStatusConstants.DRAFT, + APPROVED: MesOrderStatusConstants.APPROVED, + FINISHED: MesOrderStatusConstants.FINISHED, + CANCELED: MesOrderStatusConstants.CANCELLED +} + /** MES 供应商退货单状态枚举 */ export const MesWmReturnVendorStatusEnum = { PREPARE: MesOrderStatusConstants.DRAFT, diff --git a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailForm.vue b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailForm.vue new file mode 100644 index 000000000..ec5697545 --- /dev/null +++ b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailForm.vue @@ -0,0 +1,138 @@ + + + + diff --git a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailList.vue b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailList.vue new file mode 100644 index 000000000..3b277ffc4 --- /dev/null +++ b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailList.vue @@ -0,0 +1,76 @@ + + + + diff --git a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptForm.vue b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptForm.vue new file mode 100644 index 000000000..afc74c84a --- /dev/null +++ b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptForm.vue @@ -0,0 +1,192 @@ + + + diff --git a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptLineList.vue b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptLineList.vue new file mode 100644 index 000000000..835c88911 --- /dev/null +++ b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptLineList.vue @@ -0,0 +1,261 @@ + + + + diff --git a/src/views/mes/wm/outsourcereceipt/index.vue b/src/views/mes/wm/outsourcereceipt/index.vue new file mode 100644 index 000000000..3ded6252c --- /dev/null +++ b/src/views/mes/wm/outsourcereceipt/index.vue @@ -0,0 +1,292 @@ + + +