From 8b6e1e99dfbfe9c5324ba161cfbd742cd5dd5499 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 29 四月 2024 17:47:42 +0800
Subject: [PATCH] 根据规格取纤度等级标准
---
service/fineness.go | 87 +++++++++++++++++++++++++------------------
1 files changed, 51 insertions(+), 36 deletions(-)
diff --git a/service/fineness.go b/service/fineness.go
index b153513..8de5e5b 100644
--- a/service/fineness.go
+++ b/service/fineness.go
@@ -8,6 +8,7 @@
"silkserver/models"
"silkserver/utils"
"sort"
+ "strings"
)
func FinenessCheck(finenessRegister *models.FinenessRegister, standardMap map[string]*Standard, endCarMap map[int]bool, isNew bool) (err error) {
@@ -21,44 +22,18 @@
var deviation decimal.Decimal
var finenessGrade string
var roundingItemMap = make(map[float32]*models.FinenessRoundingItem, 0)
+ lastCarNo = finenessRegister.FinenessList[0].Position
for _, finenessItem := range finenessRegister.FinenessList {
- roundedHalfFineness := ToRoundedHalfFineness(finenessItem.Fineness)
+ if lastCarNo != finenessItem.Position { //姣忎釜杞﹀彿瀛樹竴涓猰odels.FinenessCheckItem
+ carCheckNumber = 0
+ lastCarNo = finenessItem.Position
+ }
+ roundedHalfFineness := ToRoundedHalfFineness(finenessItem.Fineness) //绫讳技鍥涜垗浜斿叆
fineness := decimal.NewFromFloat32(roundedHalfFineness)
for i := 0; i < finenessItem.Quantity; i++ {
allFinenessList = append(allFinenessList, fineness)
}
personFinenessList = append(personFinenessList, fineness)
- carCheckNumber++
- if carCheckNumber == constvar.EveryPersonCarCheckNumber {
- carCheckNumber = 0
- if endCarMap[finenessItem.Position] { //璧板埌浜嗘煇涓汉鏈�鍚庣殑杞﹀彿,姣忎汉绠椾竴娆″亸宸拰绛夌骇
- deviation = utils.Deviation(personFinenessList)
- finenessGrade = CalcFinenessGrade(item.Deviation, item.TotalDeviation, item.Cleanliness, item.Purity, item.TwiceChange, standardMap)
- personFinenessList = personFinenessList[:0]
- }
- }
- if lastCarNo != finenessItem.Position { //姣忎釜杞﹀彿瀛樹竴涓猰odels.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: finenessRegister.ID,
- Position: lastCarNo,
- FinenessRoundingItems: roundingItems,
- Deviation: deviation,
- FinenessGrade: finenessGrade,
- Remark: "",
- }
-
- finenessCheckItems = append(finenessCheckItems, item)
- lastCarNo = finenessItem.Position
- roundingItemMap = make(map[float32]*models.FinenessRoundingItem, 0)
- }
-
if roundingItemMap[roundedHalfFineness] == nil {
roundingItemMap[roundedHalfFineness] = &models.FinenessRoundingItem{
Fineness: fineness,
@@ -66,6 +41,22 @@
}
} else {
roundingItemMap[roundedHalfFineness].Quantity += finenessItem.Quantity
+ }
+
+ carCheckNumber++
+ if carCheckNumber == constvar.EveryPersonCarCheckNumber {
+ carCheckNumber = 0
+ if endCarMap[finenessItem.Position] { //璧板埌浜嗘煇涓汉鏈�鍚庣殑杞﹀彿,姣忎汉绠椾竴娆″亸宸拰绛夌骇
+ deviation = utils.Deviation(personFinenessList)
+ finenessGrade = CalcFinenessGrade(item.Deviation, item.TotalDeviation, item.Cleanliness, item.Purity, item.TwiceChange, standardMap)
+ personFinenessList = personFinenessList[:0]
+ } else {
+ deviation = decimal.Zero
+ finenessGrade = ""
+ }
+ item = MakeFinenessCheckItem(roundingItemMap, finenessRegister.ID, lastCarNo, deviation, finenessGrade)
+ finenessCheckItems = append(finenessCheckItems, item)
+ roundingItemMap = make(map[float32]*models.FinenessRoundingItem, 0) //閲嶇疆
}
}
@@ -113,6 +104,26 @@
return err
}
+func MakeFinenessCheckItem(roundingItemMap map[float32]*models.FinenessRoundingItem, finenessRegisterID uint, position int, deviation 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,
+ FinenessGrade: finenessGrade,
+ Remark: "",
+ }
+
+ return item
+}
+
type gradeRank struct {
gradeName string
gradeRank int
@@ -122,9 +133,6 @@
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 {
@@ -220,7 +228,14 @@
}
func FinenessReCheck(finenessCheck *models.FinenessCheck) (err error) {
- standardMap, err := GetSilkRankStandard()
+ finenessRegister, err := models.NewFinenessRegisterSearch().SetID(finenessCheck.FinenessRegisterID).First()
+ if err != nil {
+ return err
+ }
+ specArr := strings.Split(finenessRegister.Spec, "/")
+ start, _ := decimal.NewFromString(specArr[0])
+ end, _ := decimal.NewFromString(specArr[1])
+ standardMap, err := GetSilkRankStandard(start, end)
if err != nil {
return err
}
--
Gitblit v1.8.0