From 28addaa46cb97c20ad37e13eb10535de7b75e71c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 29 十一月 2023 19:29:43 +0800
Subject: [PATCH] 首次报工开始时间为工序开始时间
---
crontask/cron_task.go | 58 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 11 deletions(-)
diff --git a/crontask/cron_task.go b/crontask/cron_task.go
index c38ef9d..eb99b68 100644
--- a/crontask/cron_task.go
+++ b/crontask/cron_task.go
@@ -45,8 +45,8 @@
}
finishNumber := cast.ToInt64(value)
if finishNumber != 0 {
- service.PlcCacheSet(addressItem.Channel, constvar.PlcCacheKeyFinishNumber, finishNumber)
- _ = service.NewProgressService().UpdateProgress(addressItem.Channel, cast.ToInt64(finishNumber))
+ service.PlcCacheSet(conf.Conf.CurrentDeviceID, addressItem.Channel, constvar.PlcCacheKeyFinishNumber, finishNumber)
+ _ = service.NewProgressService().UpdateProgress(conf.Conf.CurrentDeviceID, addressItem.Channel, cast.ToInt64(finishNumber))
}
logx.Infof("plc read finish number: %v", finishNumber)
}
@@ -71,8 +71,7 @@
}
totalNumber := cast.ToInt64(value)
if totalNumber != 0 {
- service.PlcCacheSet(addressItem.Channel, constvar.PlcCacheKeyTotalNumber, totalNumber)
- _ = service.NewProgressService().UpdateProgress(addressItem.Channel, cast.ToInt64(totalNumber))
+ service.PlcCacheSet(conf.Conf.CurrentDeviceID, addressItem.Channel, constvar.PlcCacheKeyTotalNumber, totalNumber)
}
logx.Infof("plc read total number: %v", totalNumber)
}
@@ -81,10 +80,10 @@
})
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) //涓婃姤鏁版嵁
}
s.Every(20).Seconds().Do(QueryClusterStatus) //鏌ヨ闆嗙兢鑺傜偣鏁伴噺
@@ -116,17 +115,27 @@
}
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,
+ WorkOrderId: record.WorkOrderId,
+ ProcedureID: record.ProcedureID,
+ DeviceId: record.DeviceId,
+ IsProcessing: record.IsProcessing,
+ IsFinish: record.IsFinish,
+ FinishAmount: finishAmount,
+ ProductProcedureID: record.ProductProcedureID,
}
caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicTaskProcedureStatusUpdate, conf.Conf.NsqConf.NodeId), "")
err = caller.Send(msg)
if err != nil {
logx.Errorf("sync task status send msg error:%v", err.Error())
+ continue
}
syncOkIds = append(syncOkIds, record.ID)
}
@@ -138,6 +147,33 @@
}
}
+func ReportData() {
+ records, err := model.NewReportsToCloudSearch(nil).SetOrder("id desc").SetPage(1, 100).FindNotTotal()
+ if err != nil {
+ logx.Errorf("ReportData get records err:%v", err)
+ }
+ okIds := make([]uint, 0, len(records))
+ for _, record := range records {
+ msg := &common.MsgReportData{
+ ReportType: record.ReportType,
+ Content: record.Content,
+ }
+ caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicApsClientReportData, conf.Conf.NsqConf.NodeId), "")
+ err = caller.Send(msg)
+ if err != nil {
+ logx.Errorf("sync task status send msg error:%v", err.Error())
+ continue
+ }
+ okIds = append(okIds, record.ID)
+ }
+ if len(okIds) > 0 {
+ err = model.NewReportsToCloudSearch(nil).SetIDs(okIds).Delete()
+ if err != nil {
+ logx.Errorf("ReportData delete report ok records error:%v", err)
+ }
+ }
+}
+
func RestartTask(isMaster bool) error {
if s != nil {
s.Stop()
--
Gitblit v1.8.0