diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart
index 9d4ef5db..d7835fa9 100644
--- a/lib/controllers/api_routes/urls.dart
+++ b/lib/controllers/api_routes/urls.dart
@@ -225,9 +225,13 @@ class URLs {
   static get getServiceReportRejectionReasons => "$_baseUrl/Lookups/GetLookup?lookupEnum=1303";
 
   static get getServiceReportReasonsNew => "$_baseUrl/Lookups/GetLookupReasonNew?lookupEnum=505";
+
   static get getTrafRequestTypeLookup => "$_baseUrl/Lookups/GetLookup?lookupEnum=416";
+
   static get getYesNoRequestTypeLookup => "$_baseUrl/Lookups/GetLookup?lookupEnum=4";
+
   static get getClassificationTypeLookup => "$_baseUrl/Lookups/GetLookup?lookupEnum=450";
+
   static get getRecommendationTypeLookup => "$_baseUrl/Lookups/GetLookup?lookupEnum=451";
 
   static get getWoFrames => "$_baseUrl/Lookups/GetLookup?lookupEnum=1254";
@@ -253,6 +257,7 @@ class URLs {
 
   //Traf
   static get getTRAFById => "$_baseUrl/TRAF/GetTRAFById"; // get
+  static get getAssetNDAutoCompleteByDynamicCodes => "$_baseUrl/AssetNameDefinition/GetAssetNDAutoCompleteByDynamicCodes"; // get
 
   //gas refill
   static get getGasTypes => "$_baseUrl/Lookups/GetLookup?lookupEnum=606"; // get
@@ -302,4 +307,5 @@ class URLs {
   static get addComment => "$_baseUrl/CallRequest/AddHistoryComment"; // add
 
   static get getSiteContactInfo => "$_baseUrl/AssetGroupSiteContactInfo"; // add
+  static get getDepartmentBasedOnSite => "$_baseUrl/TRAFDataSource/GetDepartmentBasedOnSite"; // add
 }
diff --git a/lib/controllers/providers/api/oracle_code_provider.dart b/lib/controllers/providers/api/oracle_code_provider.dart
index df0acb98..ea8b0978 100644
--- a/lib/controllers/providers/api/oracle_code_provider.dart
+++ b/lib/controllers/providers/api/oracle_code_provider.dart
@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:http/http.dart';
 import 'package:test_sa/controllers/api_routes/api_manager.dart';
 import 'package:test_sa/controllers/api_routes/urls.dart';
+import 'package:test_sa/models/new_models/asset_nd_auto_complete_by_dynamic_codes_model.dart';
 import 'package:test_sa/models/service_request/spare_parts.dart';
 
 class OracleCodeProvider extends ChangeNotifier {
@@ -84,15 +85,15 @@ class OracleCodeProvider extends ChangeNotifier {
   /// return state code if request complete may be 200, 404 or 403
   /// for more details check http state manager
   /// lib\controllers\http_status_manger\http_status_manger.dart
-  Future<List<SparePart>> getAssetByOracleCode(String oracleCode) async {
+  Future<List<AssetNDAutoCompleteByDynamicCodesModel>> getAssetByOracleCode(String oracleCode) async {
     late Response response;
     try {
-      response = await ApiManager.instance.post(URLs.getPartNumber, body: {"oracleCode": oracleCode});
-      List<SparePart> page = [];
+      response = await ApiManager.instance.post(URLs.getAssetNDAutoCompleteByDynamicCodes, body: {"codeValue": oracleCode});
+      List<AssetNDAutoCompleteByDynamicCodesModel> page = [];
       if (response.statusCode >= 200 && response.statusCode < 300) {
         // client's request was successfully received
         List categoriesListJson = json.decode(response.body)["data"];
-        page = categoriesListJson.map((part) => SparePart.fromJson(part, false)).toList();
+        page = categoriesListJson.map((part) => AssetNDAutoCompleteByDynamicCodesModel.fromJson(part)).toList();
       }
       return page;
     } catch (error) {
diff --git a/lib/main.dart b/lib/main.dart
index 30daa9c1..f2f5a281 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -99,6 +99,7 @@ import 'controllers/providers/settings/setting_provider.dart';
 import 'dashboard_latest/dashboard_provider.dart';
 import 'new_views/pages/gas_refill_request_form.dart';
 import 'providers/lookups/classification_lookup_provider.dart';
+import 'providers/lookups/department_lookup_provider.dart';
 import 'providers/lookups/request_type_lookup_provider.dart';
 import 'providers/lookups/yes_no_lookup_provider.dart';
 import 'providers/service_request_providers/loan_availability_provider.dart';
@@ -209,6 +210,7 @@ class MyApp extends StatelessWidget {
         ChangeNotifierProvider(create: (_) => AssetTransferStatusProvider()),
 
         ChangeNotifierProvider(create: (_) => TrafRequestProvider()),
+        ChangeNotifierProvider(create: (_) => DepartmentLookupProvider()),
 
         ///todo deleted
         //ChangeNotifierProvider(create: (_) => PentryTaskStatusProvider()),
diff --git a/lib/models/new_models/asset_nd_auto_complete_by_dynamic_codes_model.dart b/lib/models/new_models/asset_nd_auto_complete_by_dynamic_codes_model.dart
new file mode 100644
index 00000000..4d5ae14e
--- /dev/null
+++ b/lib/models/new_models/asset_nd_auto_complete_by_dynamic_codes_model.dart
@@ -0,0 +1,27 @@
+class AssetNDAutoCompleteByDynamicCodesModel {
+  int? id;
+  String? assetName;
+  int? codeTypeId;
+  String? codeValue;
+  String? displayName;
+
+  AssetNDAutoCompleteByDynamicCodesModel({this.id, this.assetName, this.codeTypeId, this.codeValue, this.displayName});
+
+  AssetNDAutoCompleteByDynamicCodesModel.fromJson(Map<String, dynamic> json) {
+    id = json['id'];
+    assetName = json['assetName'];
+    codeTypeId = json['codeTypeId'];
+    codeValue = json['codeValue'];
+    displayName = json['displayName'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['id'] = this.id;
+    data['assetName'] = this.assetName;
+    data['codeTypeId'] = this.codeTypeId;
+    data['codeValue'] = this.codeValue;
+    data['displayName'] = this.displayName;
+    return data;
+  }
+}
diff --git a/lib/models/new_models/traf_department.dart b/lib/models/new_models/traf_department.dart
new file mode 100644
index 00000000..5a2e256d
--- /dev/null
+++ b/lib/models/new_models/traf_department.dart
@@ -0,0 +1,101 @@
+import 'package:test_sa/models/new_models/room_model.dart';
+
+import '../base.dart';
+
+class TrafDepartment extends Base {
+  TrafDepartment({
+    this.departmentName, this.departmentCode, this.ntCode, this.costCenterNumber, this.costCenterName, this.name, this.id, this.createdBy, this.createdDate, this.modifiedBy, this.modifiedDate
+  }) : super(identifier: id?.toString() ?? '', name: departmentName); // Handle potential null id
+
+  TrafDepartment.fromJson(Map<String, dynamic> json) {
+    departmentName = json['departmentName'] ?? json['name'];
+    departmentCode = json['departmentCode'];
+    ntCode = json['ntCode'];
+    costCenterNumber = json['costCenterNumber'];
+    costCenterName = json['costCenterName'];
+    name = json['name'];
+    id = json['id'];
+    createdBy = json['createdBy'];
+    createdDate = json['createdDate'];
+    modifiedBy = json['modifiedBy'];
+    modifiedDate = json['modifiedDate'];
+  }
+
+  num? id; // Now nullable
+  String? departmentName; // Now nullable
+  String? departmentCode; // Now nullable
+  String? ntCode;
+  String? costCenterNumber;
+  String? costCenterName;
+  String? name;
+  String? createdBy;
+  String? createdDate;
+  String? modifiedBy;
+  String? modifiedDate;
+
+  // TrafDepartment copyWith({
+  //   num? id, // Parameters are now nullable
+  //   String? departmentName,
+  //   String? departmentCode,
+  //   String? departmentId,
+  //   String? ntCode,
+  //   List<Rooms>? rooms,
+  // }) =>
+  //     TrafDepartment(
+  //       id: id ?? this.id,
+  //       departmentName: departmentName ?? this.departmentName,
+  //       departmentCode: departmentCode ?? this.departmentCode,
+  //       departmentId: departmentId ?? this.departmentId,
+  //       ntCode: ntCode ?? this.ntCode,
+  //       rooms: rooms ?? this.rooms,
+  //     );
+
+
+}
+
+// class TrafDepartment extends Base {
+//   String? departmentName;
+//   String? departmentCode;
+//   Null? ntCode;
+//   Null? costCenterNumber;
+//   Null? costCenterName;
+//   String? name;
+//   int? id;
+//   String? createdBy;
+//   String? createdDate;
+//   Null? modifiedBy;
+//   Null? modifiedDate;
+//
+//   TrafDepartment(
+//       {this.departmentName, this.departmentCode, this.ntCode, this.costCenterNumber, this.costCenterName, this.name, this.id, this.createdBy, this.createdDate, this.modifiedBy, this.modifiedDate});
+//
+//   TrafDepartment.fromJson(Map<String, dynamic> json) {
+//     departmentName = json['departmentName'];
+//     departmentCode = json['departmentCode'];
+//     ntCode = json['ntCode'];
+//     costCenterNumber = json['costCenterNumber'];
+//     costCenterName = json['costCenterName'];
+//     name = json['name'];
+//     id = json['id'];
+//     createdBy = json['createdBy'];
+//     createdDate = json['createdDate'];
+//     modifiedBy = json['modifiedBy'];
+//     modifiedDate = json['modifiedDate'];
+//   }
+//
+//   Map<String, dynamic> toJson() {
+//     final Map<String, dynamic> data = new Map<String, dynamic>();
+//     data['departmentName'] = this.departmentName;
+//     data['departmentCode'] = this.departmentCode;
+//     data['ntCode'] = this.ntCode;
+//     data['costCenterNumber'] = this.costCenterNumber;
+//     data['costCenterName'] = this.costCenterName;
+//     data['name'] = this.name;
+//     data['id'] = this.id;
+//     data['createdBy'] = this.createdBy;
+//     data['createdDate'] = this.createdDate;
+//     data['modifiedBy'] = this.modifiedBy;
+//     data['modifiedDate'] = this.modifiedDate;
+//     return data;
+//   }
+// }
diff --git a/lib/modules/traf_module/asset_auto_complete_field.dart b/lib/modules/traf_module/asset_auto_complete_field.dart
index df4a042e..0abb378b 100644
--- a/lib/modules/traf_module/asset_auto_complete_field.dart
+++ b/lib/modules/traf_module/asset_auto_complete_field.dart
@@ -7,6 +7,7 @@ import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
 import 'package:test_sa/extensions/context_extension.dart';
 import 'package:test_sa/extensions/int_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
+import 'package:test_sa/models/new_models/asset_nd_auto_complete_by_dynamic_codes_model.dart';
 import 'package:test_sa/new_views/app_style/app_color.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
 
@@ -18,7 +19,7 @@ class AssetAutoCompleteField extends StatefulWidget {
   final String initialValue;
   final num? assetId;
   final bool clearAfterPick, byName;
-  final Function(SparePartsWorkOrders) onPick;
+  final Function(AssetNDAutoCompleteByDynamicCodesModel) onPick;
 
   const AssetAutoCompleteField({Key? key, required this.byName, required this.initialValue, this.assetId, required this.onPick, this.clearAfterPick = true}) : super(key: key);
 
@@ -63,7 +64,7 @@ class _AssetAutoCompleteFieldState extends State<AssetAutoCompleteField> {
         borderRadius: BorderRadius.circular(AppStyle.borderRadius * AppStyle.getScaleFactor(context)),
         //  boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.05), blurRadius: 10)],
       ),
-      child: Autocomplete<SparePartsWorkOrders>(
+      child: Autocomplete<AssetNDAutoCompleteByDynamicCodesModel>(
         optionsBuilder: (TextEditingValue textEditingValue) async {
           if (textEditingValue.text.isEmpty) {
             if (loading) {
@@ -71,20 +72,20 @@ class _AssetAutoCompleteFieldState extends State<AssetAutoCompleteField> {
                 loading = false;
               });
             }
-            return const Iterable<SparePartsWorkOrders>.empty();
+            return const Iterable<AssetNDAutoCompleteByDynamicCodesModel>.empty();
           }
           if (!loading) {
             setState(() {
               loading = true;
             });
           }
-          List<SparePartsWorkOrders> workOrders = (await _oracleCodeProvider.getAssetByOracleCode(textEditingValue.text)).map((e) => SparePartsWorkOrders(sparePart: e)).toList();
+          List<AssetNDAutoCompleteByDynamicCodesModel> workOrders = (await _oracleCodeProvider.getAssetByOracleCode(textEditingValue.text));
           setState(() {
             loading = false;
           });
           return workOrders;
         },
-        displayStringForOption: (SparePartsWorkOrders option) => widget.byName ? option.sparePart?.partName ?? "" : option.sparePart?.partNo ?? "",
+        displayStringForOption: (AssetNDAutoCompleteByDynamicCodesModel option) => widget.byName ? option.displayName ?? "" : option.codeValue ?? "",
         fieldViewBuilder: (BuildContext context, TextEditingController fieldTextEditingController, FocusNode fieldFocusNode, VoidCallback onFieldSubmitted) {
           return TextField(
             controller: _controller,
@@ -117,11 +118,11 @@ class _AssetAutoCompleteFieldState extends State<AssetAutoCompleteField> {
             },
           );
         },
-        onSelected: (SparePartsWorkOrders selection) {
+        onSelected: (AssetNDAutoCompleteByDynamicCodesModel selection) {
           if (widget.clearAfterPick) {
             _controller.clear();
           } else {
-            _controller.text = widget.byName ? (selection.sparePart?.partName ?? "") : (selection.sparePart?.partNo ?? "");
+            _controller.text = widget.byName ? (selection.displayName ?? "") : (selection.codeValue ?? "");
           }
           widget.onPick(selection);
         },
diff --git a/lib/modules/traf_module/create_traf_request_page.dart b/lib/modules/traf_module/create_traf_request_page.dart
index f1b62e0e..b52287f4 100644
--- a/lib/modules/traf_module/create_traf_request_page.dart
+++ b/lib/modules/traf_module/create_traf_request_page.dart
@@ -7,6 +7,7 @@ import 'package:test_sa/extensions/text_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/models/device/asset.dart';
 import 'package:test_sa/models/lookup.dart';
+import 'package:test_sa/models/new_models/traf_department.dart';
 import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
 import 'package:test_sa/modules/traf_module/asset_auto_complete_field.dart';
 import 'package:test_sa/modules/traf_module/traf_request_detail_page.dart';
@@ -18,6 +19,7 @@ import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
 import 'package:test_sa/new_views/common_widgets/multiple_item_drop_down_menu.dart';
 import 'package:test_sa/new_views/common_widgets/single_item_drop_down_menu.dart';
 import 'package:test_sa/providers/loading_list_notifier.dart';
+import 'package:test_sa/providers/lookups/department_lookup_provider.dart';
 import 'package:test_sa/providers/lookups/request_type_lookup_provider.dart';
 import 'package:test_sa/providers/lookups/yes_no_lookup_provider.dart';
 import 'package:test_sa/views/widgets/equipment/asset_picker.dart';
@@ -50,6 +52,7 @@ class _CreateTRAFRequestPageState extends State<CreateTRAFRequestPage> {
   TrafRequestDataModel? trafRequest;
 
   List<Lookup> abc = [];
+  List<TrafDepartment> departments = [];
 
   @override
   void initState() {
@@ -106,9 +109,8 @@ class _CreateTRAFRequestPageState extends State<CreateTRAFRequestPage> {
                   if (requestType?.value == 1) ...[
                     12.height,
                     AssetAutoCompleteField(
-                      // assetId: widget.assetId,
                       clearAfterPick: false,
-                      byName: false,
+                      byName: true,
                       initialValue: "",
                       onPick: (part) {
                         // model.partCatalogItem = PartCatalogItem(id: part.sparePart?.id, partNumber: part.sparePart?.partNo, partName: part.sparePart?.partName, oracleCode: part.sparePart?.oracleCode);
@@ -218,7 +220,6 @@ class _CreateTRAFRequestPageState extends State<CreateTRAFRequestPage> {
                       trafRequest?.censusQ4 = int.tryParse(value);
                     },
                   ),
-
                   12.height,
                   SingleItemDropDownMenu<Lookup, YesNoLookupProvider>(
                     context: context,
@@ -245,21 +246,26 @@ class _CreateTRAFRequestPageState extends State<CreateTRAFRequestPage> {
                     onSelect: (value) {
                       isUsedSolelyOrShared = value;
                       trafRequest?.usingSolelyOrSharedId = value?.value;
+                      if (isUsedSolelyOrShared?.value != 1) {
+                        departments = [];
+                        Provider.of<DepartmentLookupProvider>(context, listen: false).reset();
+                      }
                       setState(() {});
                     },
                   ),
                   if (isUsedSolelyOrShared?.value == 1) ...[
                     12.height,
-                    MultipleItemDropDownMenu<Lookup, RequestTypeLookupProvider>(
+                    MultipleItemDropDownMenu<TrafDepartment, DepartmentLookupProvider>(
                       context: context,
                       showAsBottomSheet: true,
                       backgroundColor: AppColor.neutral100,
                       showShadow: false,
                       showCancel: true,
+                      requestById: context.userProvider.user?.clientId,
                       title: "Please specify departments and relations",
-                      initialValue: abc,
+                      initialValue: departments,
                       onSelect: (value) {
-                        abc = value ?? [];
+                        departments = value ?? [];
                         // setState(() {
                         //
                         // });
diff --git a/lib/new_views/common_widgets/multiple_item_drop_down_menu.dart b/lib/new_views/common_widgets/multiple_item_drop_down_menu.dart
index 723b3faf..9c579f97 100644
--- a/lib/new_views/common_widgets/multiple_item_drop_down_menu.dart
+++ b/lib/new_views/common_widgets/multiple_item_drop_down_menu.dart
@@ -28,6 +28,7 @@ class MultipleItemDropDownMenu<T extends Base, X extends LoadingListNotifier> ex
   final bool showCancel;
   final Color? backgroundColor; // Now nullable
   final bool? loading; // Now nullable
+  final int? requestById; // Now nullable
 
   /// To use a static data (without calling API)
   /// just send [NullableLoadingProvider] as generic data type and fill the [staticData]
@@ -47,6 +48,7 @@ class MultipleItemDropDownMenu<T extends Base, X extends LoadingListNotifier> ex
     this.showCancel = false,
     this.backgroundColor,
     this.loading,
+    this.requestById,
   }) : super(key: key);
 
   @override
@@ -150,7 +152,7 @@ class _MultipleItemDropDownMenuState<T extends Base, X extends LoadingListNotifi
       onRefresh: () async {
         if (X != NullableLoadingProvider) {
           provider?.reset();
-          await provider?.getData();
+          await provider?.getData(id: widget.requestById);
         }
       },
       child: Container(
diff --git a/lib/new_views/common_widgets/single_item_drop_down_menu.dart b/lib/new_views/common_widgets/single_item_drop_down_menu.dart
index 02e0e16a..5c77205a 100644
--- a/lib/new_views/common_widgets/single_item_drop_down_menu.dart
+++ b/lib/new_views/common_widgets/single_item_drop_down_menu.dart
@@ -27,6 +27,7 @@ class SingleItemDropDownMenu<T extends Base, X extends LoadingListNotifier> exte
   final bool showCancel;
   final Color? backgroundColor; // Now nullable
   final bool? loading; // Now nullable
+  final int? requestById;
 
   /// To use a static data (without calling API)
   /// just send [NullableLoadingProvider] as generic data type and fill the [staticData]
@@ -46,6 +47,7 @@ class SingleItemDropDownMenu<T extends Base, X extends LoadingListNotifier> exte
     this.showCancel = false,
     this.backgroundColor,
     this.loading,
+    this.requestById,
   }) : super(key: key);
 
   @override
@@ -106,7 +108,7 @@ class _SingleItemDropDownMenuState<T extends Base, X extends LoadingListNotifier
       onRefresh: () async {
         if (X != NullableLoadingProvider) {
           provider?.reset();
-          await provider?.getData();
+          await provider?.getData(id: widget.requestById);
         }
       },
       child: Container(
diff --git a/lib/providers/asset_transfer/asset_transfer_status_provider.dart b/lib/providers/asset_transfer/asset_transfer_status_provider.dart
index a39928ed..a2ebf366 100644
--- a/lib/providers/asset_transfer/asset_transfer_status_provider.dart
+++ b/lib/providers/asset_transfer/asset_transfer_status_provider.dart
@@ -9,7 +9,7 @@ import '../loading_list_notifier.dart';
 
 class AssetTransferStatusProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading ?? false) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/department_provider.dart b/lib/providers/department_provider.dart
index 96a2d814..78041d0f 100644
--- a/lib/providers/department_provider.dart
+++ b/lib/providers/department_provider.dart
@@ -9,7 +9,7 @@ import 'loading_list_notifier.dart';
 
 class DepartmentProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading ?? false) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/gas_request_providers/cylinder_size_provider.dart b/lib/providers/gas_request_providers/cylinder_size_provider.dart
index 379d84d6..5e8d4409 100644
--- a/lib/providers/gas_request_providers/cylinder_size_provider.dart
+++ b/lib/providers/gas_request_providers/cylinder_size_provider.dart
@@ -9,7 +9,7 @@ import '../loading_list_notifier.dart';
 
 class CylinderSizeProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading ?? false) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/gas_request_providers/cylinder_type_provider.dart b/lib/providers/gas_request_providers/cylinder_type_provider.dart
index a4d9ba98..356af1d3 100644
--- a/lib/providers/gas_request_providers/cylinder_type_provider.dart
+++ b/lib/providers/gas_request_providers/cylinder_type_provider.dart
@@ -9,7 +9,7 @@ import '../loading_list_notifier.dart';
 
 class CylinderTypesProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading ?? false) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/gas_request_providers/gas_status_provider.dart b/lib/providers/gas_request_providers/gas_status_provider.dart
index f375b100..7057a503 100644
--- a/lib/providers/gas_request_providers/gas_status_provider.dart
+++ b/lib/providers/gas_request_providers/gas_status_provider.dart
@@ -9,7 +9,7 @@ import '../loading_list_notifier.dart';
 
 class GasStatusProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading ?? false) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/gas_request_providers/gas_types_provider.dart b/lib/providers/gas_request_providers/gas_types_provider.dart
index 7f539739..78d724f3 100644
--- a/lib/providers/gas_request_providers/gas_types_provider.dart
+++ b/lib/providers/gas_request_providers/gas_types_provider.dart
@@ -9,7 +9,7 @@ import '../../controllers/api_routes/urls.dart';
 
 class GasTypesProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading ?? false) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/gas_request_providers/site_provider.dart b/lib/providers/gas_request_providers/site_provider.dart
index 430a50e3..d497a88d 100644
--- a/lib/providers/gas_request_providers/site_provider.dart
+++ b/lib/providers/gas_request_providers/site_provider.dart
@@ -10,7 +10,7 @@ import '../../controllers/api_routes/urls.dart';
 
 class SiteProvider extends LoadingListNotifier<Site> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading ?? false) return -2;
     loading = true;
     notifyListeners();
@@ -35,7 +35,7 @@ class SiteProvider extends LoadingListNotifier<Site> {
 
 class MappedSiteProvider extends LoadingListNotifier<MappedSite> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading ?? false) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/loading_list_notifier.dart b/lib/providers/loading_list_notifier.dart
index 2fee42b0..134f2a29 100644
--- a/lib/providers/loading_list_notifier.dart
+++ b/lib/providers/loading_list_notifier.dart
@@ -3,7 +3,7 @@ import 'package:test_sa/models/base.dart';
 
 class NullableLoadingProvider extends LoadingListNotifier<Base> {
   @override
-  Future getData() {
+  Future getData({int? id}) {
     return Future.value();
   }
 }
@@ -28,5 +28,5 @@ abstract class LoadingListNotifier<T extends Base> extends ChangeNotifier {
     stateCode = null;
   }
 
-  Future getData();
+  Future getData({int? id});
 }
diff --git a/lib/providers/lookups/classification_lookup_provider.dart b/lib/providers/lookups/classification_lookup_provider.dart
index 87b57efb..9e56dfa3 100644
--- a/lib/providers/lookups/classification_lookup_provider.dart
+++ b/lib/providers/lookups/classification_lookup_provider.dart
@@ -9,7 +9,7 @@ import '../../models/lookup.dart';
 
 class ClassificationLookupProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/lookups/department_lookup_provider.dart b/lib/providers/lookups/department_lookup_provider.dart
new file mode 100644
index 00000000..fcd0fe8e
--- /dev/null
+++ b/lib/providers/lookups/department_lookup_provider.dart
@@ -0,0 +1,34 @@
+import 'dart:convert';
+
+import 'package:http/http.dart';
+import 'package:test_sa/models/new_models/traf_department.dart';
+import 'package:test_sa/providers/loading_list_notifier.dart';
+
+import '../../controllers/api_routes/api_manager.dart';
+import '../../controllers/api_routes/urls.dart';
+import '../../models/lookup.dart';
+
+class DepartmentLookupProvider extends LoadingListNotifier<TrafDepartment> {
+  @override
+  Future getData({int? id}) async {
+    if (loading == true) return -2;
+    loading = true;
+    notifyListeners();
+    try {
+      Response response = await ApiManager.instance.get(URLs.getDepartmentBasedOnSite + "?customerId=$id");
+      stateCode = response.statusCode;
+      if (response.statusCode >= 200 && response.statusCode < 300) {
+        List categoriesListJson = json.decode(response.body)["data"];
+        items = categoriesListJson.map((item) => TrafDepartment.fromJson(item)).toList();
+      }
+      loading = false;
+      notifyListeners();
+      return response.statusCode;
+    } catch (error) {
+      loading = false;
+      stateCode = -1;
+      notifyListeners();
+      return -1;
+    }
+  }
+}
diff --git a/lib/providers/lookups/recommendation_lookup_provider.dart b/lib/providers/lookups/recommendation_lookup_provider.dart
index a0bbe48a..e096656f 100644
--- a/lib/providers/lookups/recommendation_lookup_provider.dart
+++ b/lib/providers/lookups/recommendation_lookup_provider.dart
@@ -9,7 +9,7 @@ import '../../models/lookup.dart';
 
 class RecommendationLookupProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/lookups/request_type_lookup_provider.dart b/lib/providers/lookups/request_type_lookup_provider.dart
index cc94de62..ba709ccc 100644
--- a/lib/providers/lookups/request_type_lookup_provider.dart
+++ b/lib/providers/lookups/request_type_lookup_provider.dart
@@ -9,7 +9,7 @@ import '../../models/lookup.dart';
 
 class RequestTypeLookupProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/lookups/yes_no_lookup_provider.dart b/lib/providers/lookups/yes_no_lookup_provider.dart
index a089069b..e3b87d66 100644
--- a/lib/providers/lookups/yes_no_lookup_provider.dart
+++ b/lib/providers/lookups/yes_no_lookup_provider.dart
@@ -9,7 +9,7 @@ import '../../models/lookup.dart';
 
 class YesNoLookupProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/ppm_asset_availability_provider.dart b/lib/providers/ppm_asset_availability_provider.dart
index 456ad99e..219647c6 100644
--- a/lib/providers/ppm_asset_availability_provider.dart
+++ b/lib/providers/ppm_asset_availability_provider.dart
@@ -9,7 +9,7 @@ import 'loading_list_notifier.dart';
 
 class PpmAssetAvailabilityProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading ?? false) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/ppm_checklist_status_provider.dart b/lib/providers/ppm_checklist_status_provider.dart
index d6b62a80..2744482e 100644
--- a/lib/providers/ppm_checklist_status_provider.dart
+++ b/lib/providers/ppm_checklist_status_provider.dart
@@ -9,7 +9,7 @@ import 'loading_list_notifier.dart';
 
 class PpmChecklistStatusProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading ?? false) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/ppm_device_status_provider.dart b/lib/providers/ppm_device_status_provider.dart
index 378ddcf1..ea49ade0 100644
--- a/lib/providers/ppm_device_status_provider.dart
+++ b/lib/providers/ppm_device_status_provider.dart
@@ -9,7 +9,7 @@ import 'loading_list_notifier.dart';
 
 class PPMDeviceStatusProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading ?? false) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/ppm_electrical_safety_provider.dart b/lib/providers/ppm_electrical_safety_provider.dart
index a681b927..c67dfbf5 100644
--- a/lib/providers/ppm_electrical_safety_provider.dart
+++ b/lib/providers/ppm_electrical_safety_provider.dart
@@ -9,7 +9,7 @@ import 'loading_list_notifier.dart';
 
 class PpmElectricalSafetyProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading ?? false) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/ppm_service_provider.dart b/lib/providers/ppm_service_provider.dart
index 0238c803..2e0a2d41 100644
--- a/lib/providers/ppm_service_provider.dart
+++ b/lib/providers/ppm_service_provider.dart
@@ -9,7 +9,7 @@ import 'loading_list_notifier.dart';
 
 class PpmServiceProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading ?? false) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/ppm_task_status_provider.dart b/lib/providers/ppm_task_status_provider.dart
index ed7a7943..2b1e86a8 100644
--- a/lib/providers/ppm_task_status_provider.dart
+++ b/lib/providers/ppm_task_status_provider.dart
@@ -9,7 +9,7 @@ import 'loading_list_notifier.dart';
 
 class PpmTaskStatusProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading ?? false) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/ppm_visit_status_provider.dart b/lib/providers/ppm_visit_status_provider.dart
index 19625daa..dc72c873 100644
--- a/lib/providers/ppm_visit_status_provider.dart
+++ b/lib/providers/ppm_visit_status_provider.dart
@@ -9,7 +9,7 @@ import 'loading_list_notifier.dart';
 
 class PPMVisitStatusProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading ?? false) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/service_request_providers/commissioning_status_provider.dart b/lib/providers/service_request_providers/commissioning_status_provider.dart
index 60e07ff9..bba116b8 100644
--- a/lib/providers/service_request_providers/commissioning_status_provider.dart
+++ b/lib/providers/service_request_providers/commissioning_status_provider.dart
@@ -9,7 +9,7 @@ import '../../models/lookup.dart';
 
 class CommissioningStatusProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/service_request_providers/equipment_status_provider.dart b/lib/providers/service_request_providers/equipment_status_provider.dart
index 7280aa58..5f2f9fad 100644
--- a/lib/providers/service_request_providers/equipment_status_provider.dart
+++ b/lib/providers/service_request_providers/equipment_status_provider.dart
@@ -9,7 +9,7 @@ import '../../models/lookup.dart';
 
 class EquipmentStatusProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/service_request_providers/first_action_provider.dart b/lib/providers/service_request_providers/first_action_provider.dart
index 32123215..4908e3b2 100644
--- a/lib/providers/service_request_providers/first_action_provider.dart
+++ b/lib/providers/service_request_providers/first_action_provider.dart
@@ -9,7 +9,7 @@ import '../../models/lookup.dart';
 
 class FirstActionStatusProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/service_request_providers/last_situation_provider.dart b/lib/providers/service_request_providers/last_situation_provider.dart
index f61a9d4f..56794e0f 100644
--- a/lib/providers/service_request_providers/last_situation_provider.dart
+++ b/lib/providers/service_request_providers/last_situation_provider.dart
@@ -9,7 +9,7 @@ import '../../models/lookup.dart';
 
 class LastSituationProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/service_request_providers/loan_availability_provider.dart b/lib/providers/service_request_providers/loan_availability_provider.dart
index 8118f46e..8d6d7f5d 100644
--- a/lib/providers/service_request_providers/loan_availability_provider.dart
+++ b/lib/providers/service_request_providers/loan_availability_provider.dart
@@ -9,7 +9,7 @@ import '../../models/lookup.dart';
 
 class LoanAvailabilityProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
 
     loading = true;
diff --git a/lib/providers/service_request_providers/priority_provider.dart b/lib/providers/service_request_providers/priority_provider.dart
index 4850d1e9..87af53a2 100644
--- a/lib/providers/service_request_providers/priority_provider.dart
+++ b/lib/providers/service_request_providers/priority_provider.dart
@@ -9,7 +9,7 @@ import '../../models/lookup.dart';
 
 class PriorityProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/service_request_providers/reject_reason_provider.dart b/lib/providers/service_request_providers/reject_reason_provider.dart
index e7311c58..f8c6d880 100644
--- a/lib/providers/service_request_providers/reject_reason_provider.dart
+++ b/lib/providers/service_request_providers/reject_reason_provider.dart
@@ -10,7 +10,7 @@ import '../../models/lookup.dart';
 class RejectReasonProvider extends LoadingListNotifier<Lookup> {
 
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/service_request_providers/requested_through_provider.dart b/lib/providers/service_request_providers/requested_through_provider.dart
index 72e481ff..de0ef414 100644
--- a/lib/providers/service_request_providers/requested_through_provider.dart
+++ b/lib/providers/service_request_providers/requested_through_provider.dart
@@ -9,7 +9,7 @@ import '../../models/lookup.dart';
 
 class RequestedThroughProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/service_request_providers/type_of_request_provider.dart b/lib/providers/service_request_providers/type_of_request_provider.dart
index ef9f306f..ba651ff9 100644
--- a/lib/providers/service_request_providers/type_of_request_provider.dart
+++ b/lib/providers/service_request_providers/type_of_request_provider.dart
@@ -9,7 +9,7 @@ import '../../models/lookup.dart';
 
 class TypeOfRequestProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
 
     loading = true;
diff --git a/lib/providers/task_request_provider/task_job_provider.dart b/lib/providers/task_request_provider/task_job_provider.dart
index b66e10cf..8b9b74fc 100644
--- a/lib/providers/task_request_provider/task_job_provider.dart
+++ b/lib/providers/task_request_provider/task_job_provider.dart
@@ -11,7 +11,7 @@ import '../../controllers/api_routes/urls.dart';
 
 class TaskTypeProvider extends LoadingListNotifier<TaskType> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     print('get data called...');
     if (loading == true) return -2;
     loading = true;
@@ -39,7 +39,7 @@ class TaskTypeProvider extends LoadingListNotifier<TaskType> {
 }
 class TaskEvaluatorUserProvider extends LoadingListNotifier<TaskEvaluatorUser> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
@@ -65,7 +65,7 @@ class TaskEvaluatorUserProvider extends LoadingListNotifier<TaskEvaluatorUser> {
 
 class TaskJobTypeOfAlertProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
@@ -90,7 +90,7 @@ class TaskJobTypeOfAlertProvider extends LoadingListNotifier<Lookup> {
 }
 class TaskJobRiskLevelProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
@@ -115,7 +115,7 @@ class TaskJobRiskLevelProvider extends LoadingListNotifier<Lookup> {
 }
 class TaskJobResourceProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
@@ -140,7 +140,7 @@ class TaskJobResourceProvider extends LoadingListNotifier<Lookup> {
 }
 class TaskJobActionNeededProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
@@ -165,7 +165,7 @@ class TaskJobActionNeededProvider extends LoadingListNotifier<Lookup> {
 }
 class TaskJobImpactStatusProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/work_order/activity_status_provider.dart b/lib/providers/work_order/activity_status_provider.dart
index 21e0afa9..afa606e4 100644
--- a/lib/providers/work_order/activity_status_provider.dart
+++ b/lib/providers/work_order/activity_status_provider.dart
@@ -10,7 +10,7 @@ import '../../models/lookup.dart';
 class ActivityStatusProvider extends LoadingListNotifier<Lookup> {
 
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/work_order/need_visit_reminder_time_provider.dart b/lib/providers/work_order/need_visit_reminder_time_provider.dart
index 2f82d41f..1247ee18 100644
--- a/lib/providers/work_order/need_visit_reminder_time_provider.dart
+++ b/lib/providers/work_order/need_visit_reminder_time_provider.dart
@@ -9,7 +9,7 @@ import '../../models/lookup.dart';
 
 class NeedVisitReminderTimeProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
      if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/work_order/reason_provider.dart b/lib/providers/work_order/reason_provider.dart
index d077fef2..a5ea7e6e 100644
--- a/lib/providers/work_order/reason_provider.dart
+++ b/lib/providers/work_order/reason_provider.dart
@@ -11,7 +11,7 @@ class ReasonProvider extends LoadingListNotifier<Lookup> {
   String? serviceRequestId;
 
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/work_order/retirement_type_provider.dart b/lib/providers/work_order/retirement_type_provider.dart
index 436e9cc7..038f13a7 100644
--- a/lib/providers/work_order/retirement_type_provider.dart
+++ b/lib/providers/work_order/retirement_type_provider.dart
@@ -12,7 +12,7 @@ class RetirementTypeProvider extends LoadingListNotifier<Lookup> {
   String? serviceRequestId;
 
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     print('get data called...');
     loading = true;
diff --git a/lib/providers/work_order/service_type_provider.dart b/lib/providers/work_order/service_type_provider.dart
index 0313f09e..1df3616c 100644
--- a/lib/providers/work_order/service_type_provider.dart
+++ b/lib/providers/work_order/service_type_provider.dart
@@ -9,7 +9,7 @@ import '../../models/lookup.dart';
 
 class ServiceTypeProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/work_order/supplier_engineer_provider.dart b/lib/providers/work_order/supplier_engineer_provider.dart
index e1bbf62e..490b990e 100644
--- a/lib/providers/work_order/supplier_engineer_provider.dart
+++ b/lib/providers/work_order/supplier_engineer_provider.dart
@@ -8,7 +8,7 @@ import 'package:test_sa/providers/loading_list_notifier.dart';
 
 class SupplierEngineerProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/work_order/vendor_provider.dart b/lib/providers/work_order/vendor_provider.dart
index 071189bf..52a2a77c 100644
--- a/lib/providers/work_order/vendor_provider.dart
+++ b/lib/providers/work_order/vendor_provider.dart
@@ -8,7 +8,7 @@ import 'package:test_sa/providers/loading_list_notifier.dart';
 
 class VendorProvider extends LoadingListNotifier<SupplierDetails> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/providers/work_order/wo_frame_provider.dart b/lib/providers/work_order/wo_frame_provider.dart
index 0c92841a..cacebf4c 100644
--- a/lib/providers/work_order/wo_frame_provider.dart
+++ b/lib/providers/work_order/wo_frame_provider.dart
@@ -9,7 +9,7 @@ import '../../models/lookup.dart';
 
 class WoFrameProvider extends LoadingListNotifier<Lookup> {
   @override
-  Future getData() async {
+  Future getData({int? id}) async {
     if (loading == true) return -2;
     loading = true;
     notifyListeners();
diff --git a/lib/views/widgets/fullscreen_dialogs/multiple_selection_fullscreen_dialog.dart b/lib/views/widgets/fullscreen_dialogs/multiple_selection_fullscreen_dialog.dart
index 806b9de3..a4d4628b 100644
--- a/lib/views/widgets/fullscreen_dialogs/multiple_selection_fullscreen_dialog.dart
+++ b/lib/views/widgets/fullscreen_dialogs/multiple_selection_fullscreen_dialog.dart
@@ -50,9 +50,6 @@ class _SelectionBottomSheetState<T extends Base> extends State<MultipleSelection
 
   @override
   Widget build(BuildContext context) {
-    for (var abc in filteredList ?? []) {
-      print(abc.toJson());
-    }
     return Scaffold(
       appBar: AppBar(
         title: widget.title.heading5(context),