From c8303f55819e2d8b5a56e6316f79c2250d9b659c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 08 十月 2023 21:16:09 +0800
Subject: [PATCH] 工序更新时保存使用的工艺参数编号
---
service/task.go | 121 +++++++++++++++++++++++++++-------------
1 files changed, 82 insertions(+), 39 deletions(-)
diff --git a/service/task.go b/service/task.go
index 16bfd92..a9b75ca 100644
--- a/service/task.go
+++ b/service/task.go
@@ -10,7 +10,6 @@
"apsClient/pkg/ecode"
"apsClient/pkg/logx"
"apsClient/pkg/structx"
- "encoding/json"
"fmt"
"gorm.io/gorm"
"time"
@@ -23,33 +22,51 @@
return &TaskService{}
}
-// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂存渶鏃╃殑浠诲姟
-func (slf TaskService) GetTask(page, pageSize int) (taskDataList []*response.TaskData, count int64, code int) {
- nowTs := time.Now().Unix()
+// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂村皬浜庣瓑浜庡綋鍓嶆椂闂达紝缁撴潫鏃堕棿澶т簬褰撳墠鏃堕棿鐨勪换鍔�
+func (slf TaskService) GetTask(page, pageSize int, mode constvar.TaskMode, channels []int32) (taskResp *response.TaskResponse, code int) {
+ var taskList []*response.TaskData
+ var count int64
+ var workers []*common.ProcedureWorker
+
+ taskResp = &response.TaskResponse{
+ Tasks: taskList,
+ TaskCount: count,
+ Workers: slf.WorkerDistinct(workers),
+ }
+
var (
err error
orders []*model.Order
procedures []*model.Procedures
workOrderIds []string
)
- procedures, err = model.NewProceduresSearch(nil).SetOrder("start_time asc").
- SetStartTimeMax(nowTs).
+ search := model.NewProceduresSearch(nil).
SetDeviceId(conf.Conf.System.DeviceId).
- SetStatusNot(model.ProcedureStatusFinished).
- SetPage(page, pageSize).
- FindNotTotal()
- if err != nil {
- return nil, 0, ecode.DBErr
+ SetPage(page, pageSize)
+
+ if mode == constvar.TaskModeUnStarted {
+ search.SetStatus(model.ProcedureStatusWaitProcess).
+ SetOrder("start_time asc")
+ } else if mode == constvar.TaskModeCurrent {
+ search.SetStatus(model.ProcedureStatusProcessing).
+ SetOrder("start_time asc")
+ } else if mode == constvar.TaskModeLastFinished {
+ search.SetStatus(model.ProcedureStatusFinished).SetOrder("updated_at desc")
+ if len(channels) > 0 {
+ search.SetChannels(channels)
+ }
}
- count, err = model.NewProceduresSearch(nil).
- SetDeviceId(conf.Conf.System.DeviceId).
- SetStatusNot(model.ProcedureStatusFinished).
- Count()
+
+ procedures, err = search.FindNotTotal()
if err != nil {
- return nil, 0, ecode.DBErr
+ return taskResp, ecode.DBErr
+ }
+
+ if err != nil {
+ return taskResp, ecode.DBErr
}
if len(procedures) == 0 {
- return nil, 0, ecode.OK
+ return taskResp, ecode.OK
}
for _, procedure := range procedures {
@@ -57,7 +74,7 @@
}
orders, err = model.NewOrderSearch(nil).SetWorkOrderIds(workOrderIds).FindNotTotal() //鐢卞伐搴忓弽鎺ㄥ伐鍗�
if err != nil {
- return nil, 0, ecode.DBErr
+ return taskResp, ecode.DBErr
}
orderMap := make(map[string]*model.Order, len(workOrderIds))
@@ -68,13 +85,42 @@
taskData := response.TaskData{
Order: orderMap[procedure.WorkOrderID],
Procedure: procedure,
- AllProcedures: nil,
+ AllProcedures: procedure.ProceduresInfo.AllProcedureNames,
CurrentProcedureIndex: 0,
- Position: procedure.Position,
+ Channel: procedure.Channel,
}
- taskDataList = append(taskDataList, &taskData)
+ index := 0
+ for _, name := range procedure.ProceduresInfo.AllProcedureNames {
+ if name == procedure.ProceduresInfo.ProcedureName {
+ break
+ }
+ index++
+ }
+ taskData.CurrentProcedureIndex = index
+ taskList = append(taskList, &taskData)
+ workers = append(workers, procedure.ProceduresInfo.Workers...)
}
- return taskDataList, count, ecode.OK
+ taskResp = &response.TaskResponse{
+ Tasks: taskList,
+ Workers: slf.WorkerDistinct(workers),
+ }
+ return taskResp, ecode.OK
+}
+func (slf TaskService) NewTaskCount() (count int64) {
+ count, _ = model.NewProceduresSearch(nil).SetDeviceId(conf.Conf.System.DeviceId).SetStatus(model.ProcedureStatusWaitProcess).Count()
+ return count
+}
+
+func (slf TaskService) WorkerDistinct(workers []*common.ProcedureWorker) (NoRepeatedWorkers []*common.ProcedureWorker) {
+ exists := make(map[string]bool, 0)
+ for _, worker := range workers {
+ key := fmt.Sprintf("%v%v", worker.WorkerID, worker.StartTime)
+ if !exists[key] {
+ NoRepeatedWorkers = append(NoRepeatedWorkers, worker)
+ exists[key] = true
+ }
+ }
+ return NoRepeatedWorkers
}
func (slf TaskService) GetProcedureById(id int) (*model.Procedures, int) {
@@ -85,19 +131,24 @@
return procedure, ecode.OK
}
-func (slf TaskService) UpdateProcedureStatusAndPosition(db *gorm.DB, id int, status model.ProcedureStatus, position int) error {
- if status == model.ProcedureStatusFinished {
- ProgressCacheUnset()
+func (slf TaskService) UpdateProcedureStatusAndChannel(db *gorm.DB, id int, status model.ProcedureStatus, channel int32, processModelNumber string) error {
+ if status == model.ProcedureStatusFinished || status == model.ProcedureStatusWaitProcess {
+ ProgressCacheUnset(channel)
}
- return model.NewProceduresSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
- "status": status,
- "position": position,
- })
+
+ upMap := map[string]interface{}{"status": status}
+ if status == model.ProcedureStatusProcessing {
+ upMap["process_model_number"] = processModelNumber
+ } else if status == model.ProcedureStatusWaitProcess {
+ upMap["process_model_number"] = ""
+ }
+
+ return model.NewProceduresSearch(db).SetId(id).UpdateByMap(upMap)
}
-func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id int, status model.ProcedureStatus) error {
+func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id int, status model.ProcedureStatus, channel int32) error {
if status == model.ProcedureStatusFinished {
- ProgressCacheUnset()
+ ProgressCacheUnset(channel)
}
return model.NewProceduresSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
"status": status,
@@ -116,9 +167,6 @@
func (slf TaskService) GetProcessParams(procedure *model.Procedures, order *model.Order) (processModel *model.ProcessModel, err error) {
data, err := model.NewProcessModelSearch().
- SetWorkOrder(procedure.WorkOrderID).
- SetDevice(procedure.ProceduresInfo.DeviceName).
- SetOrderId(procedure.OrderID).
SetProcedure(procedure.ProceduresInfo.ProcedureName).
SetProduct(order.ProductName).
SetOrder("id desc").First()
@@ -127,11 +175,6 @@
return nil, err
}
if err == nil {
- err = json.Unmarshal([]byte(data.Params), &data.ParamsMap)
- if err != nil {
- logx.Errorf("process model json.Unmarshal:%v", err)
- return
- }
return data, nil
}
--
Gitblit v1.8.0