From 2c96bc009ce9b92049293949d563a80fca9cd6c8 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 21 八月 2023 19:50:24 +0800
Subject: [PATCH] 下道工序取用方式更改
---
service/task.go | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/service/task.go b/service/task.go
index 11b543b..3cb816f 100644
--- a/service/task.go
+++ b/service/task.go
@@ -20,7 +20,7 @@
nowTs := time.Now().Unix()
orderSearch := model.NewOrderSearch(nil)
orderSearch.SetOrder("created_at asc").
- SetStartTimeMin(nowTs).
+ SetStartTimeMax(nowTs).
SetStatus(model.OrderStatusUnFinished)
var (
err error
@@ -35,13 +35,13 @@
return nil, ecode.DBErr
}
procedure, err := model.NewProceduresSearch(nil).
- SetOrderId(order.OrderID).
- SetStartTimeMin(nowTs).
+ 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