From a53e35776e80a493ce5bbe49ea5ec8958044c546 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 28 十一月 2023 19:33:12 +0800
Subject: [PATCH] 兼容
---
model/common/common.go | 13 +++++++------
crontask/cron_task.go | 13 +++++++------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/crontask/cron_task.go b/crontask/cron_task.go
index f754783..eb99b68 100644
--- a/crontask/cron_task.go
+++ b/crontask/cron_task.go
@@ -123,12 +123,13 @@
}
}
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)
diff --git a/model/common/common.go b/model/common/common.go
index 55c1f7c..985cbe4 100644
--- a/model/common/common.go
+++ b/model/common/common.go
@@ -121,12 +121,13 @@
// MsgTaskStatusUpdate 浠诲姟鐘舵�佹敼鍙�
type MsgTaskStatusUpdate struct {
- WorkOrderId string `json:"workOrderId"` //宸ュ崟缂栧彿
- ProcedureID string `json:"procedureId"` // 宸ュ簭
- DeviceId string `json:"deviceId"` //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
- IsProcessing bool //鏄惁澶勭悊涓�
- IsFinish bool //鏄惁瀹屾垚
- FinishAmount int `json:"finishAmount"` //isFinish = true鏃跺彇宸ュ簭鏈�缁堝姞宸ユ暟浼犱笂鍘�
+ WorkOrderId string `json:"workOrderId"` //宸ュ崟缂栧彿
+ ProcedureID string `json:"procedureId"` // 宸ュ簭
+ DeviceId string `json:"deviceId"` //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
+ IsProcessing bool //鏄惁澶勭悊涓�
+ IsFinish bool //鏄惁瀹屾垚
+ FinishAmount int `json:"finishAmount"` //isFinish = true鏃跺彇宸ュ簭鏈�缁堝姞宸ユ暟浼犱笂鍘�
+ ProductProcedureID string `json:"productProcedureID"` //浜у搧宸ュ簭id
}
// DeviceMsg 涓嬪彂鍒扮粓绔殑璁惧淇℃伅
--
Gitblit v1.8.0