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 | 83 ++++++++++++++++++++++++++++++++---------
1 files changed, 65 insertions(+), 18 deletions(-)
diff --git a/src/api/mes/pro/workorder/index.ts b/src/api/mes/pro/workorder/index.ts
index aefe8db..15a7635 100644
--- a/src/api/mes/pro/workorder/index.ts
+++ b/src/api/mes/pro/workorder/index.ts
@@ -1,14 +1,14 @@
-import type { PageParam, PageResult } from '../../../../packages/effects/request/src';
+锘縤mport type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
export namespace MesProWorkOrderApi {
- /** MES 鐢熶骇宸ュ崟 */
+ /** MES 鐢熶骇璁㈠崟 */
export interface WorkOrder {
id?: number; // 缂栧彿
- code?: string; // 宸ュ崟缂栫爜
- name?: string; // 宸ュ崟鍚嶇О
- type?: number; // 宸ュ崟绫诲瀷
+ code?: string; // 璁㈠崟缂栫爜
+ name?: string; // 璁㈠崟鍚嶇О
+ type?: number; // 璁㈠崟绫诲瀷
orderSourceType?: number; // 鏉ユ簮绫诲瀷
orderSourceCode?: string; // 鏉ユ簮鍗曟嵁缂栧彿
productId?: number; // 浜у搧缂栧彿
@@ -28,16 +28,16 @@
vendorCode?: string; // 渚涘簲鍟嗙紪鐮�
batchCode?: string; // 鎵规鍙�
requestDate?: number; // 闇�姹傛棩鏈�
- parentId?: number; // 鐖跺伐鍗曠紪鍙�
- parentCode?: string; // 鐖跺伐鍗曠紪鐮�
+ parentId?: number; // 鐖惰鍗曠紪鍙�
+ parentCode?: string; // 鐖惰鍗曠紪鐮�
finishDate?: number; // 瀹屾垚鏃堕棿
cancelDate?: number; // 鍙栨秷鏃堕棿
- status?: number; // 宸ュ崟鐘舵��
+ status?: number; // 璁㈠崟鐘舵��
remark?: string; // 澶囨敞
createTime?: number; // 鍒涘缓鏃堕棿
}
- /** MES 鐢熶骇宸ュ崟鍒嗛〉鏌ヨ鍙傛暟 */
+ /** MES 鐢熶骇璁㈠崟鍒嗛〉鏌ヨ鍙傛暟 */
export interface PageParams extends PageParam {
code?: string;
name?: string;
@@ -50,7 +50,7 @@
}
}
-/** 鏌ヨ鐢熶骇宸ュ崟鍒嗛〉 */
+/** 鏌ヨ鐢熶骇璁㈠崟鍒嗛〉 */
export function getWorkOrderPage(params: MesProWorkOrderApi.PageParams) {
return requestClient.get<PageResult<MesProWorkOrderApi.WorkOrder>>(
'/mes/pro/work-order/page',
@@ -58,44 +58,91 @@
);
}
-/** 鏌ヨ鐢熶骇宸ュ崟璇︽儏 */
+/** 鏌ヨ鐢熶骇璁㈠崟璇︽儏 */
export function getWorkOrder(id: number) {
return requestClient.get<MesProWorkOrderApi.WorkOrder>(
`/mes/pro/work-order/get?id=${id}`,
);
}
-/** 鏂板鐢熶骇宸ュ崟 */
+/** 鏂板鐢熶骇璁㈠崟 */
export function createWorkOrder(data: MesProWorkOrderApi.WorkOrder) {
return requestClient.post<number>('/mes/pro/work-order/create', data);
}
-/** 淇敼鐢熶骇宸ュ崟 */
+/** 淇敼鐢熶骇璁㈠崟 */
export function updateWorkOrder(data: MesProWorkOrderApi.WorkOrder) {
return requestClient.put('/mes/pro/work-order/update', data);
}
-/** 鍒犻櫎鐢熶骇宸ュ崟 */
+/** 鍒犻櫎鐢熶骇璁㈠崟 */
export function deleteWorkOrder(id: number) {
return requestClient.delete(`/mes/pro/work-order/delete?id=${id}`);
}
-/** 瀵煎嚭鐢熶骇宸ュ崟 */
+/** 瀵煎嚭鐢熶骇璁㈠崟 */
export function exportWorkOrder(params: any) {
return requestClient.download('/mes/pro/work-order/export-excel', { params });
}
-/** 瀹屾垚宸ュ崟 */
+/** 瀹屾垚璁㈠崟 */
export function finishWorkOrder(id: number) {
return requestClient.put(`/mes/pro/work-order/finish?id=${id}`);
}
-/** 鍙栨秷宸ュ崟 */
+/** 鍙栨秷璁㈠崟 */
export function cancelWorkOrder(id: number) {
return requestClient.put(`/mes/pro/work-order/cancel?id=${id}`);
}
-/** 纭宸ュ崟 */
+/** 纭璁㈠崟 */
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