From 5e9286428ff338fc7f3dafc7d7b76fc634e65fe8 Mon Sep 17 00:00:00 2001 From: giovanni Date: Tue, 9 Jun 2026 09:44:55 +0700 Subject: [PATCH] add response detail recording --- internal/entities/recording_stock.go | 13 ++++ .../recordings/dto/recording.dto.go | 29 ++++++++ .../repositories/recording.repository.go | 69 +++++++++++++++++++ .../recordings/services/recording.service.go | 20 ++++++ 4 files changed, 131 insertions(+) diff --git a/internal/entities/recording_stock.go b/internal/entities/recording_stock.go index 29d47163..fcd30a6d 100644 --- a/internal/entities/recording_stock.go +++ b/internal/entities/recording_stock.go @@ -7,7 +7,20 @@ type RecordingStock struct { ProjectFlockKandangId *uint `gorm:"column:project_flock_kandang_id;index"` UsageQty *float64 `gorm:"column:usage_qty"` PendingQty *float64 `gorm:"column:pending_qty"` + TotalPrice float64 `gorm:"-"` + Allocations []RecordingStockAlloc `gorm:"-"` Recording Recording `gorm:"foreignKey:RecordingId;references:Id"` ProductWarehouse ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"` } + +type RecordingStockAlloc struct { + SourceType string + SourceId uint + PrNumber string + PoNumber string + AdjNumber string + Qty float64 + UnitPrice float64 + Subtotal float64 +} diff --git a/internal/modules/production/recordings/dto/recording.dto.go b/internal/modules/production/recordings/dto/recording.dto.go index f8e6cf22..3f1d4892 100644 --- a/internal/modules/production/recordings/dto/recording.dto.go +++ b/internal/modules/production/recordings/dto/recording.dto.go @@ -131,10 +131,23 @@ type RecordingDepletionDTO struct { ProductWarehouse productWarehouseDTO.ProductWarehouseDTO `json:"product_warehouse"` } +type RecordingStockAllocDTO struct { + SourceType string `json:"source_type"` + SourceId uint `json:"source_id"` + PrNumber string `json:"pr_number"` + PoNumber string `json:"po_number"` + AdjNumber string `json:"adj_number"` + Qty float64 `json:"qty"` + UnitPrice float64 `json:"unit_price"` + Subtotal float64 `json:"subtotal"` +} + type RecordingStockDTO struct { ProductWarehouseId uint `json:"product_warehouse_id"` UsageAmount float64 `json:"usage_amount"` PendingQty float64 `json:"pending_qty"` + TotalPrice float64 `json:"total_price"` + Allocations []RecordingStockAllocDTO `json:"allocations"` ProductWarehouse productWarehouseDTO.ProductWarehouseDTO `json:"product_warehouse"` } @@ -197,10 +210,26 @@ func ToRecordingStockDTOs(stocks []entity.RecordingStock) []RecordingStockDTO { pendingQty = *s.PendingQty } + allocs := make([]RecordingStockAllocDTO, len(s.Allocations)) + for j, a := range s.Allocations { + allocs[j] = RecordingStockAllocDTO{ + SourceType: a.SourceType, + SourceId: a.SourceId, + PrNumber: a.PrNumber, + PoNumber: a.PoNumber, + AdjNumber: a.AdjNumber, + Qty: a.Qty, + UnitPrice: a.UnitPrice, + Subtotal: a.Subtotal, + } + } + result[i] = RecordingStockDTO{ ProductWarehouseId: s.ProductWarehouseId, UsageAmount: usageAmount, PendingQty: pendingQty, + TotalPrice: s.TotalPrice, + Allocations: allocs, ProductWarehouse: mapProductWarehouseDTO(&s.ProductWarehouse), } } diff --git a/internal/modules/production/recordings/repositories/recording.repository.go b/internal/modules/production/recordings/repositories/recording.repository.go index 7a829ead..9fde92d3 100644 --- a/internal/modules/production/recordings/repositories/recording.repository.go +++ b/internal/modules/production/recordings/repositories/recording.repository.go @@ -80,6 +80,7 @@ type RecordingRepository interface { ResyncProjectFlockPopulationUsage(ctx context.Context, tx *gorm.DB, projectFlockKandangID uint) error ValidateProductWarehousesByFlags(ctx context.Context, ids []uint, flags []string) (uint, error) GetProgressRows(ctx context.Context, startDate, endDate time.Time, allowedLocationIDs []uint, restrict bool) ([]exportprogress.Row, error) + GetStockAllocationsByIDs(ctx context.Context, stockIDs []uint) (map[uint][]entity.RecordingStockAlloc, error) } type RecordingRepositoryImpl struct { @@ -1231,3 +1232,71 @@ func (r *RecordingRepositoryImpl) GetTotalWeightProducedFromUniformityByProjectF return result.TotalWeight, err } + +func (r *RecordingRepositoryImpl) GetStockAllocationsByIDs(ctx context.Context, stockIDs []uint) (map[uint][]entity.RecordingStockAlloc, error) { + if len(stockIDs) == 0 { + return map[uint][]entity.RecordingStockAlloc{}, nil + } + + type row struct { + RecordingStockId uint + SourceType string + SourceId uint + PrNumber string + PoNumber string + AdjNumber string + Qty float64 + UnitPrice float64 + Subtotal float64 + } + + var rows []row + err := r.DB().WithContext(ctx).Raw(` + SELECT + sa.usable_id AS recording_stock_id, + sa.stockable_type AS source_type, + sa.stockable_id AS source_id, + COALESCE(p.pr_number, '') AS pr_number, + COALESCE(p.po_number, '') AS po_number, + COALESCE(ast.adj_number, '') AS adj_number, + sa.qty AS qty, + COALESCE(CASE + WHEN sa.stockable_type = 'PURCHASE_ITEMS' THEN pi.price + WHEN sa.stockable_type = 'ADJUSTMENT_IN' THEN ast.price + END, 0) AS unit_price, + sa.qty * COALESCE(CASE + WHEN sa.stockable_type = 'PURCHASE_ITEMS' THEN pi.price + WHEN sa.stockable_type = 'ADJUSTMENT_IN' THEN ast.price + END, 0) AS subtotal + FROM stock_allocations sa + LEFT JOIN purchase_items pi + ON pi.id = sa.stockable_id AND sa.stockable_type = 'PURCHASE_ITEMS' + LEFT JOIN purchases p + ON p.id = pi.purchase_id + LEFT JOIN adjustment_stocks ast + ON ast.id = sa.stockable_id AND sa.stockable_type = 'ADJUSTMENT_IN' + WHERE sa.usable_type = 'RECORDING_STOCK' + AND sa.usable_id IN ? + AND sa.status = 'ACTIVE' + AND sa.allocation_purpose = 'CONSUME' + ORDER BY sa.usable_id, sa.id + `, stockIDs).Scan(&rows).Error + if err != nil { + return nil, err + } + + result := make(map[uint][]entity.RecordingStockAlloc) + for _, row := range rows { + result[row.RecordingStockId] = append(result[row.RecordingStockId], entity.RecordingStockAlloc{ + SourceType: row.SourceType, + SourceId: row.SourceId, + PrNumber: row.PrNumber, + PoNumber: row.PoNumber, + AdjNumber: row.AdjNumber, + Qty: row.Qty, + UnitPrice: row.UnitPrice, + Subtotal: row.Subtotal, + }) + } + return result, nil +} diff --git a/internal/modules/production/recordings/services/recording.service.go b/internal/modules/production/recordings/services/recording.service.go index 46083db7..4012f785 100644 --- a/internal/modules/production/recordings/services/recording.service.go +++ b/internal/modules/production/recordings/services/recording.service.go @@ -278,6 +278,26 @@ func (s recordingService) GetOne(c *fiber.Ctx, id uint) (*entity.Recording, erro s.Log.Errorf("Failed get recording by id: %+v", err) return nil, err } + if len(recording.Stocks) > 0 { + stockIDs := make([]uint, len(recording.Stocks)) + for i, s := range recording.Stocks { + stockIDs[i] = s.Id + } + if allocMap, err := s.Repository.GetStockAllocationsByIDs(c.Context(), stockIDs); err != nil { + s.Log.Warnf("Failed to get stock allocations for recording %d: %+v", id, err) + } else { + for i := range recording.Stocks { + allocs := allocMap[recording.Stocks[i].Id] + recording.Stocks[i].Allocations = allocs + var total float64 + for _, a := range allocs { + total += a.Subtotal + } + recording.Stocks[i].TotalPrice = total + } + } + } + if err := recordingutil.AttachLatestApproval(c.Context(), recording, s.ApprovalSvc, s.Log); err != nil { return nil, err }