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/task/index.ts | 124 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 119 insertions(+), 5 deletions(-)
diff --git a/src/api/mes/pro/task/index.ts b/src/api/mes/pro/task/index.ts
index 1165e3b..a059e1c 100644
--- a/src/api/mes/pro/task/index.ts
+++ b/src/api/mes/pro/task/index.ts
@@ -1,16 +1,29 @@
-import type { PageParam, PageResult } from '..\..\..\..\packages\effects\request\src';
+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;
code?: string; // 浠诲姟缂栫爜
name?: string; // 浠诲姟鍚嶇О
- workOrderId?: number; // 鐢熶骇宸ュ崟缂栧彿
- workOrderCode?: string; // 宸ュ崟缂栫爜
- workOrderName?: string; // 宸ュ崟鍚嶇О
+ workOrderId?: number; // 鐢熶骇璁㈠崟缂栧彿
+ workOrderCode?: string; // 璁㈠崟缂栫爜
+ workOrderName?: string; // 璁㈠崟鍚嶇О
workstationId?: number; // 宸ヤ綔绔欑紪鍙�
workstationCode?: string; // 宸ヤ綔绔欑紪鐮�
workstationName?: string; // 宸ヤ綔绔欏悕绉�
@@ -33,13 +46,17 @@
startTime?: number; // 寮�濮嬬敓浜ф椂闂�
endTime?: number; // 缁撴潫鐢熶骇鏃堕棿
duration?: number; // 鐢熶骇鏃堕暱锛堝伐浣滄棩锛�1=8灏忔椂锛�
- requestDate?: number; // 闇�姹傛棩鏈燂紙浠庡伐鍗曟煡锛�
+ requestDate?: number; // 闇�姹傛棩鏈燂紙浠庤鍗曟煡锛�
finishDate?: number; // 瀹屾垚鏃ユ湡
cancelDate?: number; // 鍙栨秷鏃ユ湡
colorCode?: string; // 鐢樼壒鍥炬樉绀洪鑹�
status?: number; // 浠诲姟鐘舵��
checkFlag?: boolean; // 鏄惁璐ㄦ锛堟淳鐢熻嚜宸ヨ壓璺嚎宸ュ簭锛�
+ backflushFlag?: boolean; // 鏄惁鍊掑啿锛堟淳鐢熻嚜宸ヨ壓璺嚎宸ュ簭锛�
remark?: string; // 澶囨敞
+ pauseRecords?: PauseRecord[]; // 鍋滃伐璁板綍
+ reportableQuantity?: number; // 鍙姤宸ユ暟閲�
+ assigneeUserIds?: number[]; // 鎶ュ伐浜�
}
/** MES 鐢熶骇浠诲姟鍒嗛〉鏌ヨ鍙傛暟 */
@@ -53,6 +70,26 @@
itemId?: number;
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 +130,80 @@
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 },
+ );
+}
+
+/** 鏍规嵁宸ヤ綔绔欏拰鏁伴噺璁＄畻鐢熶骇鏃堕暱 */
+export function calculateTaskDuration(workstationId: number, quantity: number) {
+ return requestClient.get<{ duration: number }>(
+ '/mes/pro/task/calculate-duration',
+ { 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