From b14305619f8d3f5ade8316c68db102ea05f60d56 Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期二, 16 七月 2024 20:09:49 +0800
Subject: [PATCH] 修改方法，纤度检查生成由每人每车号取两个丝修改为不限制
---
service/fineness.go | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/service/fineness.go b/service/fineness.go
index 04a2a08..0fd82c8 100644
--- a/service/fineness.go
+++ b/service/fineness.go
@@ -10,12 +10,13 @@
"sort"
)
+// FinenessCheck 绾ゅ害妫�鏌�
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 carCheckNumber = 0 //鍗曚釜car宸叉鏌ユ牱鏈暟
var item *models.FinenessCheckItem
var deviation, totalDeviation decimal.Decimal
@@ -24,7 +25,7 @@
lastCarNo = finenessRegister.FinenessList[0].Position
for _, finenessItem := range finenessRegister.FinenessList {
if lastCarNo != finenessItem.Position { //姣忎釜杞﹀彿瀛樹竴涓猰odels.FinenessCheckItem
- carCheckNumber = 0
+ //carCheckNumber = 0
lastCarNo = finenessItem.Position
}
roundedHalfFineness := ToRoundedHalfFineness(finenessItem.Fineness) //绫讳技鍥涜垗浜斿叆
@@ -43,23 +44,23 @@
roundingItemMap[roundedHalfFineness].Quantity += finenessItem.Quantity
}
- carCheckNumber++
- if carCheckNumber == constvar.EveryPersonCarCheckNumber { //姣忎汉姣忚溅鍙峰彇涓や釜涓濓紝鎵�浠ユ瘡涓や釜绛変簬涓�涓溅鍙凤紝瀛樹竴琛� models.FinenessCheckItem
- carCheckNumber = 0
- if endCarMap[finenessItem.Position] { //璧板埌浜嗘煇涓汉鏈�鍚庣殑杞﹀彿,姣忎汉绠椾竴娆″亸宸拰绛夌骇
- deviation = utils.Deviation(personFinenessList)
- 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, totalDeviation, finenessGrade)
- finenessCheckItems = append(finenessCheckItems, item)
- roundingItemMap = make(map[float32]*models.FinenessRoundingItem, 0) //閲嶇疆
+ //carCheckNumber++
+ //if carCheckNumber == constvar.EveryPersonCarCheckNumber { //姣忎汉姣忚溅鍙峰彇涓や釜涓濓紝鎵�浠ユ瘡涓や釜绛変簬涓�涓溅鍙凤紝瀛樹竴琛� models.FinenessCheckItem
+ // carCheckNumber = 0
+ if endCarMap[finenessItem.Position] { //璧板埌浜嗘煇涓汉鏈�鍚庣殑杞﹀彿,姣忎汉绠椾竴娆″亸宸拰绛夌骇
+ deviation = utils.Deviation(personFinenessList)
+ 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, totalDeviation, finenessGrade)
+ finenessCheckItems = append(finenessCheckItems, item)
+ roundingItemMap = make(map[float32]*models.FinenessRoundingItem, 0) //閲嶇疆
+ //}
}
finenessCheck := models.FinenessCheck{
@@ -106,6 +107,7 @@
return err
}
+// MakeFinenessCheckItem 绾ゅ害妫�鏌ユ槑缁�
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 {
@@ -132,6 +134,7 @@
gradeRank int
}
+// CalcFinenessGrade 绾ゅ害绛夌骇
func CalcFinenessGrade(deviation, totalDeviation, cleanliness, purity, twiceChange decimal.Decimal, standardMap map[string]*Standard) (gradeName string) {
checkItemGradeMap := make(map[constvar.CheckItem]string, 5)
gradeRanks := make([]gradeRank, 0)
@@ -212,6 +215,7 @@
return gradeRanks[0].gradeName
}
+// ToRoundedHalfFineness 灏忔暟澶勭悊锛堢被浼煎洓鑸嶄簲鍏ワ級
func ToRoundedHalfFineness(fineness float32) float32 {
intPart := int(fineness)
diff := fineness - float32(intPart)
--
Gitblit v1.8.0