Merge branch 'Fix/BE/recording_avaible_qty' into 'development'

[FEAT/BE]Fix create avaible qty

See merge request mbugroup/lti-api!300

internal/modules/production/recordings/services/recording.service.go

@@ -1073,19 +1073,37 @@ func (s *recordingService) computeAndUpdateMetrics(ctx context.Context, tx *gorm
 	var remainingChick float64
 	if totalChick > 0 {
 		totalChickFloat := float64(totalChick)
-		remainingChick = totalChickFloat - cumDepletionQty
+		if s.FifoSvc != nil {
-		if remainingChick < 0 {
+			// totalChick already represents available qty (total_qty - total_used_qty).
-			remainingChick = 0
+			remainingChick = totalChickFloat
-		}
+			updates["total_chick_qty"] = remainingChick
-		updates["total_chick_qty"] = remainingChick
+			recording.TotalChickQty = &remainingChick
-		recording.TotalChickQty = &remainingChick
 
-		cumRate := 0.0
+			baseChick := initialChickin
-		if totalChickFloat > 0 {
+			if baseChick <= 0 {
-			cumRate = (cumDepletionQty / totalChickFloat) * 100
+				baseChick = totalChickFloat + cumDepletionQty
+			}
+			cumRate := 0.0
+			if baseChick > 0 {
+				cumRate = (cumDepletionQty / baseChick) * 100
+			}
+			updates["cum_depletion_rate"] = cumRate
+			recording.CumDepletionRate = &cumRate
+		} else {
+			remainingChick = totalChickFloat - cumDepletionQty
+			if remainingChick < 0 {
+				remainingChick = 0
+			}
+			updates["total_chick_qty"] = remainingChick
+			recording.TotalChickQty = &remainingChick
+
+			cumRate := 0.0
+			if totalChickFloat > 0 {
+				cumRate = (cumDepletionQty / totalChickFloat) * 100
+			}
+			updates["cum_depletion_rate"] = cumRate
+			recording.CumDepletionRate = &cumRate
 		}
-		updates["cum_depletion_rate"] = cumRate
-		recording.CumDepletionRate = &cumRate
 	} else {
 		updates["total_chick_qty"] = gorm.Expr("NULL")
 		updates["cum_depletion_rate"] = gorm.Expr("NULL")

internal/utils/recording/util.recording.go

@@ -28,12 +28,26 @@ func MapDepletions(recordingID uint, items []validation.Depletion) []entity.Reco
 		return nil
 	}
 
-	result := make([]entity.RecordingDepletion, 0, len(items))
+	aggregate := make(map[uint]float64, len(items))
 	for _, item := range items {
+		if item.ProductWarehouseId == 0 || item.Qty == 0 {
+			continue
+		}
+		aggregate[item.ProductWarehouseId] += item.Qty
+	}
+	if len(aggregate) == 0 {
+		return nil
+	}
+
+	result := make([]entity.RecordingDepletion, 0, len(aggregate))
+	for warehouseID, qty := range aggregate {
+		if qty == 0 {
+			continue
+		}
 		result = append(result, entity.RecordingDepletion{
 			RecordingId:        recordingID,
-			ProductWarehouseId: item.ProductWarehouseId,
+			ProductWarehouseId: warehouseID,
-			Qty:                item.Qty,
+			Qty:                qty,
 		})
 	}
 	return result