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/workorder/index.ts | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/src/api/mes/pro/workorder/index.ts b/src/api/mes/pro/workorder/index.ts
index 64a6b60..15a7635 100644
--- a/src/api/mes/pro/workorder/index.ts
+++ b/src/api/mes/pro/workorder/index.ts
@@ -1,4 +1,4 @@
-锘縤mport type { PageParam, PageResult } from '../../../../packages/effects/request/src';
+锘縤mport type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
@@ -99,3 +99,50 @@
export function confirmWorkOrder(id: number) {
return requestClient.put(`/mes/pro/work-order/confirm?id=${id}`);
}
+
+/** 宸ュ崟杩涘害璇︽儏 */
+export interface WorkOrderProgress {
+ workOrderId?: number;
+ workOrderCode?: string;
+ quantity?: number;
+ quantityScheduled?: number;
+ quantityProduced?: number;
+ progressPercent?: number;
+ processList?: ProcessProgress[];
+}
+
+export interface ProcessProgress {
+ processId?: number;
+ processCode?: string;
+ processName?: string;
+ keyFlag?: boolean;
+ plannedQuantity?: number;
+ producedQuantity?: number;
+ progressPercent?: number;
+ status?: number;
+ taskList?: TaskInfo[];
+}
+
+export interface TaskInfo {
+ taskId?: number;
+ taskCode?: string;
+ workstationName?: string;
+ quantity?: number;
+ producedQuantity?: number;
+ progressPercent?: number;
+ status?: number;
+}
+
+/** 鑾峰彇宸ュ崟杩涘害璇︽儏 */
+export function getWorkOrderProgress(id: number) {
+ return requestClient.get<WorkOrderProgress>(
+ `/mes/pro/work-order/progress/${id}`,
+ );
+}
+
+/** 妫�鏌ュ苟鑷姩瀹屾垚宸ュ崟 */
+export function checkAndAutoFinishWorkOrder(id: number) {
+ return requestClient.post<boolean>(
+ `/mes/pro/work-order/check-auto-finish/${id}`,
+ );
+}
--
Gitblit v1.9.3