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 | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/api/v1/plc.go b/api/v1/plc.go
index c16aba1..f2c21f1 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -41,10 +41,15 @@
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 {
+ _, workOrder, _ := service.NewTaskService().GetProcedureAndWorkOrder(params.ProcedureId)
+ if workOrder != nil {
+ totalNumber = workOrder.Amount.IntPart()
+ }
}
}
--
Gitblit v1.8.0