From 49f56cee1e2285fd32c43f35e3622d2ed6c5fec3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 26 八月 2023 20:09:07 +0800
Subject: [PATCH] plc tag
---
service/task.go | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/service/task.go b/service/task.go
index 86ee38e..5b7be1c 100644
--- a/service/task.go
+++ b/service/task.go
@@ -35,23 +35,24 @@
return nil, ecode.DBErr
}
procedure, err := model.NewProceduresSearch(nil).
- SetOrderId(order.OrderID).
+ SetWorkOrderId(order.WorkOrderID).
SetStartTimeMax(nowTs).
SetStatus(model.ProcedureStatusUnFinished).
First()
if err == gorm.ErrRecordNotFound { //璇ヨ鍗曟湰璁惧鍏ㄩ儴宸ュ簭瀹屾垚锛屾妸璁㈠崟缃负瀹屾垚鐘舵�侊紙鍙槸瀵规湰璁惧瀹屾垚锛�
err = nil
- err = model.NewOrderSearch(nil).SetOrderId(order.OrderID).UpdateByMap(map[string]interface{}{
+ 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 slf.GetTask() //褰撳墠璁㈠崟宸插畬鎴愶紝缁х画鏌ヨ鏈畬鎴愯鍗�
}
if err != nil {
return nil, ecode.DBErr
}
+ taskData = new(response.TaskData)
taskData.Order = order
taskData.Procedure = procedure
return taskData, ecode.OK
@@ -71,6 +72,15 @@
})
}
-func (slf TaskService) GetOrderByOrderId(orderId string) (order *model.Order, err error) {
- return model.NewOrderSearch(nil).SetOrderId(orderId).First()
+func (slf TaskService) GetOrderByWorkOrderId(workOrderId string) (order *model.Order, err error) {
+ return model.NewOrderSearch(nil).SetWorkOrderId(workOrderId).First()
+}
+
+// GetComingTask 鑾峰彇鏃堕棿鏈埌鐨勬渶鏃╀换鍔�
+func (slf TaskService) GetComingTask() (workOrder *model.Order, err error) {
+ nowTs := time.Now().Unix()
+ orderSearch := model.NewOrderSearch(nil)
+ return orderSearch.SetOrder("created_at asc").
+ SetStartTimeMin(nowTs).
+ SetStatus(model.OrderStatusUnFinished).First()
}
--
Gitblit v1.8.0