From e4957d48bb364f7ee34bd672f53b71a66ca31e14 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 26 十月 2023 09:46:56 +0800
Subject: [PATCH] 工序增加实际开始时间和实际结束时间
---
service/task.go | 8 ++++++++
model/procedures.go | 2 ++
api/v1/task.go | 2 +-
3 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index c2b864c..8cdb4e5 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -376,7 +376,7 @@
ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
return
}
- _ = taskService.UpdateProcedureStatusAndChannel(nil, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel, processModel.Number)
+ _ = taskService.UpdateProcessModelNumber(nil, params.ProcedureId, processModel.Number)
ctx.Ok()
}
diff --git a/model/procedures.go b/model/procedures.go
index 7597f2f..4e10260 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -20,6 +20,8 @@
ProcessModelNumber string `gorm:"index;" json:"processModelNumber"` //宸ヨ壓妯″瀷缂栧彿
StartTime int64 `json:"startTime"`
EndTime int64 `json:"endTime"`
+ RealStartTime int64 `json:"realStartTime"`
+ RealEndTime int64 `json:"realEndTime"`
Status ProcedureStatus
ProcedureData string `json:"-"` //common.ProductProcedure json涓�
ProceduresInfo common.ProductProcedure `json:"procedure" gorm:"-"` //common.ProductProcedure 瀵硅薄
diff --git a/service/task.go b/service/task.go
index fbc355f..35a368e 100644
--- a/service/task.go
+++ b/service/task.go
@@ -137,13 +137,21 @@
upMap := map[string]interface{}{"status": status}
if status == model.ProcedureStatusProcessing {
upMap["process_model_number"] = processModelNumber
+ upMap["real_start_time"] = time.Now().Unix()
} else if status == model.ProcedureStatusWaitProcess {
upMap["process_model_number"] = ""
+ } else if status == model.ProcedureStatusFinished {
+ upMap["real_end_time"] = time.Now().Unix()
}
return model.NewProceduresSearch(db).SetId(id).UpdateByMap(upMap)
}
+func (slf TaskService) UpdateProcessModelNumber(db *gorm.DB, id uint, processModelNumber string) error {
+ upMap := map[string]interface{}{"process_model_number": processModelNumber}
+ return model.NewProceduresSearch(db).SetId(id).UpdateByMap(upMap)
+}
+
func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id uint, status model.ProcedureStatus, channel int32) error {
if status == model.ProcedureStatusFinished {
ProgressCacheUnset(channel)
--
Gitblit v1.8.0