生丝检验部分逻辑修正

zhangqian

2024-03-19 178d6e7507ef4806ca02692c4ee24bb98dba8362

 service/fineness.go

@@ -15,54 +15,65 @@
   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)
      }
      roundedHalfFineness := ToRoundedHalfFineness(item.Fineness)
      if finenessRoundingItemMap[item.Position][roundedHalfFineness] == nil {
         finenessRoundingItemMap[item.Position][roundedHalfFineness] = &models.FinenessRoundingItem{
            Fineness: decimal.NewFromFloat32(roundedHalfFineness),
            Quantity: 1,
         }
      } else {
         finenessRoundingItemMap[item.Position][roundedHalfFineness].Quantity++
      }
   }
   finenessCheckItems := make([]*models.FinenessCheckItem, 0)
   var lastCarNo int
   var roundingItemMap map[float32]*models.FinenessRoundingItem
   var allFinenessList []decimal.Decimal
   var personEndFlag bool //走到了某个人最后的车号
   var finenessList []decimal.Decimal
   var step = 3 //临时按一个人三个车号算。
   for pos, roundingItemMap := range finenessRoundingItemMap {
   var personFinenessList []decimal.Decimal
   var carCheckNumber = 0 //单个car已检查样本数
   endCarMap, err := GetWorkshopEndCarMap(finenessRegister.Workshop, finenessRegister.WorkshopGroup)
   if err != nil {
      return err
   }
   var item *models.FinenessCheckItem
   var deviation decimal.Decimal
   var finenessGrade string
   for _, finenessItem := range finenessRegister.FinenessList {
      roundedHalfFineness := ToRoundedHalfFineness(finenessItem.Fineness)
      fineness := decimal.NewFromFloat32(roundedHalfFineness)
      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 { //每个车号存一个models.FinenessCheckItem
      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)
            roundingItems = append(roundingItems, &models.FinenessRoundingItem{
               Fineness: v.Fineness,
               Quantity: v.Quantity,
            })
      }

      item := &models.FinenessCheckItem{
         item = &models.FinenessCheckItem{
         FinenessRegisterID:   finenessRegister.ID,
         Position:             pos,
            Position:             lastCarNo,
         FinenessRoundingItem: roundingItems,
            Deviation:            deviation,
            FinenessGrade:        finenessGrade,
         Remark:               "",
      }
      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)
         lastCarNo = finenessItem.Position
         roundingItemMap = make(map[float32]*models.FinenessRoundingItem, 0)
   }

      if roundingItemMap[roundedHalfFineness] == nil {
         roundingItemMap[roundedHalfFineness] = &models.FinenessRoundingItem{
            Fineness: fineness,
            Quantity: 1,
         }
      } else {
         roundingItemMap[roundedHalfFineness].Quantity++
      }
   }

   finenessCheck := models.FinenessCheck{
      FinenessRegisterID:       finenessRegister.ID,
      AverageFineness:          utils.Average(allFinenessList),