From 20112f939888065ba7fb18c19e89531877b845e5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 28 十一月 2023 16:33:34 +0800
Subject: [PATCH] fix
---
api/v1/plc.go | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/api/v1/plc.go b/api/v1/plc.go
index 4de07fb..f2c21f1 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -3,6 +3,7 @@
import (
"apsClient/conf"
"apsClient/constvar"
+ "apsClient/model"
"apsClient/model/request"
"apsClient/model/response"
_ "apsClient/model/response"
@@ -28,14 +29,35 @@
if !ok {
return
}
- finishNumber, _ := service.PlcCacheGet(conf.Conf.CurrentDeviceID, params.Channel, constvar.PlcCacheKeyFinishNumber)
- totalNumber, _ := service.PlcCacheGet(conf.Conf.CurrentDeviceID, params.Channel, constvar.PlcCacheKeyTotalNumber)
+ isConnect := service.PlcIsConnect()
+ var (
+ finishNumber interface{}
+ totalNumber interface{}
+ )
+ if isConnect {
+ finishNumber, _ = service.PlcCacheGet(conf.Conf.CurrentDeviceID, params.Channel, constvar.PlcCacheKeyFinishNumber)
+ totalNumber, _ = service.PlcCacheGet(conf.Conf.CurrentDeviceID, params.Channel, constvar.PlcCacheKeyTotalNumber)
+ } else if params.ProcedureId != 0 {
+ reportWork, err := service.GetLastReportWork(params.ProcedureId)
+ if err == nil {
+ finishNumber = reportWork.ReportAmount
+ workOrder, err := model.NewOrderSearch(nil).SetWorkOrderId(reportWork.WorkOrderID).First()
+ if err == nil {
+ totalNumber = workOrder.Amount.IntPart()
+ }
+ } else {
+ _, workOrder, _ := service.NewTaskService().GetProcedureAndWorkOrder(params.ProcedureId)
+ if workOrder != nil {
+ totalNumber = workOrder.Amount.IntPart()
+ }
+ }
+ }
+
resp := new(response.ProductProgress)
resp.FinishNumber = cast.ToInt(finishNumber)
resp.TotalNumber = cast.ToInt(totalNumber)
plcStatus := 1 //鏂紑杩炴帴
- isConnect := service.PlcIsConnect()
if isConnect {
lastUpdateTime := service.FinishUpdateTimeGet(conf.Conf.CurrentDeviceID, params.Channel)
if time.Now().Unix()-cast.ToInt64(lastUpdateTime) < conf.Conf.PLC.StandbyTime { //鐢熶骇
--
Gitblit v1.8.0