fix filter purchase supplier repport

This commit is contained in:
ragilap
2026-04-01 16:25:04 +07:00
committed by giovanni
parent aa9863646e
commit b58e9a10b1
2 changed files with 3 additions and 2 deletions
@@ -432,6 +432,7 @@ func (c *RepportController) GetProductionResult(ctx *fiber.Ctx) error {
func parseCommaSeparatedInt64s(raw string) ([]int64, error) { func parseCommaSeparatedInt64s(raw string) ([]int64, error) {
return parseCommaSeparatedInt64sWithField(raw, "supplier_ids") return parseCommaSeparatedInt64sWithField(raw, "supplier_ids")
} }
func parseCommaSeparatedInt64sWithField(raw, field string) ([]int64, error) { func parseCommaSeparatedInt64sWithField(raw, field string) ([]int64, error) {
raw = strings.TrimSpace(raw) raw = strings.TrimSpace(raw)
if raw == "" { if raw == "" {
@@ -71,7 +71,7 @@ func (r *purchaseSupplierRepositoryImpl) baseSupplierQuery(ctx context.Context,
if len(filters.ProductCategoryIDs) > 0 { if len(filters.ProductCategoryIDs) > 0 {
db = db. db = db.
Joins("JOIN products ON products.id = purchase_items.product_id"). Joins("JOIN products ON products.id = purchase_items.product_id").
Where("products.product_category_id IN ?", filters.ProductCategoryIDs) Where("products.product_category_id IN ?", filters.ProductCategoryIDs)
} }
if len(filters.AreaIDs) > 0 || filters.AllowedAreaIDs != nil { if len(filters.AreaIDs) > 0 || filters.AllowedAreaIDs != nil {
@@ -194,7 +194,7 @@ func (r *purchaseSupplierRepositoryImpl) GetItemsBySuppliers(ctx context.Context
if len(filters.ProductCategoryIDs) > 0 { if len(filters.ProductCategoryIDs) > 0 {
db = db. db = db.
Joins("JOIN products ON products.id = purchase_items.product_id"). Joins("JOIN products ON products.id = purchase_items.product_id").
Where("products.product_category_id IN ?", filters.ProductCategoryIDs) Where("products.product_category_id IN ?", filters.ProductCategoryIDs)
} }
if len(filters.AreaIDs) > 0 || filters.AllowedAreaIDs != nil { if len(filters.AreaIDs) > 0 || filters.AllowedAreaIDs != nil {
db = db.Joins("JOIN warehouses ON warehouses.id = purchase_items.warehouse_id") db = db.Joins("JOIN warehouses ON warehouses.id = purchase_items.warehouse_id")