改成串行

zhangqian

2023-12-20 061c52572b3099cf5fee70245981804b9ca4bc6a

 crontask/cron_task.go

@@ -38,33 +38,19 @@
      }
      for _, addressItem := range plcConfig.Details {
         if addressItem.FieldName == constvar.PlcStartAddressTypeFinishNumber {
            value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
            value, err := service.PlcReadDirect(plcConfig, addressItem)
            if err != nil {
               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)
         }
      }

   })
   if err != nil {
      return err
   }

   s.Every(totalNumberTimeInterval).Seconds().Do(func() {
      plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
      if code != ecode.OK {
         return
      }
      for _, addressItem := range plcConfig.Details {
         if addressItem.FieldName == constvar.PlcStartAddressTypeTotalNumber {
            value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
         } else if addressItem.FieldName == constvar.PlcStartAddressTypeTotalNumber {
            value, err := service.PlcReadDirect(plcConfig, addressItem)
            if err != nil {
               logx.Infof("plc read total number err: %v", err)
               continue
@@ -75,9 +61,12 @@
            }
            logx.Infof("plc read total number: %v", totalNumber)
         }
      }

      }
   })
   if err != nil {
      return err
   }

   if isMaster {
      s.Every(20).Seconds().Do(SyncProductionProgress) //同步生产数据
@@ -115,22 +104,16 @@
   }
   syncOkIds := make([]uint, 0, len(records))
   for _, record := range records {
      var finishAmount int
      if record.IsFinish {
         progress, err := model.NewProductionProgressSearch(nil).SetWorkOrderId(record.WorkOrderId).SetProductProcedureId(record.ProductProcedureID).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,
         FinishAmount:       record.FinishedQuantity,
         ProductProcedureID: record.ProductProcedureID,
         Ts:                 record.Ts,
         StartTs:            record.StartTs,
         FinishTs:           record.FinishTs,
      }
      caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicTaskProcedureStatusUpdate, conf.Conf.NsqConf.NodeId), "")
      err = caller.Send(msg)
@@ -141,7 +124,7 @@
      syncOkIds = append(syncOkIds, record.ID)
   }
   if len(syncOkIds) > 0 {
      err = service.NewTaskService().RemoveTaskStatusSync(syncOkIds)
      err = service.NewTaskService().FinishTaskStatusSync(syncOkIds)
      if err != nil {
         logx.Errorf("sync task status delete sync ok records error:%v", err)
      }