debug

zhangqian

2023-12-08 84fb8e390b83dc9482524c12d7af6c93405c3fc1

 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)
@@ -41,14 +44,22 @@
      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()
         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 := new(response.ProductProgress)
   resp.FinishNumber = cast.ToInt(finishNumber)
   resp.TotalNumber = cast.ToInt(totalNumber)

@@ -63,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)
}