gitea-admin/lti-api
1
0
Fork 0
mirror of https://gitlab.com/mbugroup/lti-api.git synced 2026-05-20 13:31:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into 'codex/dashboard-without-uniformity'

Browse Source 
# Conflicts:
#   internal/modules/dashboards/repositories/dashboard_stats.repository.go
#   internal/modules/dashboards/services/dashboard.service.go
#   internal/modules/production/uniformities/services/uniformity.service.go
This commit is contained in:
Adnan Zahir
2026-04-14 14:31:18 +07:00
parent ca698ff2ae fbe0634d46
commit 82794d3d9b
25 changed files with 1528 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/modules/repports/controllers/repport.controller.go
+1
View File
@@ -432,6 +432,7 @@ func (c *RepportController) GetProductionResult(ctx *fiber.Ctx) error {
func parseCommaSeparatedInt64s(raw string) ([]int64, error) {
return parseCommaSeparatedInt64sWithField(raw, "supplier_ids")
}
func parseCommaSeparatedInt64sWithField(raw, field string) ([]int64, error) {
raw = strings.TrimSpace(raw)
if raw == "" {
internal/modules/repports/repositories/purchase_supplier.repository.go
+2 -2
View File
@@ -71,7 +71,7 @@ func (r *purchaseSupplierRepositoryImpl) baseSupplierQuery(ctx context.Context,
if len(filters.ProductCategoryIDs) > 0 {
db = db.
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 {
@@ -194,7 +194,7 @@ func (r *purchaseSupplierRepositoryImpl) GetItemsBySuppliers(ctx context.Context
if len(filters.ProductCategoryIDs) > 0 {
db = db.
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 {
db = db.Joins("JOIN warehouses ON warehouses.id = purchase_items.warehouse_id")