From 762dd6158767829ba94e32a3fa0cb00fca320716 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 28 十一月 2023 14:38:58 +0800
Subject: [PATCH] 工序完成时，上报工序的最后完成数量
---
model/common/common.go | 1 +
crontask/cron_task.go | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/crontask/cron_task.go b/crontask/cron_task.go
index 2bd87c3..7791a2e 100644
--- a/crontask/cron_task.go
+++ b/crontask/cron_task.go
@@ -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) //涓婃姤鏁版嵁
@@ -115,12 +115,20 @@
}
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,
}
caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicTaskProcedureStatusUpdate, conf.Conf.NsqConf.NodeId), "")
err = caller.Send(msg)
diff --git a/model/common/common.go b/model/common/common.go
index dee9b4c..55c1f7c 100644
--- a/model/common/common.go
+++ b/model/common/common.go
@@ -126,6 +126,7 @@
DeviceId string `json:"deviceId"` //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
IsProcessing bool //鏄惁澶勭悊涓�
IsFinish bool //鏄惁瀹屾垚
+ FinishAmount int `json:"finishAmount"` //isFinish = true鏃跺彇宸ュ簭鏈�缁堝姞宸ユ暟浼犱笂鍘�
}
// DeviceMsg 涓嬪彂鍒扮粓绔殑璁惧淇℃伅
--
Gitblit v1.8.0