From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix

---
 crontask/cron_task.go |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/crontask/cron_task.go b/crontask/cron_task.go
index 2bd87c3..dcc64c0 100644
--- a/crontask/cron_task.go
+++ b/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)
 			}
@@ -80,7 +80,7 @@
 	})
 
 	if isMaster {
-		s.Every(60).Seconds().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁
+		s.Every(20).Seconds().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁
 		s.Every(30).Seconds().Do(SyncTaskStatus)         //鍚屾浠诲姟鐘舵��
 		s.Every(10).Seconds().Do(CheckNsqConn)           //鏌ヨnsq杩炴帴
 		s.Every(30).Seconds().Do(ReportData)             //涓婃姤鏁版嵁
@@ -116,11 +116,15 @@
 	syncOkIds := make([]uint, 0, len(records))
 	for _, record := range records {
 		msg := &common.MsgTaskStatusUpdate{
-			WorkOrderId:  record.WorkOrderId,
-			ProcedureID:  record.ProcedureID,
-			DeviceId:     record.DeviceId,
-			IsProcessing: record.IsProcessing,
-			IsFinish:     record.IsFinish,
+			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)

--
Gitblit v1.8.0