From 9d6a69dc4dab069850e10871e60656292be6b403 Mon Sep 17 00:00:00 2001 From: ragilap Date: Mon, 23 Feb 2026 11:33:57 +0700 Subject: [PATCH] [FEAT/BE] fix status closed project flock, closing perhitungan sapronak --- .../closings/dto/closingSapronak.dto.go | 38 +++++++ .../repositories/closing.repository.go | 100 ++++++++++++------ .../closings/services/sapronak.service.go | 8 ++ .../services/deliveryorder.service.go | 12 ++- .../project_flocks/dto/projectflock.dto.go | 15 ++- 5 files changed, 137 insertions(+), 36 deletions(-) diff --git a/internal/modules/closings/dto/closingSapronak.dto.go b/internal/modules/closings/dto/closingSapronak.dto.go index 4dd1dc59..4c5db68d 100644 --- a/internal/modules/closings/dto/closingSapronak.dto.go +++ b/internal/modules/closings/dto/closingSapronak.dto.go @@ -317,6 +317,27 @@ func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag strin } } + // For chicken categories, keep qty_used aligned with qty_in - qty_out. + // Sales are excluded; usage represents remaining after transfers. + adjustChicken := func(cat *SapronakCategoryDTO) { + if cat == nil { + return + } + for i := range cat.Rows { + row := &cat.Rows[i] + remaining := row.QtyIn - row.QtyOut + if remaining < 0 { + remaining = 0 + } + row.QtyUsed = remaining + if row.UnitPrice > 0 { + row.TotalAmount = row.QtyUsed * row.UnitPrice + } + } + } + adjustChicken(result.Doc) + adjustChicken(result.Pullet) + buildTotals := func(cat *SapronakCategoryDTO, label string) { if cat == nil { return @@ -345,5 +366,22 @@ func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag strin buildTotals(result.Doc, "TOTAL DOC") buildTotals(result.Ovk, "TOTAL OVK") buildTotals(result.Pakan, "TOTAL PAKAN") + + // For chicken categories, enforce total qty_used = qty_in - qty_out. + adjustChickenTotal := func(cat *SapronakCategoryDTO) { + if cat == nil { + return + } + remaining := cat.Total.QtyIn - cat.Total.QtyOut + if remaining < 0 { + remaining = 0 + } + cat.Total.QtyUsed = remaining + if cat.Total.AvgUnitPrice > 0 { + cat.Total.TotalAmount = cat.Total.AvgUnitPrice * remaining + } + } + adjustChickenTotal(result.Doc) + adjustChickenTotal(result.Pullet) return result } diff --git a/internal/modules/closings/repositories/closing.repository.go b/internal/modules/closings/repositories/closing.repository.go index ecd96b0a..a796d513 100644 --- a/internal/modules/closings/repositories/closing.repository.go +++ b/internal/modules/closings/repositories/closing.repository.go @@ -1029,17 +1029,18 @@ func (r *ClosingRepositoryImpl) FetchSapronakUsageAllocatedDetails(ctx context.C Joins("LEFT JOIN adjustment_stocks ast ON ast.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyAdjustmentIn.String()). Joins("LEFT JOIN project_flock_populations pfp ON pfp.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyProjectFlockPopulation.String()). Joins("LEFT JOIN project_chickins pc ON pc.id = pfp.project_chickin_id"). - Joins("LEFT JOIN products p_resolve ON p_resolve.id = COALESCE(pi.product_id, pw_ltt.product_id, pw.product_id)"). + Joins("LEFT JOIN product_warehouses pw_pc ON pw_pc.id = pc.product_warehouse_id"). + Joins("LEFT JOIN products p_resolve ON p_resolve.id = COALESCE(pi.product_id, pw_ltt.product_id, pw_pc.product_id, pw.product_id)"). Where("sa.status = ?", entity.StockAllocationStatusActive). Where("sa.stockable_type <> ?", fifo.StockableKeyProjectFlockPopulation.String()). Where("f.name IN ?", sapronakFlagsAll). Where(` - (sa.usable_type = ? AND r.project_flock_kandangs_id = ?) + (sa.usable_type = ? AND r.project_flock_kandangs_id = ? AND f.name IN ?) OR - (sa.usable_type = ? AND pc_used.project_flock_kandang_id = ?) + (sa.usable_type = ? AND pc_used.project_flock_kandang_id = ? AND f.name IN ?) `, - fifo.UsableKeyRecordingStock.String(), projectFlockKandangID, - fifo.UsableKeyProjectChickin.String(), projectFlockKandangID, + fifo.UsableKeyRecordingStock.String(), projectFlockKandangID, sapronakFlagsUsage, + fifo.UsableKeyProjectChickin.String(), projectFlockKandangID, sapronakFlagsChickin, ) query = r.joinSapronakProductFlag(query, "p_resolve"). Group(` @@ -1447,51 +1448,90 @@ func (r *ClosingRepositoryImpl) FetchSapronakSalesAllocatedDetails(ctx context.C return map[uint][]SapronakDetailRow{}, nil } + pfpType := fifo.StockableKeyProjectFlockPopulation.String() + query := r.withCtx(ctx). Table("stock_allocations AS sa"). - Select(` - pw.product_id AS product_id, - p.name AS product_name, + Select(fmt.Sprintf(` + p_resolve.id AS product_id, + p_resolve.name AS product_name, f.name AS flag, - COALESCE( - pi.received_date, - st.transfer_date, - lt.transfer_date, - ast.created_at - ) AS date, - COALESCE( - po.po_number, - st.movement_number, - lt.transfer_number, - CONCAT('ADJ-', ast.id), - '' - ) AS reference, + CASE + WHEN sa.stockable_type = '%s' THEN COALESCE( + pi_pc.received_date, + st_pc.transfer_date, + lt_pc.transfer_date, + ast_pc.created_at, + pc.chick_in_date + ) + ELSE COALESCE( + pi.received_date, + st.transfer_date, + lt.transfer_date, + ast.created_at + ) + END AS date, + CASE + WHEN sa.stockable_type = '%s' THEN COALESCE( + po_pc.po_number, + st_pc.movement_number, + lt_pc.transfer_number, + CASE WHEN ast_pc.id IS NOT NULL THEN CONCAT('ADJ-', ast_pc.id) END, + CONCAT('CHICKIN-', pc.id), + '' + ) + ELSE COALESCE( + po.po_number, + st.movement_number, + lt.transfer_number, + CASE WHEN ast.id IS NOT NULL THEN CONCAT('ADJ-', ast.id) END, + '' + ) + END AS reference, 0 AS qty_in, COALESCE(SUM(sa.qty), 0) AS qty_out, - COALESCE(pi.price, p.product_price, 0) AS price - `). - Joins("JOIN product_warehouses pw ON pw.id = sa.product_warehouse_id"). - Joins("JOIN products p ON p.id = pw.product_id"). + CASE + WHEN sa.stockable_type = '%s' THEN COALESCE(pi_pc.price, p_resolve.product_price, 0) + ELSE COALESCE(pi.price, p_resolve.product_price, 0) + END AS price + `, pfpType, pfpType, pfpType)). Joins("JOIN marketing_delivery_products mdp ON mdp.id = sa.usable_id AND sa.usable_type = ?", fifo.UsableKeyMarketingDelivery.String()). + Joins("JOIN product_warehouses pw_sales ON pw_sales.id = mdp.product_warehouse_id"). + Joins("JOIN product_warehouses pw ON pw.id = sa.product_warehouse_id"). Joins("LEFT JOIN purchase_items pi ON pi.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyPurchaseItems.String()). Joins("LEFT JOIN purchases po ON po.id = pi.purchase_id"). Joins("LEFT JOIN stock_transfer_details std ON std.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyStockTransferIn.String()). Joins("LEFT JOIN stock_transfers st ON st.id = std.stock_transfer_id"). Joins("LEFT JOIN laying_transfer_targets ltt ON ltt.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyTransferToLayingIn.String()). Joins("LEFT JOIN laying_transfers lt ON lt.id = ltt.laying_transfer_id"). + Joins("LEFT JOIN product_warehouses pw_ltt ON pw_ltt.id = ltt.product_warehouse_id"). Joins("LEFT JOIN adjustment_stocks ast ON ast.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyAdjustmentIn.String()). + Joins("LEFT JOIN project_flock_populations pfp ON pfp.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyProjectFlockPopulation.String()). + Joins("LEFT JOIN project_chickins pc ON pc.id = pfp.project_chickin_id"). + Joins("LEFT JOIN stock_allocations sa_pc ON sa_pc.usable_type = ? AND sa_pc.usable_id = pc.id", fifo.UsableKeyProjectChickin.String()). + Joins("LEFT JOIN purchase_items pi_pc ON pi_pc.id = sa_pc.stockable_id AND sa_pc.stockable_type = ?", fifo.StockableKeyPurchaseItems.String()). + Joins("LEFT JOIN purchases po_pc ON po_pc.id = pi_pc.purchase_id"). + Joins("LEFT JOIN stock_transfer_details std_pc ON std_pc.id = sa_pc.stockable_id AND sa_pc.stockable_type = ?", fifo.StockableKeyStockTransferIn.String()). + Joins("LEFT JOIN stock_transfers st_pc ON st_pc.id = std_pc.stock_transfer_id"). + Joins("LEFT JOIN laying_transfer_targets ltt_pc ON ltt_pc.id = sa_pc.stockable_id AND sa_pc.stockable_type = ?", fifo.StockableKeyTransferToLayingIn.String()). + Joins("LEFT JOIN laying_transfers lt_pc ON lt_pc.id = ltt_pc.laying_transfer_id"). + Joins("LEFT JOIN adjustment_stocks ast_pc ON ast_pc.id = sa_pc.stockable_id AND sa_pc.stockable_type = ?", fifo.StockableKeyAdjustmentIn.String()). + Joins("LEFT JOIN product_warehouses pw_pc ON pw_pc.id = pc.product_warehouse_id"). + Joins(fmt.Sprintf("LEFT JOIN products p_resolve ON p_resolve.id = CASE WHEN sa.stockable_type = '%s' THEN pw_pc.product_id ELSE COALESCE(pi.product_id, pw_ltt.product_id, pw.product_id) END", pfpType)). Where("sa.status = ?", entity.StockAllocationStatusActive). - Where("sa.stockable_type <> ?", fifo.StockableKeyProjectFlockPopulation.String()). - Where("pw.project_flock_kandang_id = ?", projectFlockKandangID). + Where("sa.stockable_type <> ?", fifo.StockableKeyRecordingEgg.String()). + Where("pw_sales.project_flock_kandang_id = ?", projectFlockKandangID). Where("f.name IN ?", sapronakFlagsAll). Group(` - pw.product_id, p.name, f.name, + p_resolve.id, p_resolve.name, f.name, + pi_pc.received_date, st_pc.transfer_date, lt_pc.transfer_date, ast_pc.created_at, pc.chick_in_date, pi.received_date, st.transfer_date, lt.transfer_date, ast.created_at, + po_pc.po_number, st_pc.movement_number, lt_pc.transfer_number, ast_pc.id, pc.id, po.po_number, st.movement_number, lt.transfer_number, ast.id, - pi.price, p.product_price + pi_pc.price, pi.price, p_resolve.product_price, sa.stockable_type `) - query = r.joinSapronakProductFlag(query, "p") + query = r.joinSapronakProductFlag(query, "p_resolve") return scanAndGroupDetails(query) } diff --git a/internal/modules/closings/services/sapronak.service.go b/internal/modules/closings/services/sapronak.service.go index ba79db1d..7e7c69b2 100644 --- a/internal/modules/closings/services/sapronak.service.go +++ b/internal/modules/closings/services/sapronak.service.go @@ -470,6 +470,7 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj // should not be counted yet. Only when category is LAYING we allow // pullet usage to contribute to qty_used. isLaying := strings.EqualFold(string(pfk.ProjectFlock.Category), string(utils.ProjectFlockCategoryLaying)) + hasChickin := len(pfk.Chickins) > 0 if !isLaying { filteredUsage := make([]repository.SapronakUsageRow, 0, len(chickinUsageRows)) @@ -775,6 +776,9 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj if !matchesFlag(flag) { continue } + if hasChickin && (strings.EqualFold(flag, "DOC") || strings.EqualFold(flag, "PULLET") || strings.EqualFold(flag, "LAYER")) { + continue + } group := ensureGroup(flag) for _, d := range details { if d.Flag == "" { @@ -794,6 +798,10 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj if !matchesFlag(flag) { continue } + // For chicken, we don't count sales as sapronak outflow. + if strings.EqualFold(flag, "DOC") || strings.EqualFold(flag, "PULLET") || strings.EqualFold(flag, "LAYER") { + continue + } group := ensureGroup(flag) for _, d := range details { if d.Flag == "" { diff --git a/internal/modules/marketing/services/deliveryorder.service.go b/internal/modules/marketing/services/deliveryorder.service.go index bb6682c7..d3edf3b4 100644 --- a/internal/modules/marketing/services/deliveryorder.service.go +++ b/internal/modules/marketing/services/deliveryorder.service.go @@ -560,11 +560,17 @@ func (s deliveryOrdersService) consumeDeliveryStock(ctx context.Context, tx *gor if deliveryProduct == nil || deliveryProduct.Id == 0 { return fiber.NewError(fiber.StatusInternalServerError, "Delivery product not found") } + if deliveryProduct.ProductWarehouseId == 0 { + return fiber.NewError(fiber.StatusInternalServerError, "Delivery product warehouse not found") + } + if deliveryProduct.ProductWarehouseId != marketingProduct.ProductWarehouseId { + return fiber.NewError(fiber.StatusBadRequest, "Delivery product warehouse mismatch with marketing product") + } result, err := s.FifoSvc.Consume(ctx, commonSvc.StockConsumeRequest{ UsableKey: fifo.UsableKeyMarketingDelivery, UsableID: deliveryProduct.Id, - ProductWarehouseID: marketingProduct.ProductWarehouseId, + ProductWarehouseID: deliveryProduct.ProductWarehouseId, Quantity: requestedQty, AllowPending: false, Tx: tx, @@ -585,12 +591,12 @@ func (s deliveryOrdersService) consumeDeliveryStock(ctx context.Context, tx *gor Decrease: result.UsageQuantity, LoggableType: string(utils.StockLogTypeMarketing), LoggableId: deliveryProduct.Id, - ProductWarehouseId: marketingProduct.ProductWarehouseId, + ProductWarehouseId: deliveryProduct.ProductWarehouseId, CreatedBy: actorID, Notes: fmt.Sprintf("FIFO consume (%.2f)", result.UsageQuantity), } - stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, marketingProduct.ProductWarehouseId, 1) + stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, deliveryProduct.ProductWarehouseId, 1) if err != nil { return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs") } diff --git a/internal/modules/production/project_flocks/dto/projectflock.dto.go b/internal/modules/production/project_flocks/dto/projectflock.dto.go index e7240b49..2701134c 100644 --- a/internal/modules/production/project_flocks/dto/projectflock.dto.go +++ b/internal/modules/production/project_flocks/dto/projectflock.dto.go @@ -42,6 +42,7 @@ type KandangWithProjectFlockIdDTO struct { kandangDTO.KandangRelationDTO ProjectFlockKandangId uint `json:"project_flock_kandang_id"` Period int `json:"period"` + ClosedAt *time.Time `json:"closed_at,omitempty"` } type ProjectFlockDetailDTO struct { @@ -74,20 +75,28 @@ func ToProjectFlockListDTOWithPeriod(e entity.ProjectFlock, period int) ProjectF for i, kandang := range e.Kandangs { var ( - pfkId uint - period int + pfkId uint + period int + closedAt *time.Time ) for _, kh := range e.KandangHistory { if kh.KandangId == kandang.Id { pfkId = kh.Id period = kh.Period + closedAt = kh.ClosedAt break } } + mapped := kandangDTO.ToKandangRelationDTO(kandang) + if closedAt != nil { + // Jangan ubah tabel kandang, hanya override status di response. + mapped.Status = string(utils.KandangStatusNonActive) + } kandangSummaries[i] = KandangWithProjectFlockIdDTO{ - KandangRelationDTO: kandangDTO.ToKandangRelationDTO(kandang), + KandangRelationDTO: mapped, ProjectFlockKandangId: pfkId, Period: period, + ClosedAt: closedAt, } } }