From 39864dcc835f1e75efd3f20a99d50a7edae4a94f Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 06 十一月 2023 17:59:51 +0800
Subject: [PATCH] Merge branch 'wn' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into dev
---
src/api/task.ts | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/api/task.ts b/src/api/task.ts
index 8be45af..ca76d50 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 {
@@ -46,8 +47,8 @@
startTime: number
endTime: number
workHours: string
- inputMaterials: string
- outputMaterials: string
+ inputMaterials: Material[]
+ outputMaterials: Material[]
workers: Worker[]
allProcedureNames: string[]
channel: number
@@ -60,6 +61,13 @@
AllProcedures: string[]
CurrentProcedureIndex: number
CanStarted: boolean
+}
+export interface Material {
+ materialId: string
+ materialName: string
+ amount: number
+ unit: string
+ date: string
}
export interface Worker {
@@ -96,6 +104,6 @@
}
export interface CraftParamsResponse {
- number: string
+ Number: string
Params: CraftParam[]
}
--
Gitblit v1.8.0