From 84fb8e390b83dc9482524c12d7af6c93405c3fc1 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 08 十二月 2023 16:36:32 +0800
Subject: [PATCH] debug
---
model/dashboard.go | 80 +++++++++++++++++++++-------------------
1 files changed, 42 insertions(+), 38 deletions(-)
diff --git a/model/dashboard.go b/model/dashboard.go
index 6146a2b..436e2db 100644
--- a/model/dashboard.go
+++ b/model/dashboard.go
@@ -9,22 +9,24 @@
type (
Dashboard struct {
- gorm.Model
- Version string
- DeviceRunningAmount int //寮�鏈哄彴鏁�
- TotalProductionAmount int //鎬讳骇閲�
- WorkOrderAmount int64 //鐢熶骇宸ュ崟鏁�
- DelayWorkOrderAmount int64 //寤舵湡浜や粯宸ュ崟鏁�
- MaterialMissWorkOrderAmount int //鐗╂枡涓嶈冻宸ュ崟鏁�
- PlanOrderFinishRate int64 //璁″垝杈炬垚鐜�
- TotalDeviceAmount int64 //鎬昏澶囨暟
- InMaintenanceDeviceAmount int64 //缁翠慨涓澶囨暟
- InternalDeviceRunningAmount int //鑷湁寮�鏈哄彴鏁�
- ExternalDeviceRunningAmount int //澶栧姞宸ュ彴鏁�
- OutPlanProductionAmount int //璁″垝澶栧姞宸ユ暟
- PlanProductionAmount int //璁″垝鍔犲伐鏁�
- RealExternalProductionAmount int //瀹為檯澶栧姞宸ユ暟
- RealProductionAmount int //瀹為檯鐢熶骇鏁�
+ CommonModel
+ Version string
+ DeviceRunningAmount int //寮�鏈哄彴鏁�
+ TotalProductionAmount int //鎬讳骇閲�
+ WorkOrderAmount int64 //鐢熶骇宸ュ崟鏁�
+ DelayWorkOrderAmount int64 //寤舵湡浜や粯宸ュ崟鏁�
+ MaterialMissWorkOrderAmount int //鐗╂枡涓嶈冻宸ュ崟鏁�
+ WaitSchedulingWorkOrderAmount int //寰呮帓绋嬪伐鍗曟暟(搴撳瓨鍏呰冻鏈攣瀹� 鍜� 宸查攣瀹氬簱瀛樻湭鎺掔▼鐨勫伐鍗�)
+ PlanOrderFinishRate int64 //璁″垝杈炬垚鐜�
+ TotalDeviceAmount int64 //鎬昏澶囨暟
+ InMaintenanceDeviceAmount int64 //缁翠慨涓澶囨暟
+ InternalDeviceRunningAmount int //鑷湁寮�鏈哄彴鏁�
+ ExternalDeviceRunningAmount int //澶栧姞宸ュ彴鏁�
+ OutPlanProductionAmount int //璁″垝澶栧姞宸ユ暟
+ PlanProductionAmount int //璁″垝鍔犲伐鏁�
+ RealExternalProductionAmount int //瀹為檯澶栧姞宸ユ暟
+ RealProductionAmount int //瀹為檯鐢熶骇鏁�
+ WorkOrderFinishRate int //杩戜竴鍛ㄥ伐鍗曞畬鎴愮巼
DeviceLoadData string //璁惧璐熻嵎瀵规瘮鍒嗘瀽
DeviceLoad []*CommonStats `gorm:"-"` //璁惧璐熻嵎瀵规瘮鍒嗘瀽
@@ -34,8 +36,6 @@
OrderFinishRate []*CommonStats `gorm:"-"` //璁㈠崟瀹屾垚姣旂巼
PersonnelProductivityData string //浜哄憳鐢熶骇鏁堢巼
PersonnelProductivity []*CommonStats `gorm:"-"` //浜哄憳鐢熶骇鏁堢巼
- PersonnelSkillPercentData string //浜哄憳鎶�鑳藉崰姣�
- PersonnelSkillPercent []*CommonStats `gorm:"-"` //浜哄憳鎶�鑳藉崰姣�
WorkerTypeStatsData string //浜哄憳宸ョ鍒嗘瀽
WorkerTypeStats []*CommonStats `gorm:"-"` //浜哄憳宸ョ鍒嗘瀽
@@ -53,21 +53,23 @@
}
WorkshopStats struct {
- Name string
- Total int64
- Qualified int64
- Defective int
- Percent int
+ Name string //杞﹂棿鍚嶇О
+ Total int64 //鐢熶骇鎬绘暟
+ Qualified int64 //姝ｅ搧鏁伴噺
+ Defective int //娆″搧鏁伴噺
+ Percent int //姝ｅ搧鐜�
}
WorkOrderStats struct {
- Number string //缂栧彿
- Product string //浜у搧
- Scale string //瑙勬牸
- PlanTime string //璁″垝鏃堕棿
- Percent int //瀹屾垚杩涘害
- procedureNum int //宸ュ簭鏁伴噺
- DelayDays int //寤舵湡澶╂暟
+ Number string //缂栧彿
+ Product string //浜у搧
+ Scale string //瑙勬牸
+ Amount int64 //鐢熶骇鏁伴噺
+ PlanTime string //璁″垝鏃堕棿
+ DelayDays int //寤舵湡澶╂暟
+ ProcedureNum int //宸ュ簭鏁伴噺
+ FinishProcedureNum int //宸插畬鎴愬伐搴忔暟閲�
+ ProcessingProcedureNum int //杩涜涓伐搴忔暟閲�
}
DashboardSearch struct {
@@ -92,7 +94,6 @@
var materialRequirement []*CommonStats
var orderFinishRate []*CommonStats
var personnelProductivity []*CommonStats
- var personnelSkillPercent []*CommonStats
var workerTypeStats []*CommonStats
var workshopStats []*WorkshopStats
var workOrderStats []*WorkOrderStats
@@ -100,41 +101,44 @@
if slf.DeviceLoadData != "" {
if err = json.Unmarshal([]byte(slf.DeviceLoadData), &deviceLoad); err == nil {
slf.DeviceLoad = deviceLoad
+ slf.DeviceLoadData = ""
}
}
if slf.MaterialRequirementData != "" {
if err = json.Unmarshal([]byte(slf.MaterialRequirementData), &materialRequirement); err == nil {
slf.MaterialRequirement = materialRequirement
+ slf.MaterialRequirementData = ""
}
}
if slf.OrderFinishRateData != "" {
if err = json.Unmarshal([]byte(slf.OrderFinishRateData), &orderFinishRate); err == nil {
slf.OrderFinishRate = orderFinishRate
+ slf.OrderFinishRateData = ""
}
}
if slf.PersonnelProductivityData != "" {
if err = json.Unmarshal([]byte(slf.PersonnelProductivityData), &personnelProductivity); err == nil {
slf.PersonnelProductivity = personnelProductivity
+ slf.PersonnelProductivityData = ""
}
}
- if slf.PersonnelSkillPercentData != "" {
- if err = json.Unmarshal([]byte(slf.PersonnelSkillPercentData), &personnelSkillPercent); err == nil {
- slf.PersonnelSkillPercent = personnelSkillPercent
- }
- }
+
if slf.WorkerTypeStatsData != "" {
if err = json.Unmarshal([]byte(slf.WorkerTypeStatsData), &workerTypeStats); err == nil {
slf.WorkerTypeStats = workerTypeStats
+ slf.WorkerTypeStatsData = ""
}
}
if slf.WorkshopStatsData != "" {
if err = json.Unmarshal([]byte(slf.WorkshopStatsData), &workshopStats); err == nil {
slf.WorkshopStats = workshopStats
+ slf.WorkshopStatsData = ""
}
}
if slf.WorkOrderStatsData != "" {
if err = json.Unmarshal([]byte(slf.WorkOrderStatsData), &workOrderStats); err == nil {
slf.WorkOrderStats = workOrderStats
+ slf.WorkOrderStatsData = ""
}
}
return nil
@@ -229,10 +233,10 @@
return nil
}
-func (slf *DashboardSearch) Updates(record *Dashboard) error {
+func (slf *DashboardSearch) Save(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