From c2e397e84c6d60c91112f402f6bc335dbd6e14a6 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 1 Mar 2026 14:34:11 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E4=BA=A7=E5=93=81=E6=94=B6=E8=B4=A7=E5=8D=95=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=B1=BB=E5=92=8C=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 重命名产品收货单及其相关的 VO、DO、Service 和 API 接口，以统一命名为“Receipt”，提升代码可读性和一致性。此变更包括多个文件的重命名和相应的引用更新，确保系统功能不受影响。 --- src/api/mes/wm/productreceipt/detail/index.ts | 53 +++++++++++++ src/api/mes/wm/productreceipt/index.ts | 77 +++++++++++++++++++ src/api/mes/wm/productreceipt/line/index.ts | 45 +++++++++++ src/api/mes/wm/productrecpt/detail/index.ts | 53 ------------- src/api/mes/wm/productrecpt/index.ts | 77 ------------------- src/api/mes/wm/productrecpt/line/index.ts | 45 ----------- src/utils/dict.ts | 2 +- src/views/mes/utils/constants.ts | 2 +- .../ProductReceiptDetailForm.vue} | 20 ++--- .../ProductReceiptDetailList.vue} | 12 +-- .../ProductReceiptForm.vue} | 20 ++--- .../ProductReceiptLineList.vue} | 42 +++++----- .../index.vue | 54 ++++++------- 13 files changed, 251 insertions(+), 251 deletions(-) create mode 100644 src/api/mes/wm/productreceipt/detail/index.ts create mode 100644 src/api/mes/wm/productreceipt/index.ts create mode 100644 src/api/mes/wm/productreceipt/line/index.ts delete mode 100644 src/api/mes/wm/productrecpt/detail/index.ts delete mode 100644 src/api/mes/wm/productrecpt/index.ts delete mode 100644 src/api/mes/wm/productrecpt/line/index.ts rename src/views/mes/wm/{productrecpt/ProductRecptDetailForm.vue => productreceipt/ProductReceiptDetailForm.vue} (88%) rename src/views/mes/wm/{productrecpt/ProductRecptDetailList.vue => productreceipt/ProductReceiptDetailList.vue} (81%) rename src/views/mes/wm/{productrecpt/ProductRecptForm.vue => productreceipt/ProductReceiptForm.vue} (88%) rename src/views/mes/wm/{productrecpt/ProductRecptLineList.vue => productreceipt/ProductReceiptLineList.vue} (86%) rename src/views/mes/wm/{productrecpt => productreceipt}/index.vue (80%) diff --git a/src/api/mes/wm/productreceipt/detail/index.ts b/src/api/mes/wm/productreceipt/detail/index.ts new file mode 100644 index 000000000..3755676de --- /dev/null +++ b/src/api/mes/wm/productreceipt/detail/index.ts @@ -0,0 +1,53 @@ +import request from '@/config/axios' + +// MES 产品入库单明细 VO +export interface WmProductReceiptDetailVO { + id: number + lineId: number + receiptId: number + itemId: number + itemCode: string + quantity: number + batchId: number + warehouseId: number + warehouseName: string + locationId: number + locationName: string + areaId: number + areaName: string + remark: string + createTime: string +} + +// MES 产品入库单明细 API +export const WmProductReceiptDetailApi = { + // 查询产品入库单明细列表 + getProductReceiptDetailList: async (params: any) => { + return await request.get({ url: '/mes/wm/product-receipt-detail/list', params }) + }, + + // 根据行项目ID查询产品入库单明细列表 + getProductReceiptDetailListByLineId: async (lineId: number) => { + return await request.get({ url: '/mes/wm/product-receipt-detail/list-by-line', params: { lineId } }) + }, + + // 查询产品入库单明细详情 + getProductReceiptDetail: async (id: number) => { + return await request.get({ url: '/mes/wm/product-receipt-detail/get?id=' + id }) + }, + + // 新增产品入库单明细 + createProductReceiptDetail: async (data: WmProductReceiptDetailVO) => { + return await request.post({ url: '/mes/wm/product-receipt-detail/create', data }) + }, + + // 修改产品入库单明细 + updateProductReceiptDetail: async (data: WmProductReceiptDetailVO) => { + return await request.put({ url: '/mes/wm/product-receipt-detail/update', data }) + }, + + // 删除产品入库单明细 + deleteProductReceiptDetail: async (id: number) => { + return await request.delete({ url: '/mes/wm/product-receipt-detail/delete?id=' + id }) + } +} diff --git a/src/api/mes/wm/productreceipt/index.ts b/src/api/mes/wm/productreceipt/index.ts new file mode 100644 index 000000000..69fee59b2 --- /dev/null +++ b/src/api/mes/wm/productreceipt/index.ts @@ -0,0 +1,77 @@ +import request from '@/config/axios' + +// MES 产品入库单 VO +export interface WmProductReceiptVO { + id: number + code: string + name: string + workOrderId: number + workOrderCode: string + itemId: number + itemCode: string + itemName: string + specification: string + unitMeasureName: string + receiptDate: string + status: number + remark: string + createTime: string +} + +// MES 产品入库单 API +export const WmProductReceiptApi = { + // 查询产品入库单分页 + getProductReceiptPage: async (params: any) => { + return await request.get({ url: '/mes/wm/product-receipt/page', params }) + }, + + // 查询产品入库单详情 + getProductReceipt: async (id: number) => { + return await request.get({ url: '/mes/wm/product-receipt/get?id=' + id }) + }, + + // 新增产品入库单 + createProductReceipt: async (data: WmProductReceiptVO) => { + return await request.post({ url: '/mes/wm/product-receipt/create', data }) + }, + + // 修改产品入库单 + updateProductReceipt: async (data: WmProductReceiptVO) => { + return await request.put({ url: '/mes/wm/product-receipt/update', data }) + }, + + // 删除产品入库单 + deleteProductReceipt: async (id: number) => { + return await request.delete({ url: '/mes/wm/product-receipt/delete?id=' + id }) + }, + + // 提交产品入库单 + submitProductReceipt: async (id: number) => { + return await request.put({ url: '/mes/wm/product-receipt/submit?id=' + id }) + }, + + // 执行上架 + stockProductReceipt: async (id: number) => { + return await request.put({ url: '/mes/wm/product-receipt/stock?id=' + id }) + }, + + // 执行入库 + executeProductReceipt: async (id: number) => { + return await request.put({ url: '/mes/wm/product-receipt/execute?id=' + id }) + }, + + // 取消产品入库单 + cancelProductReceipt: async (id: number) => { + return await request.put({ url: '/mes/wm/product-receipt/cancel?id=' + id }) + }, + + // 校验产品入库单明细数量 + checkProductReceiptQuantity: async (id: number) => { + return await request.get({ url: '/mes/wm/product-receipt/check-quantity?id=' + id }) + }, + + // 导出产品入库单 Excel + exportProductReceipt: async (params: any) => { + return await request.download({ url: '/mes/wm/product-receipt/export-excel', params }) + } +} diff --git a/src/api/mes/wm/productreceipt/line/index.ts b/src/api/mes/wm/productreceipt/line/index.ts new file mode 100644 index 000000000..96ee59357 --- /dev/null +++ b/src/api/mes/wm/productreceipt/line/index.ts @@ -0,0 +1,45 @@ +import request from '@/config/axios' + +// MES 产品入库单行 VO +export interface WmProductReceiptLineVO { + id: number + receiptId: 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 WmProductReceiptLineApi = { + // 查询产品入库单行分页 + getProductReceiptLinePage: async (params: any) => { + return await request.get({ url: '/mes/wm/product-receipt-line/page', params }) + }, + + // 查询产品入库单行详情 + getProductReceiptLine: async (id: number) => { + return await request.get({ url: '/mes/wm/product-receipt-line/get?id=' + id }) + }, + + // 新增产品入库单行 + createProductReceiptLine: async (data: WmProductReceiptLineVO) => { + return await request.post({ url: '/mes/wm/product-receipt-line/create', data }) + }, + + // 修改产品入库单行 + updateProductReceiptLine: async (data: WmProductReceiptLineVO) => { + return await request.put({ url: '/mes/wm/product-receipt-line/update', data }) + }, + + // 删除产品入库单行 + deleteProductReceiptLine: async (id: number) => { + return await request.delete({ url: '/mes/wm/product-receipt-line/delete?id=' + id }) + } +} diff --git a/src/api/mes/wm/productrecpt/detail/index.ts b/src/api/mes/wm/productrecpt/detail/index.ts deleted file mode 100644 index 9521c22f4..000000000 --- a/src/api/mes/wm/productrecpt/detail/index.ts +++ /dev/null @@ -1,53 +0,0 @@ -import request from '@/config/axios' - -// MES 产品入库单明细 VO -export interface WmProductRecptDetailVO { - id: number - lineId: number - recptId: number - itemId: number - itemCode: string - quantity: number - batchId: number - warehouseId: number - warehouseName: string - locationId: number - locationName: string - areaId: number - areaName: string - remark: string - createTime: string -} - -// MES 产品入库单明细 API -export const WmProductRecptDetailApi = { - // 查询产品入库单明细列表 - getProductRecptDetailList: async (params: any) => { - return await request.get({ url: '/mes/wm/product-recpt-detail/list', params }) - }, - - // 根据行项目ID查询产品入库单明细列表 - getProductRecptDetailListByLineId: async (lineId: number) => { - return await request.get({ url: '/mes/wm/product-recpt-detail/list-by-line', params: { lineId } }) - }, - - // 查询产品入库单明细详情 - getProductRecptDetail: async (id: number) => { - return await request.get({ url: '/mes/wm/product-recpt-detail/get?id=' + id }) - }, - - // 新增产品入库单明细 - createProductRecptDetail: async (data: WmProductRecptDetailVO) => { - return await request.post({ url: '/mes/wm/product-recpt-detail/create', data }) - }, - - // 修改产品入库单明细 - updateProductRecptDetail: async (data: WmProductRecptDetailVO) => { - return await request.put({ url: '/mes/wm/product-recpt-detail/update', data }) - }, - - // 删除产品入库单明细 - deleteProductRecptDetail: async (id: number) => { - return await request.delete({ url: '/mes/wm/product-recpt-detail/delete?id=' + id }) - } -} diff --git a/src/api/mes/wm/productrecpt/index.ts b/src/api/mes/wm/productrecpt/index.ts deleted file mode 100644 index 330f46681..000000000 --- a/src/api/mes/wm/productrecpt/index.ts +++ /dev/null @@ -1,77 +0,0 @@ -import request from '@/config/axios' - -// MES 产品入库单 VO -export interface WmProductRecptVO { - id: number - code: string - name: string - workOrderId: number - workOrderCode: string - itemId: number - itemCode: string - itemName: string - specification: string - unitMeasureName: string - receiptDate: string - status: number - remark: string - createTime: string -} - -// MES 产品入库单 API -export const WmProductRecptApi = { - // 查询产品入库单分页 - getProductRecptPage: async (params: any) => { - return await request.get({ url: '/mes/wm/product-recpt/page', params }) - }, - - // 查询产品入库单详情 - getProductRecpt: async (id: number) => { - return await request.get({ url: '/mes/wm/product-recpt/get?id=' + id }) - }, - - // 新增产品入库单 - createProductRecpt: async (data: WmProductRecptVO) => { - return await request.post({ url: '/mes/wm/product-recpt/create', data }) - }, - - // 修改产品入库单 - updateProductRecpt: async (data: WmProductRecptVO) => { - return await request.put({ url: '/mes/wm/product-recpt/update', data }) - }, - - // 删除产品入库单 - deleteProductRecpt: async (id: number) => { - return await request.delete({ url: '/mes/wm/product-recpt/delete?id=' + id }) - }, - - // 提交产品入库单 - submitProductRecpt: async (id: number) => { - return await request.put({ url: '/mes/wm/product-recpt/submit?id=' + id }) - }, - - // 执行上架 - stockProductRecpt: async (id: number) => { - return await request.put({ url: '/mes/wm/product-recpt/stock?id=' + id }) - }, - - // 执行入库 - executeProductRecpt: async (id: number) => { - return await request.put({ url: '/mes/wm/product-recpt/execute?id=' + id }) - }, - - // 取消产品入库单 - cancelProductRecpt: async (id: number) => { - return await request.put({ url: '/mes/wm/product-recpt/cancel?id=' + id }) - }, - - // 校验产品入库单明细数量 - checkProductRecptQuantity: async (id: number) => { - return await request.get({ url: '/mes/wm/product-recpt/check-quantity?id=' + id }) - }, - - // 导出产品入库单 Excel - exportProductRecpt: async (params: any) => { - return await request.download({ url: '/mes/wm/product-recpt/export-excel', params }) - } -} diff --git a/src/api/mes/wm/productrecpt/line/index.ts b/src/api/mes/wm/productrecpt/line/index.ts deleted file mode 100644 index 0a0cde541..000000000 --- a/src/api/mes/wm/productrecpt/line/index.ts +++ /dev/null @@ -1,45 +0,0 @@ -import request from '@/config/axios' - -// MES 产品入库单行 VO -export interface WmProductRecptLineVO { - id: number - recptId: 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 WmProductRecptLineApi = { - // 查询产品入库单行分页 - getProductRecptLinePage: async (params: any) => { - return await request.get({ url: '/mes/wm/product-recpt-line/page', params }) - }, - - // 查询产品入库单行详情 - getProductRecptLine: async (id: number) => { - return await request.get({ url: '/mes/wm/product-recpt-line/get?id=' + id }) - }, - - // 新增产品入库单行 - createProductRecptLine: async (data: WmProductRecptLineVO) => { - return await request.post({ url: '/mes/wm/product-recpt-line/create', data }) - }, - - // 修改产品入库单行 - updateProductRecptLine: async (data: WmProductRecptLineVO) => { - return await request.put({ url: '/mes/wm/product-recpt-line/update', data }) - }, - - // 删除产品入库单行 - deleteProductRecptLine: async (id: number) => { - return await request.delete({ url: '/mes/wm/product-recpt-line/delete?id=' + id }) - } -} diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 3efa7223c..7c6c26caa 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -300,5 +300,5 @@ export enum DICT_TYPE { MES_WM_QUALITY_STATUS = 'mes_wm_quality_status', // MES 质量状态 MES_WM_RETURN_ISSUE_STATUS = 'mes_wm_return_issue_status', // MES 生产退料单状态 MES_WM_RETURN_ISSUE_TYPE = 'mes_wm_return_issue_type', // MES 退料类型 - MES_WM_PRODUCT_RECPT_STATUS = 'mes_wm_product_recpt_status', // MES 成品入库单状态 + MES_WM_PRODUCT_RECPT_STATUS = 'mes_wm_product_receipt_status', // MES 成品入库单状态 } diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts index 1e5671fe4..1fbf2bba8 100644 --- a/src/views/mes/utils/constants.ts +++ b/src/views/mes/utils/constants.ts @@ -245,7 +245,7 @@ export const MesWmProductProduceStatusEnum = { } /** MES 产品入库单状态枚举 */ -export const MesWmProductRecptStatusEnum = { +export const MesWmProductReceiptStatusEnum = { PREPARE: MesOrderStatusConstants.DRAFT, APPROVING: MesOrderStatusConstants.APPROVING, APPROVED: MesOrderStatusConstants.APPROVED, diff --git a/src/views/mes/wm/productrecpt/ProductRecptDetailForm.vue b/src/views/mes/wm/productreceipt/ProductReceiptDetailForm.vue similarity index 88% rename from src/views/mes/wm/productrecpt/ProductRecptDetailForm.vue rename to src/views/mes/wm/productreceipt/ProductReceiptDetailForm.vue index 98005c689..f1b2bbf94 100644 --- a/src/views/mes/wm/productrecpt/ProductRecptDetailForm.vue +++ b/src/views/mes/wm/productreceipt/ProductReceiptDetailForm.vue @@ -41,16 +41,16 @@