From 478720790a6c7adfad82cf6829ef9471a00daab2 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 18 八月 2023 15:50:41 +0800
Subject: [PATCH] 增加workorder,完善
---
api/v1/task.go | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 2e01370..c2e6b8c 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -58,18 +58,18 @@
ctx.Fail(code)
return
}
- order, err := service.NewTaskService().GetOrderByOrderId(procedure.OrderID)
+ order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
if err != nil {
ctx.Fail(ecode.UnknownErr)
return
}
params := service.GetProcessModelParams{
- WorkOrder: "",
+ WorkOrder: procedure.WorkOrderID,
OrderId: procedure.OrderID,
Product: order.ProductName,
Procedure: procedure.ProceduresInfo.ProcedureName,
- Device: procedure.ProceduresInfo.DeviceID,
+ Device: procedure.ProceduresInfo.DeviceName,
}
resp, err := service.ProcessModel{}.GetProcessModel(params)
@@ -138,7 +138,7 @@
ctx.Fail(code)
return
}
- order, err := service.NewTaskService().GetOrderByOrderId(procedure.OrderID)
+ order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
if err != nil {
ctx.Fail(ecode.UnknownErr)
return
--
Gitblit v1.8.0