From 1c31947fd6902b570e3b9ac9eaab8ad9de58ee19 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 02 九月 2023 15:23:41 +0800
Subject: [PATCH] 获取任务逻辑调整，只获取本设备的工序，由工序反推订单
---
api/v1/task.go | 56 ++++++++++++--------------------------------------------
1 files changed, 12 insertions(+), 44 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index d8ebcc7..0a364f5 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -1,12 +1,9 @@
package v1
import (
- "apsClient/conf"
"apsClient/constvar"
"apsClient/model"
- "apsClient/model/common"
"apsClient/model/response"
- "apsClient/nsq"
"apsClient/pkg/contextx"
"apsClient/pkg/convertx"
"apsClient/pkg/ecode"
@@ -95,39 +92,24 @@
return
}
- caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicProcessParamsRequest, conf.Conf.NsqConf.NodeId), fmt.Sprintf(constvar.NsqTopicProcessParamsResponse, conf.Conf.NsqConf.NodeId))
- var result common.ResponseProcessParams
-
- err = caller.Call(common.RequestProcessParams{
- WorkOrder: procedure.WorkOrderID,
- OrderId: procedure.OrderID,
- Product: order.ProductName,
- Procedure: procedure.ProceduresInfo.ProcedureName,
- Device: procedure.ProceduresInfo.DeviceName}, &result, time.Second*3)
- if err != nil {
- logx.Errorf("TaskStart GetProcessModel error:%v", err.Error())
- ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
- return
- }
- if result.ParamsMap == nil {
- logx.Errorf("TaskStart GetProcessModel response miss process params:%v", result)
- ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
+ processModel, err := service.NewTaskService().GetProcessParams(procedure, order)
+ if err != nil || processModel == nil || processModel.ParamsMap == nil {
+ ctx.Fail(ecode.UnknownErr)
return
}
- processParamsArr := make([]response.ProcessParams, 0, len(result.ParamsMap))
- for k, v := range result.ParamsMap {
+ processParamsArr := make([]response.ProcessParams, 0, len(processModel.ParamsMap))
+ for k, v := range processModel.ParamsMap {
processParamsArr = append(processParamsArr, response.ProcessParams{
Key: k,
Value: v,
})
}
- data := response.ProcessParamsResponse{
- Number: result.Number,
+ resp := response.ProcessParamsResponse{
+ Number: processModel.Number,
Params: processParamsArr,
}
- logx.Infof("TaskStart Notice GetProcessModel: %+v", result)
- ctx.OkWithDetailed(data)
+ ctx.OkWithDetailed(resp)
}
// TaskFinish
@@ -196,23 +178,9 @@
return
}
- caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicProcessParamsRequest, conf.Conf.NsqConf.NodeId), fmt.Sprintf(constvar.NsqTopicProcessParamsResponse, conf.Conf.NsqConf.NodeId))
- var result common.ResponseProcessParams
-
- err = caller.Call(common.RequestProcessParams{
- WorkOrder: procedure.WorkOrderID,
- OrderId: procedure.OrderID,
- Product: order.ProductName,
- Procedure: procedure.ProceduresInfo.ProcedureName,
- Device: procedure.ProceduresInfo.DeviceName}, &result, time.Second*3)
- if err != nil {
- logx.Errorf("SendProcessParams GetProcessModel error:%v", err.Error())
- ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
- return
- }
- if result.ParamsMap == nil {
- logx.Errorf("SendProcessParams GetProcessModel response miss process params:%v", result)
- ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
+ processModel, err := service.NewTaskService().GetProcessParams(procedure, order)
+ if err != nil || processModel == nil || processModel.ParamsMap == nil {
+ ctx.Fail(ecode.UnknownErr)
return
}
@@ -238,7 +206,7 @@
return
}
plcConfig.MaxTryTimes = 2
- err = SendParams(result.ParamsMap, plcConfig)
+ err = SendParams(processModel.ParamsMap, plcConfig)
if err != nil {
logx.Errorf("SendProcessParams: %v", err.Error())
ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
--
Gitblit v1.8.0