From 6c0b0dd81a98a3163e45f1b5b5417e02af165fd8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 29 八月 2026 10:04:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/api/mes/pro/feedback/index.ts | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/api/mes/pro/feedback/index.ts b/src/api/mes/pro/feedback/index.ts
index 934eba8..0580b85 100644
--- a/src/api/mes/pro/feedback/index.ts
+++ b/src/api/mes/pro/feedback/index.ts
@@ -64,6 +64,19 @@
createTime?: number; // 鍒涘缓鏃堕棿
processInstanceId?: string; // BPM 娴佺▼瀹炰緥缂栧彿
processDefinitionKey?: string; // BPM 娴佺▼瀹氫箟 Key
+ paramValues?: ParamValue[];
+ }
+
+ export interface ParamValue {
+ detailId: number;
+ value?: string;
+ // ---- 鍥炴樉瀛楁锛堟姤宸ヨ鎯�/鍒楄〃杩斿洖锛� ----
+ paramCode?: string;
+ paramName?: string;
+ paramType?: number;
+ unitMeasureName?: string;
+ paramValue?: string;
+ required?: boolean;
}
/** MES 鐢熶骇鎶ュ伐鍒嗛〉鏌ヨ鍙傛暟 */
@@ -163,9 +176,8 @@
/** 蹇�熸姤宸ヨ姹� */
export interface QuickCreateReq {
taskId: number;
+ paramValues?: MesProFeedbackApi.ParamValue[];
feedbackQuantity: number;
- qualifiedQuantity?: number;
- unqualifiedQuantity?: number;
remark?: string;
}
@@ -174,14 +186,14 @@
feedbackId?: number;
taskStatus?: number;
workOrderStatus?: number;
+ /** 鎶ュ伐鍚庡墿浣欏彲鎶ュ伐鏁伴噺 */
+ reportableQuantity?: number;
}
/** 鎵归噺鎶ュ伐璇锋眰 */
export interface BatchCreateReq {
taskIds: number[];
feedbackQuantity: number;
- qualifiedQuantity?: number;
- unqualifiedQuantity?: number;
remark?: string;
}
--
Gitblit v1.9.3