diff --git a/src/api/mes/pro/task/issue/index.ts b/src/api/mes/pro/task/issue/index.ts index 1f61e4de9..660465d9e 100644 --- a/src/api/mes/pro/task/issue/index.ts +++ b/src/api/mes/pro/task/issue/index.ts @@ -6,11 +6,11 @@ export interface ProTaskIssueVO { taskId: number // 生产任务编号 workOrderId: number // 生产工单编号 workstationId: number // 工作站编号 - sourceDocId: number // 来源单据编号 - sourceDocCode: string // 来源单据编码 sourceDocType: string // 来源单据类型 - batchCode: string // 投料批次 + sourceDocId: number // 来源单据编号 sourceLineId: number // 来源单据行编号 + sourceDocCode: string // 来源单据编码 + batchCode: string // 投料批次 itemId: number // 产品物料编号 itemName: string // 产品名称 itemCode: string // 产品编码 diff --git a/src/api/mes/qc/ipqc/index.ts b/src/api/mes/qc/ipqc/index.ts index c032cbcae..9dd39efe2 100644 --- a/src/api/mes/qc/ipqc/index.ts +++ b/src/api/mes/qc/ipqc/index.ts @@ -7,8 +7,8 @@ export interface QcIpqcVO { name: string // 检验单名称 type: string // IPQC 检验类型 templateId: number // 检验模板 ID - sourceDocId: number // 来源单据 ID sourceDocType: number // 来源单据类型 + sourceDocId: number // 来源单据 ID sourceLineId: number // 来源单据行 ID workOrderId: number // 生产工单 ID workOrderCode: string // 工单编号（关联查询） diff --git a/src/api/mes/qc/iqc/index.ts b/src/api/mes/qc/iqc/index.ts index 7ba4761cc..55c6edbe5 100644 --- a/src/api/mes/qc/iqc/index.ts +++ b/src/api/mes/qc/iqc/index.ts @@ -6,8 +6,8 @@ export interface QcIqcVO { code: string // 检验单编号 name: string // 检验单名称 templateId: number // 检验模板 ID - sourceDocId: number // 来源单据 ID sourceDocType: number // 来源单据类型 + sourceDocId: number // 来源单据 ID sourceLineId: number // 来源单据行 ID vendorId: number // 供应商 ID vendorNickname: string // 供应商简称（关联查询） diff --git a/src/api/mes/qc/oqc/index.ts b/src/api/mes/qc/oqc/index.ts index f65280447..545285842 100644 --- a/src/api/mes/qc/oqc/index.ts +++ b/src/api/mes/qc/oqc/index.ts @@ -6,8 +6,8 @@ export interface QcOqcVO { code: string // 检验单编号 name: string // 检验单名称 templateId: number // 检验模板 ID - sourceDocId: number // 来源单据 ID sourceDocType: string // 来源单据类型 + sourceDocId: number // 来源单据 ID sourceLineId: number // 来源单据行 ID clientId: number // 客户 ID clientNickname: string // 客户简称（关联查询） diff --git a/src/api/mes/qc/pendinginspect/index.ts b/src/api/mes/qc/pendinginspect/index.ts index 596b2312d..2a85849f6 100644 --- a/src/api/mes/qc/pendinginspect/index.ts +++ b/src/api/mes/qc/pendinginspect/index.ts @@ -2,10 +2,10 @@ import request from '@/config/axios' // MES 待检任务 VO export interface QcPendingInspectVO { - sourceDocId: number sourceDocType: number - sourceDocCode: string + sourceDocId: number sourceLineId: number + sourceDocCode: string qcType: number itemId: number itemCode: string diff --git a/src/api/mes/qc/rqc/index.ts b/src/api/mes/qc/rqc/index.ts index db320113d..0b079393d 100644 --- a/src/api/mes/qc/rqc/index.ts +++ b/src/api/mes/qc/rqc/index.ts @@ -6,8 +6,8 @@ export interface QcRqcVO { code: string // 检验单编号 name: string // 检验单名称 templateId: number // 检验模板 ID - sourceDocId: number // 来源单据 ID sourceDocType: string // 来源单据类型 + sourceDocId: number // 来源单据 ID sourceLineId: number // 来源单据行 ID type: number // 检验类型 itemId: number // 产品物料 ID @@ -26,12 +26,12 @@ export interface QcRqcVO { status: number // 状态 remark: string // 备注 // 缺陷统计 - criticalQuantity: number // 致命缺陷数量 - majorQuantity: number // 严重缺陷数量 - minorQuantity: number // 轻微缺陷数量 criticalRate: number // 致命缺陷率（%） majorRate: number // 严重缺陷率（%） minorRate: number // 轻微缺陷率（%） + criticalQuantity: number // 致命缺陷数量 + majorQuantity: number // 严重缺陷数量 + minorQuantity: number // 轻微缺陷数量 } // MES 退货检验单 API diff --git a/src/api/mes/wm/miscissue/index.ts b/src/api/mes/wm/miscissue/index.ts index 6162fc76f..fba95d2b8 100644 --- a/src/api/mes/wm/miscissue/index.ts +++ b/src/api/mes/wm/miscissue/index.ts @@ -6,9 +6,9 @@ export interface WmMiscIssueVO { code: string name: string type: string + sourceDocType: string sourceDocId: number sourceDocCode: string - sourceDocType: string issueDate: string status: number remark: string diff --git a/src/api/mes/wm/miscreceipt/index.ts b/src/api/mes/wm/miscreceipt/index.ts index e5c858159..6262d228c 100644 --- a/src/api/mes/wm/miscreceipt/index.ts +++ b/src/api/mes/wm/miscreceipt/index.ts @@ -6,9 +6,9 @@ export interface WmMiscReceiptVO { code: string name: string type: number + sourceDocType: string sourceDocId: number sourceDocCode: string - sourceDocType: string receiptDate: string status: number remark: string diff --git a/src/views/mes/pro/card/components/ProCardSelectDialog.vue b/src/views/mes/pro/card/components/ProCardSelectDialog.vue index 45104e2dc..d238d3c04 100644 --- a/src/views/mes/pro/card/components/ProCardSelectDialog.vue +++ b/src/views/mes/pro/card/components/ProCardSelectDialog.vue @@ -28,6 +28,13 @@ class="!w-220px" /> + + + - - - 搜索 @@ -89,8 +89,8 @@ - + @@ -181,8 +181,8 @@ const queryParams = reactive({ pageSize: 10, // 每页条数 code: undefined as string | undefined, // 流转卡编号 workOrderId: undefined as number | undefined, // 生产工单编号 - batchCode: undefined as string | undefined, // 批次号 - itemId: undefined as number | undefined // 产品物料编号 + itemId: undefined as number | undefined, // 产品物料编号 + batchCode: undefined as string | undefined // 批次号 }) /** 查询流转卡列表 */ @@ -233,8 +233,8 @@ const handleQuery = () => { const resetQuery = () => { queryParams.code = undefined queryParams.workOrderId = undefined - queryParams.batchCode = undefined queryParams.itemId = undefined + queryParams.batchCode = undefined handleQuery() } @@ -264,8 +264,8 @@ const open = async (selectedIds?: number[]) => { // 重置查询条件 + 页码，避免二次打开继承上次过滤上下文 queryParams.code = undefined queryParams.workOrderId = undefined - queryParams.batchCode = undefined queryParams.itemId = undefined + queryParams.batchCode = undefined queryParams.pageNo = 1 // 清空上一次的选中状态 selectedRows.value = [] diff --git a/src/views/mes/qc/ipqc/IpqcForm.vue b/src/views/mes/qc/ipqc/IpqcForm.vue index 7598c8612..921cf9e56 100644 --- a/src/views/mes/qc/ipqc/IpqcForm.vue +++ b/src/views/mes/qc/ipqc/IpqcForm.vue @@ -340,10 +340,10 @@ const formData = ref({ status: undefined as number | undefined, type: undefined, templateId: undefined, - sourceDocId: undefined, sourceDocType: undefined, - sourceDocCode: undefined, + sourceDocId: undefined, sourceLineId: undefined, + sourceDocCode: undefined, workOrderId: undefined, taskId: undefined, workstationId: undefined, @@ -483,10 +483,10 @@ const resetForm = () => { status: undefined, type: undefined, templateId: undefined, - sourceDocId: undefined, sourceDocType: undefined, - sourceDocCode: undefined, + sourceDocId: undefined, sourceLineId: undefined, + sourceDocCode: undefined, workOrderId: undefined, taskId: undefined, workstationId: undefined, diff --git a/src/views/mes/qc/iqc/IqcForm.vue b/src/views/mes/qc/iqc/IqcForm.vue index ae9f910ed..48dc20324 100644 --- a/src/views/mes/qc/iqc/IqcForm.vue +++ b/src/views/mes/qc/iqc/IqcForm.vue @@ -276,10 +276,10 @@ const formData = ref({ code: undefined, name: undefined, status: undefined as number | undefined, - sourceDocId: undefined, sourceDocType: undefined, - sourceDocCode: undefined, + sourceDocId: undefined, sourceLineId: undefined, + sourceDocCode: undefined, vendorId: undefined, vendorBatch: undefined, itemId: undefined, @@ -400,10 +400,10 @@ const resetForm = () => { code: undefined, name: undefined, status: undefined, - sourceDocId: undefined, sourceDocType: undefined, - sourceDocCode: undefined, + sourceDocId: undefined, sourceLineId: undefined, + sourceDocCode: undefined, vendorId: undefined, vendorBatch: undefined, itemId: undefined, diff --git a/src/views/mes/qc/oqc/OqcForm.vue b/src/views/mes/qc/oqc/OqcForm.vue index 0e1250a29..bf14d5666 100644 --- a/src/views/mes/qc/oqc/OqcForm.vue +++ b/src/views/mes/qc/oqc/OqcForm.vue @@ -284,10 +284,10 @@ const formData = ref({ code: undefined, name: undefined, status: undefined as number | undefined, - sourceDocId: undefined, sourceDocType: undefined, - sourceDocCode: undefined, + sourceDocId: undefined, sourceLineId: undefined, + sourceDocCode: undefined, clientId: undefined, batchCode: undefined, itemId: undefined, @@ -408,10 +408,10 @@ const resetForm = () => { code: undefined, name: undefined, status: undefined, - sourceDocId: undefined, sourceDocType: undefined, - sourceDocCode: undefined, + sourceDocId: undefined, sourceLineId: undefined, + sourceDocCode: undefined, clientId: undefined, batchCode: undefined, itemId: undefined, diff --git a/src/views/mes/qc/pendinginspect/index.vue b/src/views/mes/qc/pendinginspect/index.vue index b7ec85714..5da7b4d90 100644 --- a/src/views/mes/qc/pendinginspect/index.vue +++ b/src/views/mes/qc/pendinginspect/index.vue @@ -51,12 +51,12 @@ - + - + - + - + @@ -155,9 +155,9 @@ const formData = ref({ name: undefined, type: undefined, status: undefined as number | undefined, + sourceDocType: undefined, sourceDocId: undefined, sourceDocCode: undefined, - sourceDocType: undefined, receiptDate: undefined, remark: undefined }) @@ -264,9 +264,9 @@ const resetForm = () => { name: undefined, type: undefined, status: undefined, + sourceDocType: undefined, sourceDocId: undefined, sourceDocCode: undefined, - sourceDocType: undefined, receiptDate: undefined, remark: undefined } diff --git a/src/views/mes/wm/miscreceipt/index.vue b/src/views/mes/wm/miscreceipt/index.vue index bba889e7e..41f8047b2 100644 --- a/src/views/mes/wm/miscreceipt/index.vue +++ b/src/views/mes/wm/miscreceipt/index.vue @@ -40,19 +40,19 @@ /> - + - + - +