fix

zhangqian

2023-12-01 8324f872ef3a4d0c978a9b1d062800c6a1701c12

 crontask/cron_task.go

@@ -43,10 +43,10 @@
               logx.Infof("plc read finish number err: %v", err)
               continue
            }
            finishNumber := cast.ToInt64(value)
            finishNumber := cast.ToInt(value)
            if finishNumber != 0 {
               service.PlcCacheSet(conf.Conf.CurrentDeviceID, addressItem.Channel, constvar.PlcCacheKeyFinishNumber, finishNumber)
               _ = service.NewProgressService().UpdateProgress(conf.Conf.CurrentDeviceID, addressItem.Channel, cast.ToInt64(finishNumber))
               _ = service.NewProgressService().UpdateProgress(conf.Conf.CurrentDeviceID, addressItem.Channel, finishNumber)
            }
            logx.Infof("plc read finish number: %v", finishNumber)
         }
@@ -115,20 +115,16 @@
   }
   syncOkIds := make([]uint, 0, len(records))
   for _, record := range records {
      var finishAmount int
      if record.IsFinish {
         progress, err := model.NewProductionProgressSearch(nil).SetProcedureId(record.ProcedureID).First()
         if err == nil {
            finishAmount = int(progress.FinishedQuantity)
         }
      }
      msg := &common.MsgTaskStatusUpdate{
         WorkOrderId:  record.WorkOrderId,
         ProcedureID:  record.ProcedureID,
         DeviceId:     record.DeviceId,
         IsProcessing: record.IsProcessing,
         IsFinish:     record.IsFinish,
         FinishAmount: finishAmount,
         WorkOrderId:        record.WorkOrderId,
         ProcedureID:        record.ProcedureID,
         DeviceId:           record.DeviceId,
         IsProcessing:       record.IsProcessing,
         IsFinish:           record.IsFinish,
         FinishAmount:       record.FinishedQuantity,
         ProductProcedureID: record.ProductProcedureID,
         StartTs:            record.StartTs,
         FinishTs:           record.FinishTs,
      }
      caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicTaskProcedureStatusUpdate, conf.Conf.NsqConf.NodeId), "")
      err = caller.Send(msg)