mirror of
https://gitlab.com/mbugroup/lti-api.git
synced 2026-05-24 07:15:43 +00:00
[FIX/BE-US] feat adjustment location and area
This commit is contained in:
@@ -54,7 +54,14 @@ func (s warehouseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
|
||||
|
||||
warehouses, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
|
||||
db = s.withRelations(db)
|
||||
db, scopeErr = m.ApplyAreaScope(c, db, "warehouses.area_id")
|
||||
applyScope := true
|
||||
if params.TransferContext == utils.TransferContextInventoryTransfer {
|
||||
applyScope = !m.HasPermission(c, m.P_TransferCreateOne)
|
||||
}
|
||||
|
||||
if applyScope {
|
||||
db, scopeErr = m.ApplyLocationAreaScope(c, db, "warehouses.location_id", "warehouses.area_id")
|
||||
}
|
||||
if params.Search != "" {
|
||||
db = db.Where("warehouses.name ILIKE ?", "%"+params.Search+"%")
|
||||
}
|
||||
@@ -81,6 +88,9 @@ func (s warehouseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
|
||||
)
|
||||
`, "Aktif")
|
||||
}
|
||||
if len(params.ExcludeIDs) > 0 {
|
||||
db = db.Where("warehouses.id NOT IN ?", params.ExcludeIDs)
|
||||
}
|
||||
return db.Order("created_at DESC").Order("updated_at DESC")
|
||||
})
|
||||
|
||||
@@ -99,7 +109,7 @@ func (s warehouseService) GetOne(c *fiber.Ctx, id uint) (*entity.Warehouse, erro
|
||||
|
||||
warehouse, err := s.Repository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
|
||||
db = s.withRelations(db)
|
||||
db, scopeErr = m.ApplyAreaScope(c, db, "warehouses.area_id")
|
||||
db, scopeErr = m.ApplyLocationAreaScope(c, db, "warehouses.location_id", "warehouses.area_id")
|
||||
return db
|
||||
})
|
||||
if scopeErr != nil {
|
||||
|
||||
Reference in New Issue
Block a user