From 8be1cd495fdcbc3a3599e57b7d21c4c186a018ed Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期四, 02 十一月 2023 16:56:11 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/refactor-new-style

---
 src/api/task.ts |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/api/task.ts b/src/api/task.ts
index 521f229..bb0f969 100644
--- a/src/api/task.ts
+++ b/src/api/task.ts
@@ -47,8 +47,8 @@
   startTime: number
   endTime: number
   workHours: string
-  inputMaterials: string
-  outputMaterials: string
+  inputMaterials: inputMaterial[]
+  outputMaterials: inputMaterial[]
   workers: Worker[]
   allProcedureNames: string[]
   channel: number
@@ -62,6 +62,14 @@
   CurrentProcedureIndex: number
   CanStarted: boolean
 }
+export interface inputMaterial {
+  materialId: string
+  materialName: string
+  amount: number
+  unit: string
+  background: string
+  date: string
+}
 
 export interface Worker {
   workerId: string

--
Gitblit v1.8.0