From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix
---
service/task.go | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/service/task.go b/service/task.go
index bebd3ff..66bf691 100644
--- a/service/task.go
+++ b/service/task.go
@@ -1,6 +1,7 @@
package service
import (
+ "apsClient/conf"
"apsClient/constvar"
"apsClient/model"
"apsClient/model/common"
@@ -131,9 +132,21 @@
return procedure, ecode.OK
}
+func (slf TaskService) GetProcedureAndWorkOrder(procedureId uint) (procedure *model.Procedures, workOrder *model.Order, err error) {
+ procedure, err = model.NewProceduresSearch(nil).SetId(procedureId).First()
+ if err != nil {
+ return nil, nil, err
+ }
+ workOrder, err = model.NewOrderSearch(nil).SetWorkOrderId(procedure.WorkOrderID).First()
+ if err != nil {
+ return nil, nil, err
+ }
+ return procedure, workOrder, nil
+}
+
func (slf TaskService) UpdateProcedureStatusAndChannel(db *gorm.DB, id uint, status model.ProcedureStatus, channel int32, processModelNumber string) error {
if status == model.ProcedureStatusFinished || status == model.ProcedureStatusWaitProcess {
- ProgressCacheUnset(channel)
+ ProgressCacheUnset(conf.Conf.CurrentDeviceID, channel)
}
upMap := map[string]interface{}{"status": status}
@@ -173,6 +186,9 @@
logx.Errorf("TaskStart GetProcessModel err:%v", err)
return nil, err
}
+ if err == gorm.ErrRecordNotFound {
+ return nil, err
+ }
if err == nil {
return data, nil
}
@@ -190,12 +206,20 @@
// SaveTaskStatusSync 淇濆瓨浠诲姟鍚屾淇℃伅
func (slf TaskService) SaveTaskStatusSync(db *gorm.DB, record *model.TaskStatusSync) (err error) {
+ if record.IsProcessing {
+ record.StartTs = time.Now().Unix()
+ }
+ if record.IsFinish {
+ record.FinishTs = time.Now().Unix()
+ startedRecord, _ := model.NewTaskStatusSyncSearch(db).SetProductProcedureId(record.ProductProcedureID).SetWorkOrderId(record.WorkOrderId).First()
+ record.StartTs = startedRecord.StartTs
+ }
return model.NewTaskStatusSyncSearch(db).Create(record)
}
// GetTaskStatusSync 鑾峰彇寰呭悓姝ヤ换鍔′俊鎭�
func (slf TaskService) GetTaskStatusSync(limit int) ([]*model.TaskStatusSync, error) {
- return model.NewTaskStatusSyncSearch(nil).SetOrder("id desc").SetPage(1, limit).FindNotTotal()
+ return model.NewTaskStatusSyncSearch(nil).SetOrder("id asc").SetPage(1, limit).FindNotTotal()
}
// RemoveTaskStatusSync 鍒犻櫎鍚屾瀹岀殑璁板綍
--
Gitblit v1.8.0