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/task/index.ts |   82 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 77 insertions(+), 5 deletions(-)

diff --git a/src/api/mes/pro/task/index.ts b/src/api/mes/pro/task/index.ts
index 1165e3b..f710da5 100644
--- a/src/api/mes/pro/task/index.ts
+++ b/src/api/mes/pro/task/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';
 
@@ -8,9 +8,9 @@
     id?: number;
     code?: string; // 浠诲姟缂栫爜
     name?: string; // 浠诲姟鍚嶇О
-    workOrderId?: number; // 鐢熶骇宸ュ崟缂栧彿
-    workOrderCode?: string; // 宸ュ崟缂栫爜
-    workOrderName?: string; // 宸ュ崟鍚嶇О
+    workOrderId?: number; // 鐢熶骇璁㈠崟缂栧彿
+    workOrderCode?: string; // 璁㈠崟缂栫爜
+    workOrderName?: string; // 璁㈠崟鍚嶇О
     workstationId?: number; // 宸ヤ綔绔欑紪鍙�
     workstationCode?: string; // 宸ヤ綔绔欑紪鐮�
     workstationName?: string; // 宸ヤ綔绔欏悕绉�
@@ -33,7 +33,7 @@
     startTime?: number; // 寮�濮嬬敓浜ф椂闂�
     endTime?: number; // 缁撴潫鐢熶骇鏃堕棿
     duration?: number; // 鐢熶骇鏃堕暱锛堝伐浣滄棩锛�1=8灏忔椂锛�
-    requestDate?: number; // 闇�姹傛棩鏈燂紙浠庡伐鍗曟煡锛�
+    requestDate?: number; // 闇�姹傛棩鏈燂紙浠庤鍗曟煡锛�
     finishDate?: number; // 瀹屾垚鏃ユ湡
     cancelDate?: number; // 鍙栨秷鏃ユ湡
     colorCode?: string; // 鐢樼壒鍥炬樉绀洪鑹�
@@ -53,6 +53,26 @@
     itemId?: number;
     statuses?: number[];
     status?: number;
+  }
+
+  /** 寰呮姤宸ュ彴璐︿换鍔★紙pending-feedback-page 鍝嶅簲锛� */
+  export interface PendingFeedbackTask extends Task {
+    pendingQuantity?: number; // 寰呮姤宸ユ暟閲忥紙= 鎺掍骇 - 宸茬敓浜э級
+    inTransitQuantity?: number; // 鍦ㄩ�旀姤宸ユ暟閲忥紙鑽夌/瀹℃壒涓�/寰呮楠屽悎璁★級
+    reportableQuantity?: number; // 鍙姤宸ユ暟閲忥紙= 鎺掍骇 - 宸茬敓浜� - 鍦ㄩ�旓級
+    feedbackRate?: number; // 鎶ュ伐瀹屾垚鐜�(%)
+  }
+
+  /** 寰呮姤宸ュ彴璐﹀垎椤垫煡璇㈠弬鏁� */
+  export interface PendingFeedbackPageParams extends PageParam {
+    processId?: number;
+    routeId?: number;
+    workOrderId?: number;
+    workstationId?: number;
+    code?: string;
+    name?: string;
+    checkFlag?: boolean;
+    createTime?: string[];
   }
 }
 
@@ -93,3 +113,55 @@
 export function getGanttTaskList(params: any) {
   return requestClient.get<any[]>('/mes/pro/task/gantt-list', { params });
 }
+
+/** 涓�閿帓浜ч瑙堣姹� */
+export interface AutoGenerateReq {
+  workOrderId: number;
+  routeId?: number;
+  autoAssignWorkstation?: boolean;
+  autoCalculateTime?: boolean;
+}
+
+/** 涓�閿帓浜ч瑙堝搷搴� */
+export interface AutoGeneratePreview {
+  workOrderId?: number;
+  routeId?: number;
+  routeName?: string;
+  taskList?: TaskPreview[];
+}
+
+export interface TaskPreview {
+  processId?: number;
+  processName?: string;
+  sort?: number;
+  suggestWorkstationId?: number;
+  suggestWorkstationName?: string;
+  quantity?: number;
+  keyFlag?: boolean;
+}
+
+/** 涓�閿帓浜ч瑙� */
+export function previewAutoGenerate(data: AutoGenerateReq) {
+  return requestClient.post<AutoGeneratePreview>(
+    '/mes/pro/task/auto-generate/preview',
+    data,
+  );
+}
+
+/** 涓�閿帓浜ф墽琛� */
+export function autoGenerateTasks(data: AutoGenerateReq) {
+  return requestClient.post<{ taskIds: number[] }>(
+    '/mes/pro/task/auto-generate',
+    data,
+  );
+}
+
+/** 鏌ヨ寰呮姤宸ュ彴璐︼紙鍒嗛〉锛� */
+export function getPendingFeedbackPage(
+  params: MesProTaskApi.PendingFeedbackPageParams,
+) {
+  return requestClient.get<PageResult<MesProTaskApi.PendingFeedbackTask>>(
+    '/mes/pro/task/pending-feedback-page',
+    { params },
+  );
+}

--
Gitblit v1.9.3