三菱协议更改

zhangqian

2023-09-12 b555874608be2e4bb40cceba60b497c04caef842

 nsq/msg_handler.go

@@ -49,15 +49,16 @@
      }

      procedureRecords := make([]*model.Procedures, 0, len(task.Procedures))
      procedureIds := make([]string, 0, len(task.Procedures))
      for _, procedure := range task.Procedures {
         procedureRecord := model.Procedures{
            WorkOrderID:    task.WorkOrder.WorkOrderID,
            OrderID:        task.WorkOrder.OrderID,
            DeviceID:       procedure.DeviceID,
            ProcedureID:    procedure.ProcedureID,
            StartTime:      procedure.StartTime,
            EndTime:        procedure.EndTime,
            Status:         model.ProcedureStatusWaitProcess,
            ProcedureData:  "",
            ProceduresInfo: common.ProductProcedure{},
         }
         procedureData, err := json.Marshal(procedure)
@@ -66,6 +67,7 @@
         }
         procedureRecord.ProcedureData = string(procedureData)
         procedureRecords = append(procedureRecords, &procedureRecord)
         procedureIds = append(procedureIds, procedure.ProcedureID)
      }

      var orderRecord model.Order
@@ -77,10 +79,23 @@
      }

      err = model.WithTransaction(func(db *gorm.DB) error {
         if err = model.NewOrderSearch(db).Save(&orderRecord); err != nil {
            return err
         if oldWorkOrder != nil && oldWorkOrder.WorkOrderID != "" {
            if err = model.NewOrderSearch(db).SetId(oldWorkOrder.ID).Updates(&orderRecord); err != nil {
               return err
            }
            for _, procedure := range procedureRecords {
               err = model.NewProceduresSearch(db).SetWorkOrderId(procedure.WorkOrderID).SetProcedureId(procedure.ProcedureID).Updates(procedure)
               if err != nil {
                  return err
               }
            }
         } else {
            if err = model.NewOrderSearch(db).Create(&orderRecord); err != nil {
               return err
            }
            return model.NewProceduresSearch(db).CreateBatch(procedureRecords)
         }
         return model.NewProceduresSearch(db).CreateBatch(procedureRecords)
         return nil
      })
      if err != nil {
         logx.Errorf(" save task message error err: %v", err.Error())