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 | 72 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 insertions(+), 0 deletions(-)
diff --git a/src/api/mes/pro/task/index.ts b/src/api/mes/pro/task/index.ts
index e8f6dec..f710da5 100644
--- a/src/api/mes/pro/task/index.ts
+++ b/src/api/mes/pro/task/index.ts
@@ -54,6 +54,26 @@
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