From 7e85f7f90911d4bf25821357690d94085a42b36d Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 26 九月 2023 17:39:11 +0800
Subject: [PATCH] 更改一些错误文案，增加plc断开错误文案，重发请求下发任务时直接返回成功
---
nsq/msg_handler.go | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index b13dd4b..4ea8c9c 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -59,6 +59,7 @@
StartTime: procedure.StartTime,
EndTime: procedure.EndTime,
Status: model.ProcedureStatusWaitProcess,
+ Channel: procedure.Channel,
ProceduresInfo: common.ProductProcedure{},
}
procedureData, err := json.Marshal(procedure)
@@ -83,7 +84,7 @@
return err
}
for _, procedure := range procedureRecords {
- err = model.NewProceduresSearch(db).SetWorkOrderId(procedure.WorkOrderID).SetProcedureId(procedure.ProcedureID).Updates(procedure)
+ err = model.NewProceduresSearch(db).SetWorkOrderId(procedure.WorkOrderID).SetProcedureId(procedure.ProcedureID).Upsert(procedure)
if err != nil {
return err
}
--
Gitblit v1.8.0