From 30e38e3b2a55a4c9d503b7fbda303437865793be Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期二, 16 七月 2024 20:08:30 +0800
Subject: [PATCH] 添加方法，根据纤度登记ID获取纤度检验详情
---
service/fineness.go | 69 +++++++++++-----------------------
1 files changed, 23 insertions(+), 46 deletions(-)
diff --git a/service/fineness.go b/service/fineness.go
index 21fe070..04a2a08 100644
--- a/service/fineness.go
+++ b/service/fineness.go
@@ -18,7 +18,7 @@
var carCheckNumber = 0 //鍗曚釜car宸叉鏌ユ牱鏈暟
var item *models.FinenessCheckItem
- var deviation decimal.Decimal
+ var deviation, totalDeviation decimal.Decimal
var finenessGrade string
var roundingItemMap = make(map[float32]*models.FinenessRoundingItem, 0)
lastCarNo = finenessRegister.FinenessList[0].Position
@@ -31,8 +31,9 @@
fineness := decimal.NewFromFloat32(roundedHalfFineness)
for i := 0; i < finenessItem.Quantity; i++ {
allFinenessList = append(allFinenessList, fineness)
+ personFinenessList = append(personFinenessList, fineness)
}
- personFinenessList = append(personFinenessList, fineness)
+
if roundingItemMap[roundedHalfFineness] == nil {
roundingItemMap[roundedHalfFineness] = &models.FinenessRoundingItem{
Fineness: fineness,
@@ -43,17 +44,19 @@
}
carCheckNumber++
- if carCheckNumber == constvar.EveryPersonCarCheckNumber {
+ if carCheckNumber == constvar.EveryPersonCarCheckNumber { //姣忎汉姣忚溅鍙峰彇涓や釜涓濓紝鎵�浠ユ瘡涓や釜绛変簬涓�涓溅鍙凤紝瀛樹竴琛� models.FinenessCheckItem
carCheckNumber = 0
if endCarMap[finenessItem.Position] { //璧板埌浜嗘煇涓汉鏈�鍚庣殑杞﹀彿,姣忎汉绠椾竴娆″亸宸拰绛夌骇
deviation = utils.Deviation(personFinenessList)
- finenessGrade = CalcFinenessGrade(item.Deviation, item.TotalDeviation, item.Cleanliness, item.Purity, item.TwiceChange, standardMap)
+ totalDeviation = utils.TotalDeviation(personFinenessList, utils.Average(personFinenessList))
+ finenessGrade = CalcFinenessGrade(deviation, totalDeviation, decimal.Zero, decimal.Zero, decimal.Zero, standardMap)
personFinenessList = personFinenessList[:0]
} else {
deviation = decimal.Zero
+ totalDeviation = decimal.Zero
finenessGrade = ""
}
- item = MakeFinenessCheckItem(roundingItemMap, finenessRegister.ID, lastCarNo, deviation, finenessGrade)
+ item = MakeFinenessCheckItem(roundingItemMap, finenessRegister.ID, lastCarNo, deviation, totalDeviation, finenessGrade)
finenessCheckItems = append(finenessCheckItems, item)
roundingItemMap = make(map[float32]*models.FinenessRoundingItem, 0) //閲嶇疆
}
@@ -70,7 +73,7 @@
MarketProcessOrderNumber: "",
Inspector: "",
}
- finenessCheck.TotalDeviation = TotalDeviation(allFinenessList, finenessCheck.AverageFineness)
+ finenessCheck.TotalDeviation = utils.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 {
@@ -103,7 +106,7 @@
return err
}
-func MakeFinenessCheckItem(roundingItemMap map[float32]*models.FinenessRoundingItem, finenessRegisterID uint, position int, deviation decimal.Decimal, finenessGrade string) *models.FinenessCheckItem {
+func MakeFinenessCheckItem(roundingItemMap map[float32]*models.FinenessRoundingItem, finenessRegisterID uint, position int, deviation, totalDeviation decimal.Decimal, finenessGrade string) *models.FinenessCheckItem {
roundingItems := make([]*models.FinenessRoundingItem, 0, len(roundingItemMap))
for _, v := range roundingItemMap {
roundingItems = append(roundingItems, &models.FinenessRoundingItem{
@@ -116,6 +119,7 @@
Position: position,
FinenessRoundingItems: roundingItems,
Deviation: deviation,
+ TotalDeviation: totalDeviation,
FinenessGrade: finenessGrade,
Remark: "",
}
@@ -136,7 +140,7 @@
for _, pair := range st.ValueList {
switch st.CheckItem {
case constvar.CheckItemDeviation:
- if st.SortType == SortTypeAsc {
+ if st.SortType == ValueTypeSmallerBetter {
if deviation.LessThanOrEqual(pair.RankValue) {
grade = pair.RankName
}
@@ -146,7 +150,7 @@
}
}
case constvar.CheckItemMaxDeviation:
- if st.SortType == SortTypeAsc {
+ if st.SortType == ValueTypeSmallerBetter {
if totalDeviation.LessThanOrEqual(pair.RankValue) {
grade = pair.RankName
}
@@ -156,7 +160,7 @@
}
}
case constvar.CheckItemTwiceChange:
- if st.SortType == SortTypeAsc {
+ if st.SortType == ValueTypeSmallerBetter {
if twiceChange.LessThanOrEqual(pair.RankValue) {
grade = pair.RankName
}
@@ -166,7 +170,7 @@
}
}
case constvar.CheckItemCleanliness:
- if st.SortType == SortTypeAsc {
+ if st.SortType == ValueTypeSmallerBetter {
if cleanliness.LessThanOrEqual(pair.RankValue) {
grade = pair.RankName
}
@@ -176,7 +180,7 @@
}
}
case constvar.CheckItemPurity:
- if st.SortType == SortTypeAsc {
+ if st.SortType == ValueTypeSmallerBetter {
if purity.LessThanOrEqual(pair.RankValue) {
grade = pair.RankName
}
@@ -190,13 +194,14 @@
break
}
}
- if grade != "" {
- checkItemGradeMap[st.CheckItem] = grade
- gradeRanks = append(gradeRanks, gradeRank{
- gradeName: grade,
- gradeRank: st.GradeRank[grade],
- })
+ if grade == "" {
+ grade = constvar.BadFinenessGradeC
}
+ checkItemGradeMap[st.CheckItem] = grade
+ gradeRanks = append(gradeRanks, gradeRank{
+ gradeName: grade,
+ gradeRank: st.GradeRank[grade],
+ })
}
if len(gradeRanks) == 0 {
return ""
@@ -224,32 +229,4 @@
// 淇濈暀涓�浣嶅皬鏁帮紝骞跺湪鏁存暟鎯呭喌涓嬪湪灏忔暟鐐瑰悗鍔犱竴涓浂
result = float32(math.Round(float64(result)*10) / 10)
return result
-}
-
-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