From 4eeae3848f43be6e17113f67de351c51f435b57a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 02 九月 2023 17:20:21 +0800
Subject: [PATCH] fix
---
service/task.go | 39 ++++++++++++++-------------------------
1 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/service/task.go b/service/task.go
index 43d6819..69cba48 100644
--- a/service/task.go
+++ b/service/task.go
@@ -26,37 +26,24 @@
// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂存渶鏃╃殑浠诲姟
func (slf TaskService) GetTask() (taskData *response.TaskData, code int) {
nowTs := time.Now().Unix()
- orderSearch := model.NewOrderSearch(nil)
- orderSearch.SetOrder("start_time asc").
- SetStartTimeMax(nowTs).
- SetStatusList([]model.OrderStatus{model.OrderStatusWaitProcess, model.OrderStatusProcessing})
var (
- err error
- order *model.Order
+ err error
+ order *model.Order
+ procedure *model.Procedures
)
- order, err = orderSearch.First() //鍏堝彇杩涜涓殑浠诲姟
- if err == gorm.ErrRecordNotFound {
- err = nil
- return nil, ecode.OK
- }
- if err != nil {
- return nil, ecode.DBErr
- }
- procedure, err := model.NewProceduresSearch(nil).SetOrder("start_time asc").
- SetWorkOrderId(order.WorkOrderID).
+ procedure, err = model.NewProceduresSearch(nil).SetOrder("start_time asc").
SetStartTimeMax(nowTs).
SetDeviceId(conf.Conf.System.DeviceId).
SetStatusNot(model.ProcedureStatusFinished).
First()
- if err == gorm.ErrRecordNotFound { //璇ヨ鍗曟湰璁惧鍏ㄩ儴宸ュ簭瀹屾垚锛屾妸璁㈠崟缃负瀹屾垚鐘舵�侊紙鍙槸瀵规湰璁惧瀹屾垚锛�
+ if err == gorm.ErrRecordNotFound {
+ return nil, ecode.OK
+ }
+
+ order, err = model.NewOrderSearch(nil).SetWorkOrderId(procedure.WorkOrderID).First() //鐢卞伐搴忓弽鎺ㄥ伐鍗�
+ if err == gorm.ErrRecordNotFound {
err = nil
- err = model.NewOrderSearch(nil).SetWorkOrderId(order.WorkOrderID).UpdateByMap(map[string]interface{}{
- "status": model.OrderStatusFinished,
- })
- if err != nil {
- return nil, ecode.DBErr
- }
- return slf.GetTask() //褰撳墠璁㈠崟宸插畬鎴愶紝缁х画鏌ヨ鏈畬鎴愯鍗�
+ return nil, ecode.OK
}
if err != nil {
return nil, ecode.DBErr
@@ -120,7 +107,9 @@
OrderId: procedure.OrderID,
Product: order.ProductName,
Procedure: procedure.ProceduresInfo.ProcedureName,
- Device: procedure.ProceduresInfo.DeviceName}, &result, time.Second*3)
+ Device: procedure.ProceduresInfo.DeviceName,
+ DeviceId: conf.Conf.System.DeviceId,
+ }, &result, time.Second*3)
if err != nil {
logx.Errorf("TaskStart GetProcessModel error:%v", err.Error())
return
--
Gitblit v1.8.0