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 | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/crontask/cron_task.go b/crontask/cron_task.go
index ae1ff95..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)
}
@@ -115,22 +115,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)
--
Gitblit v1.8.0