diff --git a/src/api/mes/wm/productionissue/detail/index.ts b/src/api/mes/wm/productionissue/detail/index.ts new file mode 100644 index 000000000..b900c9101 --- /dev/null +++ b/src/api/mes/wm/productionissue/detail/index.ts @@ -0,0 +1,48 @@ +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 = { + // 查询领料出库明细分页 + getDetailPage: async (params: any) => { + return await request.get({ url: '/mes/wm/production-issue-detail/page', params }) + }, + + // 查询领料出库明细详情 + getDetail: async (id: number) => { + return await request.get({ url: '/mes/wm/production-issue-detail/get?id=' + id }) + }, + + // 新增领料出库明细 + createDetail: async (data: WmProductionIssueDetailVO) => { + return await request.post({ url: '/mes/wm/production-issue-detail/create', data }) + }, + + // 修改领料出库明细 + updateDetail: async (data: WmProductionIssueDetailVO) => { + return await request.put({ url: '/mes/wm/production-issue-detail/update', data }) + }, + + // 删除领料出库明细 + deleteDetail: 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 index 590685f5b..4e43ef077 100644 --- a/src/api/mes/wm/productionissue/index.ts +++ b/src/api/mes/wm/productionissue/index.ts @@ -1,6 +1,5 @@ import request from '@/config/axios' -// TODO @AI：对齐 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/api/mes/wm/itemreceipt/index.ts； // MES 领料出库单行 VO export interface WmProductionIssueLineVO { id?: number @@ -9,8 +8,8 @@ export interface WmProductionIssueLineVO { itemCode?: string itemName?: string specification?: string - unitOfMeasure?: string - quantityIssued: number + unitMeasureName?: string + quantity: number batchId?: number batchCode?: string remark?: string @@ -24,15 +23,8 @@ export interface WmProductionIssueVO { workstationId?: number workstationCode?: string workstationName?: string - workorderId?: number - workorderCode?: string - taskId?: number - taskCode?: string - clientId?: number - clientCode?: string - clientName?: string - clientNickname?: string - issueDate?: string + workOrderId?: number + workOrderCode?: string requiredTime?: string status?: number remark?: string @@ -43,37 +35,47 @@ export interface WmProductionIssueVO { // MES 领料出库单 API export const WmProductionIssueApi = { // 查询领料出库单分页 - getIssuePage: async (params: any) => { + getProductionIssuePage: async (params: any) => { return await request.get({ url: '/mes/wm/production-issue/page', params }) }, // 查询领料出库单详情 - getIssue: async (id: number) => { + getProductionIssue: async (id: number) => { return await request.get({ url: '/mes/wm/production-issue/get?id=' + id }) }, // 新增领料出库单 - createIssue: async (data: WmProductionIssueVO) => { + createProductionIssue: async (data: WmProductionIssueVO) => { return await request.post({ url: '/mes/wm/production-issue/create', data }) }, // 修改领料出库单 - updateIssue: async (data: WmProductionIssueVO) => { + updateProductionIssue: async (data: WmProductionIssueVO) => { return await request.put({ url: '/mes/wm/production-issue/update', data }) }, // 删除领料出库单 - deleteIssue: async (id: number) => { + 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 }) + }, + // 完成领料出库单（执行出库） - finishIssue: async (id: number) => { + finishProductionIssue: async (id: number) => { return await request.put({ url: '/mes/wm/production-issue/finish?id=' + id }) }, // 导出领料出库单 Excel - exportIssue: async (params: any) => { + 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 new file mode 100644 index 000000000..d8f1edcee --- /dev/null +++ b/src/api/mes/wm/productionissue/line/index.ts @@ -0,0 +1,44 @@ +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 + batchCode?: string + remark?: string +} + +// MES 领料出库单行 API +export const WmProductionIssueLineApi = { + // 查询领料出库单行分页 + getLinePage: async (params: any) => { + return await request.get({ url: '/mes/wm/production-issue-line/page', params }) + }, + + // 查询领料出库单行详情 + getLine: async (id: number) => { + return await request.get({ url: '/mes/wm/production-issue-line/get?id=' + id }) + }, + + // 新增领料出库单行 + createLine: async (data: WmProductionIssueLineVO) => { + return await request.post({ url: '/mes/wm/production-issue-line/create', data }) + }, + + // 修改领料出库单行 + updateLine: async (data: WmProductionIssueLineVO) => { + return await request.put({ url: '/mes/wm/production-issue-line/update', data }) + }, + + // 删除领料出库单行 + deleteLine: async (id: number) => { + return await request.delete({ url: '/mes/wm/production-issue-line/delete?id=' + id }) + } +} diff --git a/src/components/MES/ItemSelect.vue b/src/components/MES/ItemSelect.vue deleted file mode 100644 index 40fce0360..000000000 --- a/src/components/MES/ItemSelect.vue +++ /dev/null @@ -1,138 +0,0 @@ - - - - diff --git a/src/components/MES/WorkorderSelect.vue b/src/components/MES/WorkorderSelect.vue deleted file mode 100644 index 9ec01d2ca..000000000 --- a/src/components/MES/WorkorderSelect.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - - diff --git a/src/components/MES/WorkstationSelect.vue b/src/components/MES/WorkstationSelect.vue deleted file mode 100644 index 61d0ed27c..000000000 --- a/src/components/MES/WorkstationSelect.vue +++ /dev/null @@ -1,134 +0,0 @@ - - - - diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 07d8e97e7..61f4ac335 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -294,4 +294,5 @@ export enum DICT_TYPE { MES_RQC_TYPE = 'mes_rqc_type', // MES 退货检验类型 MES_WM_ARRIVAL_NOTICE_STATUS = 'mes_wm_arrival_notice_status', // MES 到货通知单状态 MES_WM_ITEM_RECEIPT_STATUS = 'mes_wm_item_receipt_status', // MES 物料接收单状态 + MES_WM_PRODUCTION_ISSUE_STATUS = 'mes_wm_production_issue_status', // MES 领料出库单状态 } diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts index 4324b8846..6657c606c 100644 --- a/src/views/mes/utils/constants.ts +++ b/src/views/mes/utils/constants.ts @@ -209,6 +209,15 @@ export const MesWmItemReceiptStatusEnum = { CANCELED: MesOrderStatusConstants.CANCELLED } +/** MES 生产领料出库单状态枚举 */ +export const MesWmProductionIssueStatusEnum = { + PREPARE: MesOrderStatusConstants.DRAFT, + APPROVING: MesOrderStatusConstants.APPROVING, + APPROVED: MesOrderStatusConstants.APPROVED, + FINISHED: MesOrderStatusConstants.FINISHED, + CANCELED: MesOrderStatusConstants.CANCELLED +} + /** 获取物料/产品标识的标签 */ export const getItemOrProductLabel = (value: string): string => { for (const item of Object.values(MesItemOrProductEnum)) { diff --git a/src/views/mes/wm/itemreceipt/index.vue b/src/views/mes/wm/itemreceipt/index.vue index b811016a9..2c7f8493b 100644 --- a/src/views/mes/wm/itemreceipt/index.vue +++ b/src/views/mes/wm/itemreceipt/index.vue @@ -155,7 +155,6 @@ > 取消 - 详情 @@ -171,8 +170,8 @@ + + diff --git a/src/views/mes/wm/productionissue/ProductionIssueForm.vue b/src/views/mes/wm/productionissue/ProductionIssueForm.vue index 760c7b148..d94203b6a 100644 --- a/src/views/mes/wm/productionissue/ProductionIssueForm.vue +++ b/src/views/mes/wm/productionissue/ProductionIssueForm.vue @@ -1,23 +1,35 @@ - - diff --git a/src/views/mes/wm/productionissue/ProductionIssueLineList.vue b/src/views/mes/wm/productionissue/ProductionIssueLineList.vue new file mode 100644 index 000000000..604949476 --- /dev/null +++ b/src/views/mes/wm/productionissue/ProductionIssueLineList.vue @@ -0,0 +1,256 @@ + + + + diff --git a/src/views/mes/wm/productionissue/components/ProductionIssueDetail.vue b/src/views/mes/wm/productionissue/components/ProductionIssueDetail.vue deleted file mode 100644 index ca4585145..000000000 --- a/src/views/mes/wm/productionissue/components/ProductionIssueDetail.vue +++ /dev/null @@ -1,274 +0,0 @@ - - - - - - - diff --git a/src/views/mes/wm/productionissue/components/ProductionIssueLine.vue b/src/views/mes/wm/productionissue/components/ProductionIssueLine.vue deleted file mode 100644 index 3221e3966..000000000 --- a/src/views/mes/wm/productionissue/components/ProductionIssueLine.vue +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - - diff --git a/src/views/mes/wm/productionissue/index.vue b/src/views/mes/wm/productionissue/index.vue index a45963202..d67ee7f7a 100644 --- a/src/views/mes/wm/productionissue/index.vue +++ b/src/views/mes/wm/productionissue/index.vue @@ -43,8 +43,12 @@ clearable class="!w-240px" > - - + @@ -94,41 +98,59 @@ /> @@ -140,25 +162,26 @@ /> - +