From 302c591ca77dd4fb2b6e373d9912b91ee88f89f5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 23 八月 2023 12:58:56 +0800
Subject: [PATCH] 下发工艺参数时使用nsq获取工艺参数
---
service/task.go | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/service/task.go b/service/task.go
index 86ee38e..3cb816f 100644
--- a/service/task.go
+++ b/service/task.go
@@ -35,13 +35,13 @@
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 {
@@ -52,6 +52,7 @@
if err != nil {
return nil, ecode.DBErr
}
+ taskData = new(response.TaskData)
taskData.Order = order
taskData.Procedure = procedure
return taskData, ecode.OK
@@ -71,6 +72,6 @@
})
}
-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()
}
--
Gitblit v1.8.0