From 8b9372d6e78c68689aa8e027d1d765ad7569371a Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 18 八月 2026 09:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260812' into dev_pro2.0
---
src/api/mes/pro/task/index.ts | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/src/api/mes/pro/task/index.ts b/src/api/mes/pro/task/index.ts
index 515185b..5afe094 100644
--- a/src/api/mes/pro/task/index.ts
+++ b/src/api/mes/pro/task/index.ts
@@ -1,8 +1,21 @@
-锘縤mport type { PageParam, PageResult } from '@vben/request';
+import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
export namespace MesProTaskApi {
+ export interface PauseRecord {
+ id: number;
+ pauseTime: string;
+ pauseUserId: number;
+ pauseUserName: string;
+ reason: string;
+ remark?: string;
+ resumeTime?: string;
+ resumeUserId?: number;
+ resumeUserName?: string;
+ taskId: number;
+ }
+
/** MES 鐢熶骇浠诲姟 */
export interface Task {
id?: number;
@@ -41,6 +54,8 @@
checkFlag?: boolean; // 鏄惁璐ㄦ锛堟淳鐢熻嚜宸ヨ壓璺嚎宸ュ簭锛�
backflushFlag?: boolean; // 鏄惁鍊掑啿锛堟淳鐢熻嚜宸ヨ壓璺嚎宸ュ簭锛�
remark?: string; // 澶囨敞
+ pauseRecords?: PauseRecord[]; // 鍋滃伐璁板綍
+ reportableQuantity?: number; // 鍙姤宸ユ暟閲�
}
/** MES 鐢熶骇浠诲姟鍒嗛〉鏌ヨ鍙傛暟 */
@@ -174,3 +189,20 @@
{ params: { workstationId, quantity } },
);
}
+
+/** 鐢熶骇浠诲姟鍋滃伐璇锋眰鍙傛暟 */
+export interface MesProTaskPauseReqVO {
+ id: number;
+ reason: string;
+ remark?: string;
+}
+
+/** 鐢熶骇浠诲姟鍋滃伐 */
+export function pauseTask(data: MesProTaskPauseReqVO) {
+ return requestClient.put('/mes/pro/task/pause', data);
+}
+
+/** 鐢熶骇浠诲姟澶嶅伐 */
+export function resumeTask(data: { id: number }) {
+ return requestClient.put('/mes/pro/task/resume', data);
+}
--
Gitblit v1.9.3