From 5dbc69b4e792dcce998038822b92402366bec47f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 18 八月 2026 10:45:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260812' into dev_pro2.0
---
src/api/mes/pro/workorder/index.ts | 62 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 1 deletions(-)
diff --git a/src/api/mes/pro/workorder/index.ts b/src/api/mes/pro/workorder/index.ts
index 64a6b60..39bcf69 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';
+import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
@@ -14,6 +14,7 @@
productId?: number; // 浜у搧缂栧彿
productName?: string; // 浜у搧鍚嶇О
productCode?: string; // 浜у搧缂栫爜
+ itemCode?: string; // 浜у搧缂栫爜锛堢墿鏂欑紪鐮侊級
productSpecification?: string; // 瑙勬牸鍨嬪彿
unitMeasureName?: string; // 鍗曚綅鍚嶇О
quantity?: number; // 鐢熶骇鏁伴噺
@@ -33,6 +34,10 @@
finishDate?: number; // 瀹屾垚鏃堕棿
cancelDate?: number; // 鍙栨秷鏃堕棿
status?: number; // 璁㈠崟鐘舵��
+ scheduleStatus?: number; // 鎺掍骇鐘舵��
+ productionStatus?: number; // 鐢熶骇鐘舵��
+ processProgressList?: ProcessProgress[]; // 宸ュ簭鐢熶骇杩涘害
+ completionProgress?: number; // 瀹屾垚杩涘害
remark?: string; // 澶囨敞
createTime?: number; // 鍒涘缓鏃堕棿
}
@@ -55,6 +60,14 @@
return requestClient.get<PageResult<MesProWorkOrderApi.WorkOrder>>(
'/mes/pro/work-order/page',
{ params },
+ );
+}
+
+/** 鑾峰緱鐢熶骇宸ュ崟璋冨害鐘舵�佸垎椤� */
+export function getWorkOrderSchedulePage(params: MesProWorkOrderApi.PageParams) {
+ return requestClient.get<PageResult<MesProWorkOrderApi.WorkOrder>>(
+ '/mes/pro/work-order/schedule-page',
+ { params },
);
}
@@ -99,3 +112,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