From 0a3f8aa6b170c5ee5a29074cf037bdcf07d7d98f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 05 十二月 2023 16:08:26 +0800
Subject: [PATCH] 增加订单完成率

---
 model/dashboard.go |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/model/dashboard.go b/model/dashboard.go
index 0beed25..7caf293 100644
--- a/model/dashboard.go
+++ b/model/dashboard.go
@@ -25,6 +25,7 @@
 		PlanProductionAmount         int   //璁″垝鍔犲伐鏁�
 		RealExternalProductionAmount int   //瀹為檯澶栧姞宸ユ暟
 		RealProductionAmount         int   //瀹為檯鐢熶骇鏁�
+		WorkOrderFinishRate          int   //杩戜竴鍛ㄥ伐鍗曞畬鎴愮巼
 
 		DeviceLoadData            string         //璁惧璐熻嵎瀵规瘮鍒嗘瀽
 		DeviceLoad                []*CommonStats `gorm:"-"` //璁惧璐熻嵎瀵规瘮鍒嗘瀽
@@ -34,8 +35,6 @@
 		OrderFinishRate           []*CommonStats `gorm:"-"` //璁㈠崟瀹屾垚姣旂巼
 		PersonnelProductivityData string         //浜哄憳鐢熶骇鏁堢巼
 		PersonnelProductivity     []*CommonStats `gorm:"-"` //浜哄憳鐢熶骇鏁堢巼
-		PersonnelSkillPercentData string         //浜哄憳鎶�鑳藉崰姣�
-		PersonnelSkillPercent     []*CommonStats `gorm:"-"` //浜哄憳鎶�鑳藉崰姣�
 		WorkerTypeStatsData       string         //浜哄憳宸ョ鍒嗘瀽
 		WorkerTypeStats           []*CommonStats `gorm:"-"` //浜哄憳宸ョ鍒嗘瀽
 
@@ -94,7 +93,6 @@
 	var materialRequirement []*CommonStats
 	var orderFinishRate []*CommonStats
 	var personnelProductivity []*CommonStats
-	var personnelSkillPercent []*CommonStats
 	var workerTypeStats []*CommonStats
 	var workshopStats []*WorkshopStats
 	var workOrderStats []*WorkOrderStats
@@ -123,12 +121,7 @@
 			slf.PersonnelProductivityData = ""
 		}
 	}
-	if slf.PersonnelSkillPercentData != "" {
-		if err = json.Unmarshal([]byte(slf.PersonnelSkillPercentData), &personnelSkillPercent); err == nil {
-			slf.PersonnelSkillPercent = personnelSkillPercent
-			slf.PersonnelSkillPercentData = ""
-		}
-	}
+
 	if slf.WorkerTypeStatsData != "" {
 		if err = json.Unmarshal([]byte(slf.WorkerTypeStatsData), &workerTypeStats); err == nil {
 			slf.WorkerTypeStats = workerTypeStats

--
Gitblit v1.8.0