From ffdeee34afd3c28f603584e80039fc1dc30f1ff9 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 13 九月 2023 17:27:22 +0800
Subject: [PATCH] 下发工艺参数时记录该工序对应的设备位置
---
service/task.go | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/service/task.go b/service/task.go
index 96f2b4f..16bfd92 100644
--- a/service/task.go
+++ b/service/task.go
@@ -66,8 +66,11 @@
}
for _, procedure := range procedures {
taskData := response.TaskData{
- Order: orderMap[procedure.WorkOrderID],
- Procedure: procedure,
+ Order: orderMap[procedure.WorkOrderID],
+ Procedure: procedure,
+ AllProcedures: nil,
+ CurrentProcedureIndex: 0,
+ Position: procedure.Position,
}
taskDataList = append(taskDataList, &taskData)
}
@@ -82,6 +85,16 @@
return procedure, ecode.OK
}
+func (slf TaskService) UpdateProcedureStatusAndPosition(db *gorm.DB, id int, status model.ProcedureStatus, position int) error {
+ if status == model.ProcedureStatusFinished {
+ ProgressCacheUnset()
+ }
+ return model.NewProceduresSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
+ "status": status,
+ "position": position,
+ })
+}
+
func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id int, status model.ProcedureStatus) error {
if status == model.ProcedureStatusFinished {
ProgressCacheUnset()
--
Gitblit v1.8.0