获取任务逻辑调整，只获取本设备的工序，由工序反推订单

zhangqian

2023-09-02 1c31947fd6902b570e3b9ac9eaab8ad9de58ee19

 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,10 +206,10 @@
      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, "写入工艺参数失败")
      ctx.FailWithMsg(ecode.NeedConfirmedErr, "糟糕，工艺下发失败。")
      return
   }
   if code != ecode.OK {
@@ -251,7 +219,7 @@
   plcConfig.CurrentTryTimes = 0
   err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, order.Amount.IntPart())
   if err != nil {
      ctx.FailWithMsg(ecode.NeedConfirmedErr, "写入生产数量失败")
      ctx.FailWithMsg(ecode.NeedConfirmedErr, "糟糕，工艺下发失败。")
      return
   }
   ctx.Ok()