当前使用的工艺编号置顶

zhangqian

2023-10-09 81cda4f09d4c0fff6edd087d1c49d05cb6eaab38

 api/v1/task.go

@@ -156,11 +156,19 @@
      ctx.Fail(ecode.DBErr)
      return
   }

   processModel, err := service.NewTaskService().GetProcessParams(procedure, order)
   if err != nil || processModel == nil || processModel.ParamsMap == nil {
      ctx.FailWithMsg(ecode.ParamsErr, "未获取到工艺参数，请在工艺模型库中上传！")
      return
   var processModel *model.ProcessModel
   if procedure.ProcessModelNumber != "" {
      processModel, err = service.GetProcessModelByNumber(procedure.ProcessModelNumber)
      if err != nil || processModel == nil || processModel.ParamsMap == nil {
         ctx.FailWithMsg(ecode.ParamsErr, "未获取到工艺参数，请在工艺模型库中上传！")
         return
      }
   } else {
      processModel, err = service.NewTaskService().GetProcessParams(procedure, order)
      if err != nil || processModel == nil || processModel.ParamsMap == nil {
         ctx.FailWithMsg(ecode.ParamsErr, "未获取到工艺参数，请在工艺模型库中上传！")
         return
      }
   }

   processParamsArr := make([]response.ProcessParams, 0, len(processModel.ParamsMap))
@@ -284,11 +292,10 @@
   }

   err = model.WithTransaction(func(db *gorm.DB) error {
      err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, params.Channel)
      err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel, processModel.Number)
      if err != nil {
         return err
      }
      procedure.Channel = params.Channel
      err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusProcessing)
      if err != nil {
         return err
@@ -310,12 +317,7 @@
   if err != nil {
      logx.Errorf("SendProcessParams: %v", err.Error())
      err = model.WithTransaction(func(db *gorm.DB) error {
         err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusWaitProcess, params.Channel)
         if err != nil {
            return err
         }
         procedure.Channel = params.Channel
         err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusWaitProcess)
         err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusWaitProcess, procedure.Channel, "")
         if err != nil {
            return err
         }
@@ -325,7 +327,7 @@
      return
   }
   plcConfig.CurrentTryTimes = 0
   err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, params.Channel, order.Amount.IntPart())
   err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, procedure.Channel, order.Amount.IntPart())
   if err != nil {
      ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC请求失败，请检查PLC配置")
      return
@@ -397,6 +399,7 @@
      ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC请求失败，请检查PLC配置！")
      return
   }
   _ = taskService.UpdateProcedureStatusAndChannel(nil, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel, processModel.Number)
   ctx.Ok()
}