From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix
---
api/v1/plc.go | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/api/v1/plc.go b/api/v1/plc.go
index a02e6f8..c4638dc 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"
@@ -19,7 +20,7 @@
// @Tags 鐢熶骇鏁伴噺
// @Summary 鑾峰彇鐢熶骇杩涘害
// @Produce application/json
-// @Param object body request.SendProcessParams true "鏌ヨ鍙傛暟"
+// @Param object body request.GetProductProgress true "鏌ヨ鍙傛暟"
// @Success 200 {object} contextx.Response{data=response.ProductProgress} "鎴愬姛"
// @Router /v1/plc/productProgress [post]
func (slf *PlcApi) GetProductProgress(c *gin.Context) {
@@ -28,16 +29,43 @@
if !ok {
return
}
- finishNumber, _ := service.PlcCacheGet(params.Channel, constvar.PlcCacheKeyFinishNumber)
- totalNumber, _ := service.PlcCacheGet(params.Channel, constvar.PlcCacheKeyTotalNumber)
+ isConnect := service.PlcIsConnect()
+ var (
+ 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)
+ } 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 {
+ 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.FinishNumber = cast.ToInt(finishNumber)
resp.TotalNumber = cast.ToInt(totalNumber)
plcStatus := 1 //鏂紑杩炴帴
- isConnect := service.PlcIsConnect()
if isConnect {
- lastUpdateTime := service.FinishUpdateTimeGet(params.Channel)
+ lastUpdateTime := service.FinishUpdateTimeGet(conf.Conf.CurrentDeviceID, params.Channel)
if time.Now().Unix()-cast.ToInt64(lastUpdateTime) < conf.Conf.PLC.StandbyTime { //鐢熶骇
plcStatus = 2
} else {
@@ -46,8 +74,10 @@
}
resp.PlcStatus = plcStatus
- resp.RealStartTime = service.TaskStartTimeGet(params.Channel)
- resp.RealEndTime = service.TaskEndTimeGet(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