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 | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/crontask/cron_task.go b/crontask/cron_task.go
index 7791a2e..eb99b68 100644
--- a/crontask/cron_task.go
+++ b/crontask/cron_task.go
@@ -117,18 +117,19 @@
for _, record := range records {
var finishAmount int
if record.IsFinish {
- progress, err := model.NewProductionProgressSearch(nil).SetProcedureId(record.ProcedureID).First()
+ 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,
+ 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)
--
Gitblit v1.8.0