From 889d8ddf4c13c1b1bdbabd04c2d80b904020151e Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期三, 19 八月 2026 12:49:24 +0800
Subject: [PATCH] 生产订单与报工模块改造汇总 (Git Commit 文档) feat(mes-pro): 生产订单及报工模块审批流与批次填报改造 1. 生产订单功能增强 (Work Order)

---
 src/api/mes/pro/workorder/index.ts |   72 +++++++++++++++++++++++++++++++++++
 1 files changed, 71 insertions(+), 1 deletions(-)

diff --git a/src/api/mes/pro/workorder/index.ts b/src/api/mes/pro/workorder/index.ts
index 97c689e..68b8037 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 '@vben/request';
+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,8 +34,15 @@
     finishDate?: number; // 瀹屾垚鏃堕棿
     cancelDate?: number; // 鍙栨秷鏃堕棿
     status?: number; // 璁㈠崟鐘舵��
+    scheduleStatus?: number; // 鎺掍骇鐘舵��
+    productionStatus?: number; // 鐢熶骇鐘舵��
+    processProgressList?: ProcessProgress[]; // 宸ュ簭鐢熶骇杩涘害
+    completionProgress?: number; // 瀹屾垚杩涘害
     remark?: string; // 澶囨敞
     createTime?: number; // 鍒涘缓鏃堕棿
+    feedbackApprove?: boolean; // 鏄惁鎶ュ伐瀹℃壒
+    processDefinitionKey?: string; // 鎶ュ伐瀹℃壒娴佺▼瀹氫箟 Key
+    feedbackRole?: string; // 鎶ュ伐瑙掕壊
   }
 
   /** MES 鐢熶骇璁㈠崟鍒嗛〉鏌ヨ鍙傛暟 */
@@ -55,6 +63,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 +115,57 @@
 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}`,
+  );
+}
+
+/** 鑾峰緱鐢熶骇璁㈠崟瀹℃壒娴佺▼鍒楄〃 */
+export function getWorkOrderApproveProcessList() {
+  return requestClient.get<Array<{ id: string; name: string; key: string }>>(
+    '/mes/pro/work-order/approve-process-list',
+  );
+}

--
Gitblit v1.9.3