From 5773bf718397e8a7073b935d989259ef0cb29219 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 05 二月 2024 19:20:34 +0800
Subject: [PATCH] Merge branch 'reportWorkAppFile/reportWorkApp' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into reportWorkAppFile/reportWorkApp
---
src/api/task.ts | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/api/task.ts b/src/api/task.ts
index 8be45af..ca0ee32 100644
--- a/src/api/task.ts
+++ b/src/api/task.ts
@@ -16,6 +16,7 @@
startTime: number
endTime: number
Status: number
+ finishNumber: number
}
export interface Procedure {
@@ -34,6 +35,7 @@
/** 1 鏈敓浜� 2鐢熶骇涓� 3鐢熶骇瀹屾垚*/
Status: 1 | 2 | 3
procedure: ProcedureProcedure
+ productProcedureID: string
}
export interface ProcedureProcedure {
@@ -46,11 +48,21 @@
startTime: number
endTime: number
workHours: string
- inputMaterials: string
- outputMaterials: string
+ inputMaterials: Material[]
+ outputMaterials: Material[]
workers: Worker[]
allProcedureNames: string[]
channel: number
+}
+
+export interface ParamsMap {
+ [keyProp: string]: string
+}
+export interface ProcedureModel {
+ number: string
+ product: string
+ procedure: string
+ paramsMap: ParamsMap
}
export interface Task {
@@ -60,6 +72,14 @@
AllProcedures: string[]
CurrentProcedureIndex: number
CanStarted: boolean
+ ProcedureModel: ProcedureModel
+}
+export interface Material {
+ materialId: string
+ materialName: string
+ amount: number
+ unit: string
+ date: string
}
export interface Worker {
@@ -96,6 +116,6 @@
}
export interface CraftParamsResponse {
- number: string
+ Number: string
Params: CraftParam[]
}
--
Gitblit v1.8.0