From b331c9990a0396301e934daffe095f99d62d1c89 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 27 九月 2023 15:58:49 +0800
Subject: [PATCH] 任务获取修改，状态2只返回已开始和已结束的
---
nsq/msg_handler.go | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 5237309..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
}
@@ -152,6 +153,12 @@
}
}
+ if resp.PlcConfig.Method == "" {
+ return nil
+ }
+
+ resp.PlcConfig.Method.ConvertToEnglish()
+
var record model.DevicePlc
err = mapstructure.Decode(resp.PlcConfig, &record)
if err != nil {
--
Gitblit v1.8.0