From cb67339452384b4640e5b68a62af0e2208bcb735 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 06 十二月 2023 20:17:53 +0800
Subject: [PATCH] debug

---
 model/dashboard.go |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/model/dashboard.go b/model/dashboard.go
index c1f1683..105cf3c 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:"-"` //浜哄憳宸ョ鍒嗘瀽
 
@@ -64,6 +63,7 @@
 		Number                 string //缂栧彿
 		Product                string //浜у搧
 		Scale                  string //瑙勬牸
+		Amount                 int64  //鐢熶骇鏁伴噺
 		PlanTime               string //璁″垝鏃堕棿
 		DelayDays              int    //寤舵湡澶╂暟
 		ProcedureNum           int    //宸ュ簭鏁伴噺
@@ -93,7 +93,6 @@
 	var materialRequirement []*CommonStats
 	var orderFinishRate []*CommonStats
 	var personnelProductivity []*CommonStats
-	var personnelSkillPercent []*CommonStats
 	var workerTypeStats []*CommonStats
 	var workshopStats []*WorkshopStats
 	var workOrderStats []*WorkOrderStats
@@ -122,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
@@ -241,7 +235,7 @@
 func (slf *DashboardSearch) Updates(record *Dashboard) error {
 	var db = slf.build()
 
-	if err := db.Updates(record).Error; err != nil {
+	if err := db.Save(record).Error; err != nil {
 		return fmt.Errorf("save err: %v, record: %+v", err, record)
 	}
 

--
Gitblit v1.8.0