工序保存使用的工艺参数编号

zhangqian

2023-10-08 a8622c9cc1b20eac20e384e704aa98194372e72a

 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,7 +292,7 @@
   }

   err = model.WithTransaction(func(db *gorm.DB) error {
      err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel)
      err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel, processModel.Number)
      if err != nil {
         return err
      }
@@ -309,11 +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, procedure.Channel)
         if err != nil {
            return err
         }
         err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusWaitProcess)
         err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusWaitProcess, procedure.Channel, "")
         if err != nil {
            return err
         }