From 7ec7452f149996790234803f7a7c12a48a36c498 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 30 四月 2024 10:01:09 +0800
Subject: [PATCH] 根据规格查找标准改成范围查询
---
service/fineness.go | 189 ++++++++++++++++++++++++++++++++---------------
1 files changed, 128 insertions(+), 61 deletions(-)
diff --git a/service/fineness.go b/service/fineness.go
index fc3635b..d5e3663 100644
--- a/service/fineness.go
+++ b/service/fineness.go
@@ -10,59 +10,58 @@
"sort"
)
-func FinenessCheck(finenessRegister *models.FinenessRegister) (err error) {
- standardMap, err := GetSilkRankStandard()
- if err != nil {
- return err
- }
- //鏁寸悊鎴愭楠岃〃鐨勬暟鎹粨鏋�
- finenessRoundingItemMap := make(map[int]map[float32]*models.FinenessRoundingItem)
- for _, item := range finenessRegister.FinenessList {
- if finenessRoundingItemMap[item.Position] == nil {
- finenessRoundingItemMap[item.Position] = make(map[float32]*models.FinenessRoundingItem, 0)
+func FinenessCheck(finenessRegister *models.FinenessRegister, standardMap map[string]*Standard, endCarMap map[int]bool, isNew bool) (err error) {
+ finenessCheckItems := make([]*models.FinenessCheckItem, 0)
+ var lastCarNo int
+ var allFinenessList []decimal.Decimal
+ var personFinenessList []decimal.Decimal
+ var carCheckNumber = 0 //鍗曚釜car宸叉鏌ユ牱鏈暟
+
+ var item *models.FinenessCheckItem
+ var deviation, totalDeviation decimal.Decimal
+ var finenessGrade string
+ var roundingItemMap = make(map[float32]*models.FinenessRoundingItem, 0)
+ lastCarNo = finenessRegister.FinenessList[0].Position
+ for _, finenessItem := range finenessRegister.FinenessList {
+ if lastCarNo != finenessItem.Position { //姣忎釜杞﹀彿瀛樹竴涓猰odels.FinenessCheckItem
+ carCheckNumber = 0
+ lastCarNo = finenessItem.Position
}
- roundedHalfFineness := ToRoundedHalfFineness(item.Fineness)
- if finenessRoundingItemMap[item.Position][roundedHalfFineness] == nil {
- finenessRoundingItemMap[item.Position][roundedHalfFineness] = &models.FinenessRoundingItem{
- Fineness: decimal.NewFromFloat32(roundedHalfFineness),
- Quantity: 1,
+ roundedHalfFineness := ToRoundedHalfFineness(finenessItem.Fineness) //绫讳技鍥涜垗浜斿叆
+ fineness := decimal.NewFromFloat32(roundedHalfFineness)
+ for i := 0; i < finenessItem.Quantity; i++ {
+ allFinenessList = append(allFinenessList, fineness)
+ personFinenessList = append(personFinenessList, fineness)
+ }
+
+ if roundingItemMap[roundedHalfFineness] == nil {
+ roundingItemMap[roundedHalfFineness] = &models.FinenessRoundingItem{
+ Fineness: fineness,
+ Quantity: finenessItem.Quantity,
}
} else {
- finenessRoundingItemMap[item.Position][roundedHalfFineness].Quantity++
- }
- }
- finenessCheckItems := make([]*models.FinenessCheckItem, 0)
- var allFinenessList []decimal.Decimal
- var personEndFlag bool //璧板埌浜嗘煇涓汉鏈�鍚庣殑杞﹀彿
- var finenessList []decimal.Decimal
- var step = 3 //涓存椂鎸変竴涓汉涓変釜杞﹀彿绠椼��
- for pos, roundingItemMap := range finenessRoundingItemMap {
- roundingItems := make([]*models.FinenessRoundingItem, 0, len(roundingItemMap))
- for _, v := range roundingItemMap {
- roundingItems = append(roundingItems, v)
- finenessList = append(finenessList, v.Fineness)
- allFinenessList = append(allFinenessList, v.Fineness)
+ roundingItemMap[roundedHalfFineness].Quantity += finenessItem.Quantity
}
- item := &models.FinenessCheckItem{
- FinenessRegisterID: finenessRegister.ID,
- Position: pos,
- FinenessRoundingItem: roundingItems,
- Remark: "",
+ carCheckNumber++
+ if carCheckNumber == constvar.EveryPersonCarCheckNumber {
+ carCheckNumber = 0
+ if endCarMap[finenessItem.Position] { //璧板埌浜嗘煇涓汉鏈�鍚庣殑杞﹀彿,姣忎汉绠椾竴娆″亸宸拰绛夌骇
+ deviation = utils.Deviation(personFinenessList)
+ totalDeviation = 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, totalDeviation, finenessGrade)
+ finenessCheckItems = append(finenessCheckItems, item)
+ roundingItemMap = make(map[float32]*models.FinenessRoundingItem, 0) //閲嶇疆
}
- if pos%step == 0 {
- personEndFlag = true
- } else {
- personEndFlag = false
- }
- if personEndFlag {
- item.Deviation = utils.Deviation(finenessList)
- item.FinenessGrade = CalcFinenessGrade(item.Deviation, item.TotalDeviation, item.Cleanliness, item.Purity, item.TwiceChange, standardMap)
- finenessList = finenessList[:0]
- }
-
- finenessCheckItems = append(finenessCheckItems, item)
}
+
finenessCheck := models.FinenessCheck{
FinenessRegisterID: finenessRegister.ID,
AverageFineness: utils.Average(allFinenessList),
@@ -74,16 +73,58 @@
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
+}
+
+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{
+ Fineness: v.Fineness,
+ Quantity: v.Quantity,
+ })
+ }
+ item := &models.FinenessCheckItem{
+ FinenessRegisterID: finenessRegisterID,
+ Position: position,
+ FinenessRoundingItems: roundingItems,
+ Deviation: deviation,
+ TotalDeviation: totalDeviation,
+ FinenessGrade: finenessGrade,
+ Remark: "",
+ }
+
+ return item
}
type gradeRank struct {
@@ -95,14 +136,11 @@
checkItemGradeMap := make(map[constvar.CheckItem]string, 5)
gradeRanks := make([]gradeRank, 0)
for _, st := range standardMap {
- if st.StartFineness.GreaterThan(deviation) || st.EndFineness.LessThan(deviation) {
- continue
- }
grade := ""
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
}
@@ -112,7 +150,7 @@
}
}
case constvar.CheckItemMaxDeviation:
- if st.SortType == SortTypeAsc {
+ if st.SortType == ValueTypeSmallerBetter {
if totalDeviation.LessThanOrEqual(pair.RankValue) {
grade = pair.RankName
}
@@ -122,7 +160,7 @@
}
}
case constvar.CheckItemTwiceChange:
- if st.SortType == SortTypeAsc {
+ if st.SortType == ValueTypeSmallerBetter {
if twiceChange.LessThanOrEqual(pair.RankValue) {
grade = pair.RankName
}
@@ -132,7 +170,7 @@
}
}
case constvar.CheckItemCleanliness:
- if st.SortType == SortTypeAsc {
+ if st.SortType == ValueTypeSmallerBetter {
if cleanliness.LessThanOrEqual(pair.RankValue) {
grade = pair.RankName
}
@@ -142,7 +180,7 @@
}
}
case constvar.CheckItemPurity:
- if st.SortType == SortTypeAsc {
+ if st.SortType == ValueTypeSmallerBetter {
if purity.LessThanOrEqual(pair.RankValue) {
grade = pair.RankName
}
@@ -156,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 ""
@@ -191,3 +230,31 @@
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