From 288d78f66ecd1b628e8d1df7a3da99fc5e6880ec Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 08 十二月 2023 14:13:37 +0800
Subject: [PATCH] debug
---
api/v1/plc.go | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/api/v1/plc.go b/api/v1/plc.go
index f2c21f1..c4638dc 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -34,6 +34,9 @@
finishNumber interface{}
totalNumber interface{}
)
+
+ resp := new(response.ProductProgress)
+
if isConnect {
finishNumber, _ = service.PlcCacheGet(conf.Conf.CurrentDeviceID, params.Channel, constvar.PlcCacheKeyFinishNumber)
totalNumber, _ = service.PlcCacheGet(conf.Conf.CurrentDeviceID, params.Channel, constvar.PlcCacheKeyTotalNumber)
@@ -46,14 +49,17 @@
totalNumber = workOrder.Amount.IntPart()
}
} else {
- _, workOrder, _ := service.NewTaskService().GetProcedureAndWorkOrder(params.ProcedureId)
+ procedure, workOrder, _ := service.NewTaskService().GetProcedureAndWorkOrder(params.ProcedureId)
if workOrder != nil {
totalNumber = workOrder.Amount.IntPart()
+ }
+ if procedure != nil {
+ resp.RealStartTime = procedure.RealStartTime
+ resp.RealEndTime = procedure.RealEndTime
}
}
}
- resp := new(response.ProductProgress)
resp.FinishNumber = cast.ToInt(finishNumber)
resp.TotalNumber = cast.ToInt(totalNumber)
@@ -68,8 +74,10 @@
}
resp.PlcStatus = plcStatus
- resp.RealStartTime = service.TaskStartTimeGet(conf.Conf.CurrentDeviceID, params.Channel)
- resp.RealEndTime = service.TaskEndTimeGet(conf.Conf.CurrentDeviceID, params.Channel)
+ if params.ProcedureId == 0 {
+ resp.RealStartTime = service.TaskStartTimeGet(conf.Conf.CurrentDeviceID, params.Channel)
+ resp.RealEndTime = service.TaskEndTimeGet(conf.Conf.CurrentDeviceID, params.Channel)
+ }
ctx.OkWithDetailed(resp)
}
--
Gitblit v1.8.0