diff --git a/src/views/mes/qc/ipqc/IpqcForm.vue b/src/views/mes/qc/ipqc/IpqcForm.vue index d24ca2da2..7e8299355 100644 --- a/src/views/mes/qc/ipqc/IpqcForm.vue +++ b/src/views/mes/qc/ipqc/IpqcForm.vue @@ -41,6 +41,26 @@ + + + + + + + + + + + + + + + 生产关联 @@ -302,6 +322,7 @@ const formData = ref({ templateId: undefined, sourceDocId: undefined, sourceDocType: undefined, + sourceDocCode: undefined, sourceLineId: undefined, workOrderId: undefined, taskId: undefined, @@ -418,6 +439,7 @@ const resetForm = () => { templateId: undefined, sourceDocId: undefined, sourceDocType: undefined, + sourceDocCode: undefined, sourceLineId: undefined, workOrderId: undefined, taskId: undefined, diff --git a/src/views/mes/qc/iqc/IqcForm.vue b/src/views/mes/qc/iqc/IqcForm.vue index 7baff9c12..857f6d1e7 100644 --- a/src/views/mes/qc/iqc/IqcForm.vue +++ b/src/views/mes/qc/iqc/IqcForm.vue @@ -29,6 +29,26 @@ + + + + + + + + + + + + + + + 物料与供应商 @@ -251,6 +271,7 @@ const formData = ref({ name: undefined, sourceDocId: undefined, sourceDocType: undefined, + sourceDocCode: undefined, sourceLineId: undefined, vendorId: undefined, vendorBatch: undefined, @@ -345,6 +366,7 @@ const resetForm = () => { name: undefined, sourceDocId: undefined, sourceDocType: undefined, + sourceDocCode: undefined, sourceLineId: undefined, vendorId: undefined, vendorBatch: undefined, diff --git a/src/views/mes/qc/oqc/OqcForm.vue b/src/views/mes/qc/oqc/OqcForm.vue index 4da65ce44..b83892cce 100644 --- a/src/views/mes/qc/oqc/OqcForm.vue +++ b/src/views/mes/qc/oqc/OqcForm.vue @@ -28,6 +28,26 @@ + + + + + + + + + + + + + + + 物料与客户 @@ -256,6 +276,7 @@ const formData = ref({ name: undefined, sourceDocId: undefined, sourceDocType: undefined, + sourceDocCode: undefined, sourceLineId: undefined, clientId: undefined, batchCode: undefined, @@ -352,6 +373,7 @@ const resetForm = () => { name: undefined, sourceDocId: undefined, sourceDocType: undefined, + sourceDocCode: undefined, sourceLineId: undefined, clientId: undefined, batchCode: undefined, diff --git a/src/views/mes/qc/pendinginspect/index.vue b/src/views/mes/qc/pendinginspect/index.vue index 5d29ea3c0..9370b6f22 100644 --- a/src/views/mes/qc/pendinginspect/index.vue +++ b/src/views/mes/qc/pendinginspect/index.vue @@ -205,6 +205,7 @@ const handleCreateRqc = (row: QcPendingInspectVO) => { sourceDocId: row.sourceDocId, sourceDocType: row.sourceDocType, sourceLineId: row.sourceLineId, + sourceDocCode: row.sourceDocCode, itemId: row.itemId, checkQuantity: row.quantity, inspectDate: row.recordTime, diff --git a/src/views/mes/qc/rqc/RqcForm.vue b/src/views/mes/qc/rqc/RqcForm.vue index 7ee4d3164..e40cdd62f 100644 --- a/src/views/mes/qc/rqc/RqcForm.vue +++ b/src/views/mes/qc/rqc/RqcForm.vue @@ -28,6 +28,25 @@ + + + + + + + + + + + + + + 物料信息 @@ -249,6 +268,7 @@ const formData = ref({ sourceDocId: undefined, sourceDocType: undefined, sourceLineId: undefined, + sourceDocCode: undefined, type: undefined, itemId: undefined, batchCode: undefined, @@ -344,6 +364,7 @@ const resetForm = () => { sourceDocId: undefined, sourceDocType: undefined, sourceLineId: undefined, + sourceDocCode: undefined, type: undefined, itemId: undefined, batchCode: undefined, diff --git a/src/views/mes/qc/rqc/index.vue b/src/views/mes/qc/rqc/index.vue index 286439ecf..37e125444 100644 --- a/src/views/mes/qc/rqc/index.vue +++ b/src/views/mes/qc/rqc/index.vue @@ -18,8 +18,7 @@ class="!w-240px" /> - - - --> - + + + - - - + + + + + + @@ -191,7 +207,7 @@ import RqcForm from './RqcForm.vue' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue' import UserSelect from '@/views/system/user/components/UserSelect.vue' -import { MesQcStatusEnum } from '@/views/mes/utils/constants' +import { MesQcStatusEnum, MesQcSourceDocTypeEnum } from '@/views/mes/utils/constants' defineOptions({ name: 'MesQcRqc' }) @@ -206,6 +222,7 @@ const queryParams = reactive({ pageSize: 10, code: undefined, sourceDocType: undefined, + sourceDocCode: undefined, itemId: undefined, batchCode: undefined, checkResult: undefined, diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts index 88d38cb72..3aea2eb66 100644 --- a/src/views/mes/utils/constants.ts +++ b/src/views/mes/utils/constants.ts @@ -139,6 +139,33 @@ export const MesQcResultValueType = { FILE: 5 // 文件 } as const +/** MES 业务类型常量 */ +export const MesBizTypeEnum = { + // WM 仓库模块 [100, 200) + WM_ARRIVAL_NOTICE: 100, // 到货通知单 + WM_RETURN_ISSUE: 116, // 生产退料 + WM_PRODUCT_SALES: 118, // 销售出库 + WM_RETURN_SALES: 119, // 销售退货入库 + WM_OUTSOURCE_RECPT: 121, // 外协入库 + + // PRO 生产模块 [300, 400) + PRO_FEEDBACK: 304 // 生产报工 +} + +/** MES 质检来源单据类型枚举 */ +export const MesQcSourceDocTypeEnum = { + // IQC + ARRIVAL_NOTICE: MesBizTypeEnum.WM_ARRIVAL_NOTICE, + OUTSOURCE_RECPT: MesBizTypeEnum.WM_OUTSOURCE_RECPT, + // IPQC + PRO_FEEDBACK: MesBizTypeEnum.PRO_FEEDBACK, + // OQC + PRODUCT_SALES: MesBizTypeEnum.WM_PRODUCT_SALES, + // RQC + RETURN_ISSUE: MesBizTypeEnum.WM_RETURN_ISSUE, + RETURN_SALES: MesBizTypeEnum.WM_RETURN_SALES +} + /** MES 质检类型枚举 */ export const MesQcTypeEnum = { IQC: 1, // 来料检验