From 9e864a183115ba2420797a8bda661187b1069e00 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 23 四月 2024 11:46:41 +0800
Subject: [PATCH] 考勤统计与车间修改
---
service/fineness.go | 72 +++++++++++++++++++++++++++++++++---
1 files changed, 66 insertions(+), 6 deletions(-)
diff --git a/service/fineness.go b/service/fineness.go
index 95039f3..52ea7f8 100644
--- a/service/fineness.go
+++ b/service/fineness.go
@@ -10,14 +10,13 @@
"sort"
)
-func FinenessCheck(finenessRegister *models.FinenessRegister) (err error) {
+func FinenessCheck(finenessRegister *models.FinenessRegister, isNew bool) (err error) {
standardMap, err := GetSilkRankStandard()
if err != nil {
return err
}
finenessCheckItems := make([]*models.FinenessCheckItem, 0)
var lastCarNo int
- var roundingItemMap map[float32]*models.FinenessRoundingItem
var allFinenessList []decimal.Decimal
var personFinenessList []decimal.Decimal
var carCheckNumber = 0 //鍗曚釜car宸叉鏌ユ牱鏈暟
@@ -28,10 +27,13 @@
var item *models.FinenessCheckItem
var deviation decimal.Decimal
var finenessGrade string
+ var roundingItemMap = make(map[float32]*models.FinenessRoundingItem, 0)
for _, finenessItem := range finenessRegister.FinenessList {
roundedHalfFineness := ToRoundedHalfFineness(finenessItem.Fineness)
fineness := decimal.NewFromFloat32(roundedHalfFineness)
- allFinenessList = append(allFinenessList, fineness)
+ for i := 0; i < finenessItem.Quantity; i++ {
+ allFinenessList = append(allFinenessList, fineness)
+ }
personFinenessList = append(personFinenessList, fineness)
carCheckNumber++
if carCheckNumber == constvar.EveryPersonCarCheckNumber {
@@ -67,10 +69,10 @@
if roundingItemMap[roundedHalfFineness] == nil {
roundingItemMap[roundedHalfFineness] = &models.FinenessRoundingItem{
Fineness: fineness,
- Quantity: 1,
+ Quantity: finenessItem.Quantity,
}
} else {
- roundingItemMap[roundedHalfFineness].Quantity++
+ roundingItemMap[roundedHalfFineness].Quantity += finenessItem.Quantity
}
}
@@ -85,14 +87,35 @@
MarketProcessOrderNumber: "",
Inspector: "",
}
+ finenessCheck.TotalDeviation = TotalDeviation(allFinenessList, finenessCheck.AverageFineness)
finenessCheck.FinenessGrade = CalcFinenessGrade(finenessCheck.Deviation, finenessCheck.TotalDeviation, finenessCheck.Cleanliness, finenessCheck.Purity, finenessCheck.TwiceChange, standardMap)
err = models.WithTransaction(func(db *gorm.DB) error {
+ if !isNew {
+ err = models.NewFinenessCheckSearch().SetOrm(db).SetFinenessRegisterID(finenessRegister.ID).Delete()
+ if err != nil {
+ return err
+ }
+ err = models.NewFinenessCheckItemSearch().SetOrm(db).SetFinenessRegisterID(finenessRegister.ID).Delete()
+ if err != nil {
+ return err
+ }
+ }
err := models.NewFinenessCheckSearch().SetOrm(db).Create(&finenessCheck)
if err != nil {
return err
}
- return models.NewFinenessCheckItemSearch().SetOrm(db).CreateBatch(finenessCheckItems)
+ if len(finenessCheckItems) > 0 {
+ for _, v := range finenessCheckItems {
+ v.FinenessCheckID = finenessCheck.ID
+ }
+ err = models.NewFinenessCheckItemSearch().SetOrm(db).CreateBatch(finenessCheckItems)
+ if err != nil {
+ return err
+ }
+ }
+
+ return models.NewFinenessRegisterSearch().SetOrm(db).SetID(finenessRegister.ID).UpdateByMap(map[string]interface{}{"fineness_check_id": finenessCheck.ID})
})
return err
}
@@ -202,3 +225,40 @@
result = float32(math.Round(float64(result)*10) / 10)
return result
}
+
+func FinenessReCheck(finenessCheck *models.FinenessCheck) (err error) {
+ standardMap, err := GetSilkRankStandard()
+ if err != nil {
+ return err
+ }
+ finenessCheck.FinenessGrade = CalcFinenessGrade(finenessCheck.Deviation, finenessCheck.TotalDeviation, finenessCheck.Cleanliness, finenessCheck.Purity, finenessCheck.TwiceChange, standardMap)
+ return
+}
+
+func TotalDeviation(numbers []decimal.Decimal, average decimal.Decimal) decimal.Decimal {
+ if len(numbers) < 2 {
+ return decimal.Zero
+ }
+
+ n := len(numbers)
+ ratio := decimal.NewFromFloat(0.02)
+ length := decimal.NewFromInt(int64(n)).Mul(ratio).Ceil().IntPart()
+ if length >= int64(n) {
+ return decimal.Zero
+ }
+
+ sort.Slice(numbers, func(i, j int) bool {
+ return numbers[i].LessThan(numbers[j])
+ })
+
+ minPart := numbers[:length-1]
+ maxPart := numbers[length:]
+
+ minAverage := utils.Average(minPart)
+ maxAverage := utils.Average(maxPart)
+
+ minDiff := minAverage.Sub(average).Abs()
+ maxDiff := maxAverage.Sub(average).Abs()
+
+ return decimal.Max(minDiff, maxDiff)
+}
--
Gitblit v1.8.0