feat[BE]: enhance marketing module by adding ProductWarehouseId to marketing delivery product creation

internal/modules/marketing/module.go

@@ -33,18 +33,15 @@ func (MarketingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 	customerRepo := rCustomer.NewCustomerRepository(db)
 	productWarehouseRepo := rProductWarehouse.NewProductWarehouseRepository(db)
 
-	// Initialize FIFO service
 	stockAllocationRepo := commonRepo.NewStockAllocationRepository(db)
 	fifoService := commonSvc.NewFifoService(db, stockAllocationRepo, productWarehouseRepo, utils.Log)
 
-	// Register marketing_delivery_products as FIFO Usable
-	// Note: ProductWarehouseID comes from marketing_products table via preload
 	if err := fifoService.RegisterUsable(fifo.UsableConfig{
 		Key:   fifo.UsableKeyMarketingDelivery,
 		Table: "marketing_delivery_products",
 		Columns: fifo.UsableColumns{
 			ID:                 "id",
-			ProductWarehouseID: "product_warehouse_id", // Resolved from marketing_products via preload
+			ProductWarehouseID: "product_warehouse_id",
 			UsageQuantity:      "usage_qty",
 			PendingQuantity:    "pending_qty",
 			CreatedAt:          "created_at",
@@ -55,11 +52,9 @@ func (MarketingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 		}
 	}
 
-	// Initialize approval service
 	approvalRepo := commonRepo.NewApprovalRepository(db)
 	approvalSvc := commonSvc.NewApprovalService(approvalRepo)
 
-	// Register workflow steps for marketing approval
 	if err := approvalSvc.RegisterWorkflowSteps(utils.ApprovalWorkflowMarketing, utils.MarketingApprovalSteps); err != nil {
 		panic(fmt.Sprintf("failed to register marketing approval workflow: %v", err))
 	}
@@ -67,11 +62,9 @@ func (MarketingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 	warehouseRepo := rWarehouse.NewWarehouseRepository(db)
 	projectFlockKandangRepo := rProjectFlockKandang.NewProjectFlockKandangRepository(db)
 
-	// Initialize services
 	salesOrdersService := service.NewSalesOrdersService(marketingRepo, customerRepo, productWarehouseRepo, userRepo, approvalSvc, warehouseRepo, projectFlockKandangRepo, validate)
 	deliveryOrdersService := service.NewDeliveryOrdersService(marketingRepo, marketingProductRepo, marketingDeliveryProductRepo, approvalSvc, fifoService, validate)
 	userService := sUser.NewUserService(userRepo, validate)
 
-	// Register routes
 	RegisterRoutes(router, userService, salesOrdersService, deliveryOrdersService)
 }

internal/modules/marketing/services/salesorder.service.go

@@ -603,15 +603,16 @@ func (s *salesOrdersService) createMarketingProductWithDelivery(ctx context.Cont
 	}
 
 	marketingDeliveryProduct := &entity.MarketingDeliveryProduct{
-		MarketingProductId: marketingProduct.Id,
-		UnitPrice:          0,
-		TotalWeight:        0,
-		AvgWeight:          0,
-		TotalPrice:         0,
-		DeliveryDate:       nil,
-		VehicleNumber:      rp.VehicleNumber,
-		UsageQty:           0,
-		PendingQty:         0,
+		MarketingProductId:   marketingProduct.Id,
+		ProductWarehouseId:   marketingProduct.ProductWarehouseId,
+		UnitPrice:            0,
+		TotalWeight:          0,
+		AvgWeight:            0,
+		TotalPrice:           0,
+		DeliveryDate:         nil,
+		VehicleNumber:        rp.VehicleNumber,
+		UsageQty:             0,
+		PendingQty:           0,
 	}
 	if err := invDeliveryRepo.CreateOne(ctx, marketingDeliveryProduct, nil); err != nil {
 		return err