From 49e90e5de2e7166e74e26102dff9064b933fc5fd Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 05 九月 2023 16:00:27 +0800
Subject: [PATCH] 工序的生产进度存表
---
service/task.go | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/service/task.go b/service/task.go
index 69cba48..4def207 100644
--- a/service/task.go
+++ b/service/task.go
@@ -25,6 +25,10 @@
// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂存渶鏃╃殑浠诲姟
func (slf TaskService) GetTask() (taskData *response.TaskData, code int) {
+ if v, ok := TaskCacheGet(); ok {
+ return v, ecode.OK
+ }
+
nowTs := time.Now().Unix()
var (
err error
@@ -51,6 +55,7 @@
taskData = new(response.TaskData)
taskData.Order = order
taskData.Procedure = procedure
+ TaskCacheSet(taskData)
return taskData, ecode.OK
}
@@ -63,6 +68,10 @@
}
func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id int, status model.ProcedureStatus) error {
+ if status == model.ProcedureStatusFinished {
+ TaskCacheUnset()
+ ProgressCacheUnset()
+ }
return model.NewProceduresSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
"status": status,
})
@@ -125,11 +134,11 @@
return
}
-// GetCurrentTask 鑾峰彇寰呭畬鎴愭垨杩涜涓殑浠诲姟锛� 姣忎釜宸ュ崟鍙湁涓�涓伐搴�
-func (slf TaskService) GetCurrentTask() (workOrder *model.Order, err error) {
+// GetNextTask 鑾峰彇鏈紑濮嬬殑浠诲姟
+func (slf TaskService) GetNextTask() (workOrder *model.Order, err error) {
nowTs := time.Now().Unix()
orderSearch := model.NewOrderSearch(nil)
return orderSearch.SetOrder("start_time asc").
SetStartTimeMin(nowTs).
- SetStatusList([]model.OrderStatus{model.OrderStatusWaitProcess, model.OrderStatusProcessing}).First()
+ SetStatus(model.OrderStatusWaitProcess).First()
}
--
Gitblit v1.8.0