From cb9cd49627b65a4c0e137e08063271a8cefe1826 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 23 七月 2026 17:48:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/api/mes/pro/feedback/index.ts |   74 ++++++++++++++++++++++++++++++++++--
 1 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/src/api/mes/pro/feedback/index.ts b/src/api/mes/pro/feedback/index.ts
index 0a244bd..78eecc3 100644
--- a/src/api/mes/pro/feedback/index.ts
+++ b/src/api/mes/pro/feedback/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam, PageResult } from '..\..\..\..\packages\effects\request\src';
+锘縤mport type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
@@ -6,7 +6,7 @@
   /** MES 鐢熶骇鎶ュ伐 */
   export interface Feedback {
     id?: number;
-    code?: string; // 鎶ュ伐鍗曠紪鍙�
+    code?: string; // 鎶ヨ鍗曠紪鍙�
     type?: number; // 鎶ュ伐绫诲瀷
     channel?: string; // 鎶ュ伐閫斿緞
     feedbackTime?: number; // 鎶ュ伐鏃堕棿
@@ -19,9 +19,9 @@
     processCode?: string; // 宸ュ簭缂栫爜
     processName?: string; // 宸ュ簭鍚嶇О
     checkFlag?: boolean; // 鏄惁闇�瑕佹楠�
-    workOrderId?: number; // 鐢熶骇宸ュ崟缂栧彿
-    workOrderCode?: string; // 宸ュ崟缂栫爜
-    workOrderName?: string; // 宸ュ崟鍚嶇О
+    workOrderId?: number; // 鐢熶骇璁㈠崟缂栧彿
+    workOrderCode?: string; // 璁㈠崟缂栫爜
+    workOrderName?: string; // 璁㈠崟鍚嶇О
     taskId?: number; // 鐢熶骇浠诲姟缂栧彿
     taskCode?: string; // 浠诲姟缂栫爜
     itemId?: number; // 浜у搧鐗╂枡缂栧彿
@@ -54,6 +54,8 @@
     code?: string;
     type?: number;
     workOrderId?: number;
+    taskId?: number;
+    taskCode?: string;
     itemId?: number;
     feedbackUserId?: number;
     creator?: string;
@@ -111,3 +113,65 @@
 export function approveFeedback(id: number) {
   return requestClient.put<boolean>(`/mes/pro/feedback/approve?id=${id}`);
 }
+
+/** 蹇�熸姤宸ヨ姹� */
+export interface QuickCreateReq {
+  taskId: number;
+  feedbackQuantity: number;
+  qualifiedQuantity?: number;
+  unqualifiedQuantity?: number;
+  remark?: string;
+}
+
+/** 蹇�熸姤宸ュ搷搴� */
+export interface QuickCreateResp {
+  feedbackId?: number;
+  taskStatus?: number;
+  workOrderStatus?: number;
+}
+
+/** 鎵归噺鎶ュ伐璇锋眰 */
+export interface BatchCreateReq {
+  taskIds: number[];
+  feedbackQuantity: number;
+  qualifiedQuantity?: number;
+  unqualifiedQuantity?: number;
+  remark?: string;
+}
+
+/** 鎵归噺鎶ュ伐鍝嶅簲 */
+export interface BatchCreateResp {
+  successCount?: number;
+  failCount?: number;
+  results?: BatchResult[];
+}
+
+export interface BatchResult {
+  taskId?: number;
+  success?: boolean;
+  feedbackId?: number;
+  errorMsg?: string;
+}
+
+/** 蹇�熸姤宸ワ紙鍒涘缓骞舵彁浜わ級 */
+export function quickCreateFeedback(data: QuickCreateReq) {
+  return requestClient.post<QuickCreateResp>(
+    '/mes/pro/feedback/quick-create',
+    data,
+  );
+}
+
+/** 鎵归噺鎶ュ伐 */
+export function batchCreateFeedback(data: BatchCreateReq) {
+  return requestClient.post<BatchCreateResp>(
+    '/mes/pro/feedback/batch-create',
+    data,
+  );
+}
+
+/** 鎸変换鍔℃煡璇㈡姤宸ュ巻鍙� */
+export function getFeedbackListByTask(taskId: number) {
+  return requestClient.get<MesProFeedbackApi.Feedback[]>(
+    `/mes/pro/feedback/list-by-task?taskId=${taskId}`,
+  );
+}

--
Gitblit v1.9.3