fix

zhangqian

2023-12-01 8324f872ef3a4d0c978a9b1d062800c6a1701c12

 nsq/msg_handler.go

@@ -52,15 +52,16 @@
      procedureRecords := make([]*model.Procedures, 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,
            Channel:        procedure.Channel,
            ProceduresInfo: common.ProductProcedure{},
            ProductProcedureID: procedure.ProductProcedureID,
            WorkOrderID:        task.WorkOrder.WorkOrderID,
            OrderID:            task.WorkOrder.OrderID,
            DeviceID:           procedure.DeviceID,
            ProcedureID:        procedure.ProcedureID,
            StartTime:          procedure.StartTime,
            EndTime:            procedure.EndTime,
            Status:             model.ProcedureStatusWaitProcess,
            Channel:            procedure.Channel,
            ProceduresInfo:     common.ProductProcedure{},
         }
         procedureData, err := json.Marshal(procedure)
         if err != nil {
@@ -268,6 +269,7 @@
      Procedures:       strings.Join(procedures, ","),
      ExtChannelAmount: msg.ExtChannelAmount,
      DeviceMac:        msg.DeviceMac,
      DeviceName:       msg.DeviceName,
   }

   oldRecord, err := model.NewDeviceSearch().SetDeviceId(msg.ID).First()
@@ -275,7 +277,8 @@
      err = model.NewDeviceSearch().Create(deviceRecord)
   } else if oldRecord.ExtChannelAmount != deviceRecord.ExtChannelAmount ||
      oldRecord.Procedures != deviceRecord.Procedures ||
      oldRecord.DeviceMac != deviceRecord.DeviceMac {
      oldRecord.DeviceMac != deviceRecord.DeviceMac ||
      oldRecord.DeviceName != deviceRecord.DeviceName {
      err = model.NewDeviceSearch().SetDeviceId(msg.ID).Save(deviceRecord)
   }