feat: Equipment DTO 호환성 수정 전 백업 커밋

- Equipment DTO 필드명 변경 (name → equipment_number 등) 완료 - Phase 1-7 파생 수정사항 체계적 진행 예정 - 통합 모델 정리, Controller 동기화, UI 업데이트 예정 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
2025-08-21 19:17:43 +09:00
parent ca830063f0
commit c141c0b914
18 changed files with 2132 additions and 3202 deletions
--- a/lib/data/models/equipment/equipment_dto.dart
+++ b/lib/data/models/equipment/equipment_dto.dart
@@ -7,24 +7,22 @@ part 'equipment_dto.g.dart';
 class EquipmentDto with _$EquipmentDto {
  const factory EquipmentDto({
    required int id,
-    @JsonKey(name: 'serial_number') required String serialNumber,
-    required String name,
-    String? category,
-    String? manufacturer,
-    String? model,
+    @JsonKey(name: 'equipment_number') required String equipmentNumber,
+    @JsonKey(name: 'serial_number') String? serialNumber,
+    String? category1,
+    String? category2,
+    String? category3,
+    required String manufacturer,
+    @JsonKey(name: 'model_name') String? modelName,
+    String? barcode,
    required String status,
-    @JsonKey(name: 'company_id') required int companyId,
-    @JsonKey(name: 'company_name') String? companyName,
+    @JsonKey(name: 'company_id') int? companyId,
    @JsonKey(name: 'warehouse_location_id') int? warehouseLocationId,
-    @JsonKey(name: 'warehouse_name') String? warehouseName,
    @JsonKey(name: 'purchase_date') String? purchaseDate,
    @JsonKey(name: 'purchase_price') double? purchasePrice,
-    @JsonKey(name: 'current_value') double? currentValue,
-    @JsonKey(name: 'warranty_expiry') String? warrantyExpiry,
-    @JsonKey(name: 'last_maintenance_date') String? lastMaintenanceDate,
-    @JsonKey(name: 'next_maintenance_date') String? nextMaintenanceDate,
-    Map<String, dynamic>? specifications,
-    String? notes,
+    @JsonKey(name: 'last_inspection_date') String? lastInspectionDate,
+    @JsonKey(name: 'next_inspection_date') String? nextInspectionDate,
+    String? remark,
    @JsonKey(name: 'created_at') DateTime? createdAt,
    @JsonKey(name: 'updated_at') DateTime? updatedAt,
  }) = _EquipmentDto;
--- a/lib/data/models/equipment/equipment_dto.freezed.dart
+++ b/lib/data/models/equipment/equipment_dto.freezed.dart
@@ -21,36 +21,31 @@ EquipmentDto _$EquipmentDtoFromJson(Map<String, dynamic> json) {
 /// @nodoc
 mixin _$EquipmentDto {
  int get id => throw _privateConstructorUsedError;
+  @JsonKey(name: 'equipment_number')
+  String get equipmentNumber => throw _privateConstructorUsedError;
  @JsonKey(name: 'serial_number')
-  String get serialNumber => throw _privateConstructorUsedError;
-  String get name => throw _privateConstructorUsedError;
-  String? get category => throw _privateConstructorUsedError;
-  String? get manufacturer => throw _privateConstructorUsedError;
-  String? get model => throw _privateConstructorUsedError;
+  String? get serialNumber => throw _privateConstructorUsedError;
+  String? get category1 => throw _privateConstructorUsedError;
+  String? get category2 => throw _privateConstructorUsedError;
+  String? get category3 => throw _privateConstructorUsedError;
+  String get manufacturer => throw _privateConstructorUsedError;
+  @JsonKey(name: 'model_name')
+  String? get modelName => throw _privateConstructorUsedError;
+  String? get barcode => throw _privateConstructorUsedError;
  String get status => throw _privateConstructorUsedError;
  @JsonKey(name: 'company_id')
-  int get companyId => throw _privateConstructorUsedError;
-  @JsonKey(name: 'company_name')
-  String? get companyName => throw _privateConstructorUsedError;
+  int? get companyId => throw _privateConstructorUsedError;
  @JsonKey(name: 'warehouse_location_id')
  int? get warehouseLocationId => throw _privateConstructorUsedError;
-  @JsonKey(name: 'warehouse_name')
-  String? get warehouseName => throw _privateConstructorUsedError;
  @JsonKey(name: 'purchase_date')
  String? get purchaseDate => throw _privateConstructorUsedError;
  @JsonKey(name: 'purchase_price')
  double? get purchasePrice => throw _privateConstructorUsedError;
-  @JsonKey(name: 'current_value')
-  double? get currentValue => throw _privateConstructorUsedError;
-  @JsonKey(name: 'warranty_expiry')
-  String? get warrantyExpiry => throw _privateConstructorUsedError;
-  @JsonKey(name: 'last_maintenance_date')
-  String? get lastMaintenanceDate => throw _privateConstructorUsedError;
-  @JsonKey(name: 'next_maintenance_date')
-  String? get nextMaintenanceDate => throw _privateConstructorUsedError;
-  Map<String, dynamic>? get specifications =>
-      throw _privateConstructorUsedError;
-  String? get notes => throw _privateConstructorUsedError;
+  @JsonKey(name: 'last_inspection_date')
+  String? get lastInspectionDate => throw _privateConstructorUsedError;
+  @JsonKey(name: 'next_inspection_date')
+  String? get nextInspectionDate => throw _privateConstructorUsedError;
+  String? get remark => throw _privateConstructorUsedError;
  @JsonKey(name: 'created_at')
  DateTime? get createdAt => throw _privateConstructorUsedError;
  @JsonKey(name: 'updated_at')
@@ -74,24 +69,22 @@ abstract class $EquipmentDtoCopyWith<$Res> {
  @useResult
  $Res call(
      {int id,
-      @JsonKey(name: 'serial_number') String serialNumber,
-      String name,
-      String? category,
-      String? manufacturer,
-      String? model,
+      @JsonKey(name: 'equipment_number') String equipmentNumber,
+      @JsonKey(name: 'serial_number') String? serialNumber,
+      String? category1,
+      String? category2,
+      String? category3,
+      String manufacturer,
+      @JsonKey(name: 'model_name') String? modelName,
+      String? barcode,
      String status,
-      @JsonKey(name: 'company_id') int companyId,
-      @JsonKey(name: 'company_name') String? companyName,
+      @JsonKey(name: 'company_id') int? companyId,
      @JsonKey(name: 'warehouse_location_id') int? warehouseLocationId,
-      @JsonKey(name: 'warehouse_name') String? warehouseName,
      @JsonKey(name: 'purchase_date') String? purchaseDate,
      @JsonKey(name: 'purchase_price') double? purchasePrice,
-      @JsonKey(name: 'current_value') double? currentValue,
-      @JsonKey(name: 'warranty_expiry') String? warrantyExpiry,
-      @JsonKey(name: 'last_maintenance_date') String? lastMaintenanceDate,
-      @JsonKey(name: 'next_maintenance_date') String? nextMaintenanceDate,
-      Map<String, dynamic>? specifications,
-      String? notes,
+      @JsonKey(name: 'last_inspection_date') String? lastInspectionDate,
+      @JsonKey(name: 'next_inspection_date') String? nextInspectionDate,
+      String? remark,
      @JsonKey(name: 'created_at') DateTime? createdAt,
      @JsonKey(name: 'updated_at') DateTime? updatedAt});
 }
@@ -112,24 +105,22 @@ class _$EquipmentDtoCopyWithImpl<$Res, $Val extends EquipmentDto>
  @override
  $Res call({
    Object? id = null,
-    Object? serialNumber = null,
-    Object? name = null,
-    Object? category = freezed,
-    Object? manufacturer = freezed,
-    Object? model = freezed,
+    Object? equipmentNumber = null,
+    Object? serialNumber = freezed,
+    Object? category1 = freezed,
+    Object? category2 = freezed,
+    Object? category3 = freezed,
+    Object? manufacturer = null,
+    Object? modelName = freezed,
+    Object? barcode = freezed,
    Object? status = null,
-    Object? companyId = null,
-    Object? companyName = freezed,
+    Object? companyId = freezed,
    Object? warehouseLocationId = freezed,
-    Object? warehouseName = freezed,
    Object? purchaseDate = freezed,
    Object? purchasePrice = freezed,
-    Object? currentValue = freezed,
-    Object? warrantyExpiry = freezed,
-    Object? lastMaintenanceDate = freezed,
-    Object? nextMaintenanceDate = freezed,
-    Object? specifications = freezed,
-    Object? notes = freezed,
+    Object? lastInspectionDate = freezed,
+    Object? nextInspectionDate = freezed,
+    Object? remark = freezed,
    Object? createdAt = freezed,
    Object? updatedAt = freezed,
  }) {
@@ -138,46 +129,50 @@ class _$EquipmentDtoCopyWithImpl<$Res, $Val extends EquipmentDto>
          ? _value.id
          : id // ignore: cast_nullable_to_non_nullable
              as int,
-      serialNumber: null == serialNumber
+      equipmentNumber: null == equipmentNumber
+          ? _value.equipmentNumber
+          : equipmentNumber // ignore: cast_nullable_to_non_nullable
+              as String,
+      serialNumber: freezed == serialNumber
          ? _value.serialNumber
          : serialNumber // ignore: cast_nullable_to_non_nullable
-              as String,
-      name: null == name
-          ? _value.name
-          : name // ignore: cast_nullable_to_non_nullable
-              as String,
-      category: freezed == category
-          ? _value.category
-          : category // ignore: cast_nullable_to_non_nullable
              as String?,
-      manufacturer: freezed == manufacturer
+      category1: freezed == category1
+          ? _value.category1
+          : category1 // ignore: cast_nullable_to_non_nullable
+              as String?,
+      category2: freezed == category2
+          ? _value.category2
+          : category2 // ignore: cast_nullable_to_non_nullable
+              as String?,
+      category3: freezed == category3
+          ? _value.category3
+          : category3 // ignore: cast_nullable_to_non_nullable
+              as String?,
+      manufacturer: null == manufacturer
          ? _value.manufacturer
          : manufacturer // ignore: cast_nullable_to_non_nullable
+              as String,
+      modelName: freezed == modelName
+          ? _value.modelName
+          : modelName // ignore: cast_nullable_to_non_nullable
              as String?,
-      model: freezed == model
-          ? _value.model
-          : model // ignore: cast_nullable_to_non_nullable
+      barcode: freezed == barcode
+          ? _value.barcode
+          : barcode // ignore: cast_nullable_to_non_nullable
              as String?,
      status: null == status
          ? _value.status
          : status // ignore: cast_nullable_to_non_nullable
              as String,
-      companyId: null == companyId
+      companyId: freezed == companyId
          ? _value.companyId
          : companyId // ignore: cast_nullable_to_non_nullable
-              as int,
-      companyName: freezed == companyName
-          ? _value.companyName
-          : companyName // ignore: cast_nullable_to_non_nullable
-              as String?,
+              as int?,
      warehouseLocationId: freezed == warehouseLocationId
          ? _value.warehouseLocationId
          : warehouseLocationId // ignore: cast_nullable_to_non_nullable
              as int?,
-      warehouseName: freezed == warehouseName
-          ? _value.warehouseName
-          : warehouseName // ignore: cast_nullable_to_non_nullable
-              as String?,
      purchaseDate: freezed == purchaseDate
          ? _value.purchaseDate
          : purchaseDate // ignore: cast_nullable_to_non_nullable
@@ -186,29 +181,17 @@ class _$EquipmentDtoCopyWithImpl<$Res, $Val extends EquipmentDto>
          ? _value.purchasePrice
          : purchasePrice // ignore: cast_nullable_to_non_nullable
              as double?,
-      currentValue: freezed == currentValue
-          ? _value.currentValue
-          : currentValue // ignore: cast_nullable_to_non_nullable
-              as double?,
-      warrantyExpiry: freezed == warrantyExpiry
-          ? _value.warrantyExpiry
-          : warrantyExpiry // ignore: cast_nullable_to_non_nullable
+      lastInspectionDate: freezed == lastInspectionDate
+          ? _value.lastInspectionDate
+          : lastInspectionDate // ignore: cast_nullable_to_non_nullable
              as String?,
-      lastMaintenanceDate: freezed == lastMaintenanceDate
-          ? _value.lastMaintenanceDate
-          : lastMaintenanceDate // ignore: cast_nullable_to_non_nullable
+      nextInspectionDate: freezed == nextInspectionDate
+          ? _value.nextInspectionDate
+          : nextInspectionDate // ignore: cast_nullable_to_non_nullable
              as String?,
-      nextMaintenanceDate: freezed == nextMaintenanceDate
-          ? _value.nextMaintenanceDate
-          : nextMaintenanceDate // ignore: cast_nullable_to_non_nullable
-              as String?,
-      specifications: freezed == specifications
-          ? _value.specifications
-          : specifications // ignore: cast_nullable_to_non_nullable
-              as Map<String, dynamic>?,
-      notes: freezed == notes
-          ? _value.notes
-          : notes // ignore: cast_nullable_to_non_nullable
+      remark: freezed == remark
+          ? _value.remark
+          : remark // ignore: cast_nullable_to_non_nullable
              as String?,
      createdAt: freezed == createdAt
          ? _value.createdAt
@@ -232,24 +215,22 @@ abstract class _$$EquipmentDtoImplCopyWith<$Res>
  @useResult
  $Res call(
      {int id,
-      @JsonKey(name: 'serial_number') String serialNumber,
-      String name,
-      String? category,
-      String? manufacturer,
-      String? model,
+      @JsonKey(name: 'equipment_number') String equipmentNumber,
+      @JsonKey(name: 'serial_number') String? serialNumber,
+      String? category1,
+      String? category2,
+      String? category3,
+      String manufacturer,
+      @JsonKey(name: 'model_name') String? modelName,
+      String? barcode,
      String status,
-      @JsonKey(name: 'company_id') int companyId,
-      @JsonKey(name: 'company_name') String? companyName,
+      @JsonKey(name: 'company_id') int? companyId,
      @JsonKey(name: 'warehouse_location_id') int? warehouseLocationId,
-      @JsonKey(name: 'warehouse_name') String? warehouseName,
      @JsonKey(name: 'purchase_date') String? purchaseDate,
      @JsonKey(name: 'purchase_price') double? purchasePrice,
-      @JsonKey(name: 'current_value') double? currentValue,
-      @JsonKey(name: 'warranty_expiry') String? warrantyExpiry,
-      @JsonKey(name: 'last_maintenance_date') String? lastMaintenanceDate,
-      @JsonKey(name: 'next_maintenance_date') String? nextMaintenanceDate,
-      Map<String, dynamic>? specifications,
-      String? notes,
+      @JsonKey(name: 'last_inspection_date') String? lastInspectionDate,
+      @JsonKey(name: 'next_inspection_date') String? nextInspectionDate,
+      String? remark,
      @JsonKey(name: 'created_at') DateTime? createdAt,
      @JsonKey(name: 'updated_at') DateTime? updatedAt});
 }
@@ -268,24 +249,22 @@ class __$$EquipmentDtoImplCopyWithImpl<$Res>
  @override
  $Res call({
    Object? id = null,
-    Object? serialNumber = null,
-    Object? name = null,
-    Object? category = freezed,
-    Object? manufacturer = freezed,
-    Object? model = freezed,
+    Object? equipmentNumber = null,
+    Object? serialNumber = freezed,
+    Object? category1 = freezed,
+    Object? category2 = freezed,
+    Object? category3 = freezed,
+    Object? manufacturer = null,
+    Object? modelName = freezed,
+    Object? barcode = freezed,
    Object? status = null,
-    Object? companyId = null,
-    Object? companyName = freezed,
+    Object? companyId = freezed,
    Object? warehouseLocationId = freezed,
-    Object? warehouseName = freezed,
    Object? purchaseDate = freezed,
    Object? purchasePrice = freezed,
-    Object? currentValue = freezed,
-    Object? warrantyExpiry = freezed,
-    Object? lastMaintenanceDate = freezed,
-    Object? nextMaintenanceDate = freezed,
-    Object? specifications = freezed,
-    Object? notes = freezed,
+    Object? lastInspectionDate = freezed,
+    Object? nextInspectionDate = freezed,
+    Object? remark = freezed,
    Object? createdAt = freezed,
    Object? updatedAt = freezed,
  }) {
@@ -294,46 +273,50 @@ class __$$EquipmentDtoImplCopyWithImpl<$Res>
          ? _value.id
          : id // ignore: cast_nullable_to_non_nullable
              as int,
-      serialNumber: null == serialNumber
+      equipmentNumber: null == equipmentNumber
+          ? _value.equipmentNumber
+          : equipmentNumber // ignore: cast_nullable_to_non_nullable
+              as String,
+      serialNumber: freezed == serialNumber
          ? _value.serialNumber
          : serialNumber // ignore: cast_nullable_to_non_nullable
-              as String,
-      name: null == name
-          ? _value.name
-          : name // ignore: cast_nullable_to_non_nullable
-              as String,
-      category: freezed == category
-          ? _value.category
-          : category // ignore: cast_nullable_to_non_nullable
              as String?,
-      manufacturer: freezed == manufacturer
+      category1: freezed == category1
+          ? _value.category1
+          : category1 // ignore: cast_nullable_to_non_nullable
+              as String?,
+      category2: freezed == category2
+          ? _value.category2
+          : category2 // ignore: cast_nullable_to_non_nullable
+              as String?,
+      category3: freezed == category3
+          ? _value.category3
+          : category3 // ignore: cast_nullable_to_non_nullable
+              as String?,
+      manufacturer: null == manufacturer
          ? _value.manufacturer
          : manufacturer // ignore: cast_nullable_to_non_nullable
+              as String,
+      modelName: freezed == modelName
+          ? _value.modelName
+          : modelName // ignore: cast_nullable_to_non_nullable
              as String?,
-      model: freezed == model
-          ? _value.model
-          : model // ignore: cast_nullable_to_non_nullable
+      barcode: freezed == barcode
+          ? _value.barcode
+          : barcode // ignore: cast_nullable_to_non_nullable
              as String?,
      status: null == status
          ? _value.status
          : status // ignore: cast_nullable_to_non_nullable
              as String,
-      companyId: null == companyId
+      companyId: freezed == companyId
          ? _value.companyId
          : companyId // ignore: cast_nullable_to_non_nullable
-              as int,
-      companyName: freezed == companyName
-          ? _value.companyName
-          : companyName // ignore: cast_nullable_to_non_nullable
-              as String?,
+              as int?,
      warehouseLocationId: freezed == warehouseLocationId
          ? _value.warehouseLocationId
          : warehouseLocationId // ignore: cast_nullable_to_non_nullable
              as int?,
-      warehouseName: freezed == warehouseName
-          ? _value.warehouseName
-          : warehouseName // ignore: cast_nullable_to_non_nullable
-              as String?,
      purchaseDate: freezed == purchaseDate
          ? _value.purchaseDate
          : purchaseDate // ignore: cast_nullable_to_non_nullable
@@ -342,29 +325,17 @@ class __$$EquipmentDtoImplCopyWithImpl<$Res>
          ? _value.purchasePrice
          : purchasePrice // ignore: cast_nullable_to_non_nullable
              as double?,
-      currentValue: freezed == currentValue
-          ? _value.currentValue
-          : currentValue // ignore: cast_nullable_to_non_nullable
-              as double?,
-      warrantyExpiry: freezed == warrantyExpiry
-          ? _value.warrantyExpiry
-          : warrantyExpiry // ignore: cast_nullable_to_non_nullable
+      lastInspectionDate: freezed == lastInspectionDate
+          ? _value.lastInspectionDate
+          : lastInspectionDate // ignore: cast_nullable_to_non_nullable
              as String?,
-      lastMaintenanceDate: freezed == lastMaintenanceDate
-          ? _value.lastMaintenanceDate
-          : lastMaintenanceDate // ignore: cast_nullable_to_non_nullable
+      nextInspectionDate: freezed == nextInspectionDate
+          ? _value.nextInspectionDate
+          : nextInspectionDate // ignore: cast_nullable_to_non_nullable
              as String?,
-      nextMaintenanceDate: freezed == nextMaintenanceDate
-          ? _value.nextMaintenanceDate
-          : nextMaintenanceDate // ignore: cast_nullable_to_non_nullable
-              as String?,
-      specifications: freezed == specifications
-          ? _value._specifications
-          : specifications // ignore: cast_nullable_to_non_nullable
-              as Map<String, dynamic>?,
-      notes: freezed == notes
-          ? _value.notes
-          : notes // ignore: cast_nullable_to_non_nullable
+      remark: freezed == remark
+          ? _value.remark
+          : remark // ignore: cast_nullable_to_non_nullable
              as String?,
      createdAt: freezed == createdAt
          ? _value.createdAt
@@ -383,27 +354,24 @@ class __$$EquipmentDtoImplCopyWithImpl<$Res>
 class _$EquipmentDtoImpl implements _EquipmentDto {
  const _$EquipmentDtoImpl(
      {required this.id,
-      @JsonKey(name: 'serial_number') required this.serialNumber,
-      required this.name,
-      this.category,
-      this.manufacturer,
-      this.model,
+      @JsonKey(name: 'equipment_number') required this.equipmentNumber,
+      @JsonKey(name: 'serial_number') this.serialNumber,
+      this.category1,
+      this.category2,
+      this.category3,
+      required this.manufacturer,
+      @JsonKey(name: 'model_name') this.modelName,
+      this.barcode,
      required this.status,
-      @JsonKey(name: 'company_id') required this.companyId,
-      @JsonKey(name: 'company_name') this.companyName,
+      @JsonKey(name: 'company_id') this.companyId,
      @JsonKey(name: 'warehouse_location_id') this.warehouseLocationId,
-      @JsonKey(name: 'warehouse_name') this.warehouseName,
      @JsonKey(name: 'purchase_date') this.purchaseDate,
      @JsonKey(name: 'purchase_price') this.purchasePrice,
-      @JsonKey(name: 'current_value') this.currentValue,
-      @JsonKey(name: 'warranty_expiry') this.warrantyExpiry,
-      @JsonKey(name: 'last_maintenance_date') this.lastMaintenanceDate,
-      @JsonKey(name: 'next_maintenance_date') this.nextMaintenanceDate,
-      final Map<String, dynamic>? specifications,
-      this.notes,
+      @JsonKey(name: 'last_inspection_date') this.lastInspectionDate,
+      @JsonKey(name: 'next_inspection_date') this.nextInspectionDate,
+      this.remark,
      @JsonKey(name: 'created_at') this.createdAt,
-      @JsonKey(name: 'updated_at') this.updatedAt})
-      : _specifications = specifications;
+      @JsonKey(name: 'updated_at') this.updatedAt});

  factory _$EquipmentDtoImpl.fromJson(Map<String, dynamic> json) =>
      _$$EquipmentDtoImplFromJson(json);
@@ -411,60 +379,46 @@ class _$EquipmentDtoImpl implements _EquipmentDto {
  @override
  final int id;
  @override
+  @JsonKey(name: 'equipment_number')
+  final String equipmentNumber;
+  @override
  @JsonKey(name: 'serial_number')
-  final String serialNumber;
+  final String? serialNumber;
  @override
-  final String name;
+  final String? category1;
  @override
-  final String? category;
+  final String? category2;
  @override
-  final String? manufacturer;
+  final String? category3;
  @override
-  final String? model;
+  final String manufacturer;
+  @override
+  @JsonKey(name: 'model_name')
+  final String? modelName;
+  @override
+  final String? barcode;
  @override
  final String status;
  @override
  @JsonKey(name: 'company_id')
-  final int companyId;
-  @override
-  @JsonKey(name: 'company_name')
-  final String? companyName;
+  final int? companyId;
  @override
  @JsonKey(name: 'warehouse_location_id')
  final int? warehouseLocationId;
  @override
-  @JsonKey(name: 'warehouse_name')
-  final String? warehouseName;
-  @override
  @JsonKey(name: 'purchase_date')
  final String? purchaseDate;
  @override
  @JsonKey(name: 'purchase_price')
  final double? purchasePrice;
  @override
-  @JsonKey(name: 'current_value')
-  final double? currentValue;
+  @JsonKey(name: 'last_inspection_date')
+  final String? lastInspectionDate;
  @override
-  @JsonKey(name: 'warranty_expiry')
-  final String? warrantyExpiry;
+  @JsonKey(name: 'next_inspection_date')
+  final String? nextInspectionDate;
  @override
-  @JsonKey(name: 'last_maintenance_date')
-  final String? lastMaintenanceDate;
-  @override
-  @JsonKey(name: 'next_maintenance_date')
-  final String? nextMaintenanceDate;
-  final Map<String, dynamic>? _specifications;
-  @override
-  Map<String, dynamic>? get specifications {
-    final value = _specifications;
-    if (value == null) return null;
-    if (_specifications is EqualUnmodifiableMapView) return _specifications;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableMapView(value);
-  }
-
-  @override
-  final String? notes;
+  final String? remark;
  @override
  @JsonKey(name: 'created_at')
  final DateTime? createdAt;
@@ -474,7 +428,7 @@ class _$EquipmentDtoImpl implements _EquipmentDto {

  @override
  String toString() {
-    return 'EquipmentDto(id: $id, serialNumber: $serialNumber, name: $name, category: $category, manufacturer: $manufacturer, model: $model, status: $status, companyId: $companyId, companyName: $companyName, warehouseLocationId: $warehouseLocationId, warehouseName: $warehouseName, purchaseDate: $purchaseDate, purchasePrice: $purchasePrice, currentValue: $currentValue, warrantyExpiry: $warrantyExpiry, lastMaintenanceDate: $lastMaintenanceDate, nextMaintenanceDate: $nextMaintenanceDate, specifications: $specifications, notes: $notes, createdAt: $createdAt, updatedAt: $updatedAt)';
+    return 'EquipmentDto(id: $id, equipmentNumber: $equipmentNumber, serialNumber: $serialNumber, category1: $category1, category2: $category2, category3: $category3, manufacturer: $manufacturer, modelName: $modelName, barcode: $barcode, status: $status, companyId: $companyId, warehouseLocationId: $warehouseLocationId, purchaseDate: $purchaseDate, purchasePrice: $purchasePrice, lastInspectionDate: $lastInspectionDate, nextInspectionDate: $nextInspectionDate, remark: $remark, createdAt: $createdAt, updatedAt: $updatedAt)';
  }

  @override
@@ -483,38 +437,35 @@ class _$EquipmentDtoImpl implements _EquipmentDto {
        (other.runtimeType == runtimeType &&
            other is _$EquipmentDtoImpl &&
            (identical(other.id, id) || other.id == id) &&
+            (identical(other.equipmentNumber, equipmentNumber) ||
+                other.equipmentNumber == equipmentNumber) &&
            (identical(other.serialNumber, serialNumber) ||
                other.serialNumber == serialNumber) &&
-            (identical(other.name, name) || other.name == name) &&
-            (identical(other.category, category) ||
-                other.category == category) &&
+            (identical(other.category1, category1) ||
+                other.category1 == category1) &&
+            (identical(other.category2, category2) ||
+                other.category2 == category2) &&
+            (identical(other.category3, category3) ||
+                other.category3 == category3) &&
            (identical(other.manufacturer, manufacturer) ||
                other.manufacturer == manufacturer) &&
-            (identical(other.model, model) || other.model == model) &&
+            (identical(other.modelName, modelName) ||
+                other.modelName == modelName) &&
+            (identical(other.barcode, barcode) || other.barcode == barcode) &&
            (identical(other.status, status) || other.status == status) &&
            (identical(other.companyId, companyId) ||
                other.companyId == companyId) &&
-            (identical(other.companyName, companyName) ||
-                other.companyName == companyName) &&
            (identical(other.warehouseLocationId, warehouseLocationId) ||
                other.warehouseLocationId == warehouseLocationId) &&
-            (identical(other.warehouseName, warehouseName) ||
-                other.warehouseName == warehouseName) &&
            (identical(other.purchaseDate, purchaseDate) ||
                other.purchaseDate == purchaseDate) &&
            (identical(other.purchasePrice, purchasePrice) ||
                other.purchasePrice == purchasePrice) &&
-            (identical(other.currentValue, currentValue) ||
-                other.currentValue == currentValue) &&
-            (identical(other.warrantyExpiry, warrantyExpiry) ||
-                other.warrantyExpiry == warrantyExpiry) &&
-            (identical(other.lastMaintenanceDate, lastMaintenanceDate) ||
-                other.lastMaintenanceDate == lastMaintenanceDate) &&
-            (identical(other.nextMaintenanceDate, nextMaintenanceDate) ||
-                other.nextMaintenanceDate == nextMaintenanceDate) &&
-            const DeepCollectionEquality()
-                .equals(other._specifications, _specifications) &&
-            (identical(other.notes, notes) || other.notes == notes) &&
+            (identical(other.lastInspectionDate, lastInspectionDate) ||
+                other.lastInspectionDate == lastInspectionDate) &&
+            (identical(other.nextInspectionDate, nextInspectionDate) ||
+                other.nextInspectionDate == nextInspectionDate) &&
+            (identical(other.remark, remark) || other.remark == remark) &&
            (identical(other.createdAt, createdAt) ||
                other.createdAt == createdAt) &&
            (identical(other.updatedAt, updatedAt) ||
@@ -526,24 +477,22 @@ class _$EquipmentDtoImpl implements _EquipmentDto {
  int get hashCode => Object.hashAll([
        runtimeType,
        id,
+        equipmentNumber,
        serialNumber,
-        name,
-        category,
+        category1,
+        category2,
+        category3,
        manufacturer,
-        model,
+        modelName,
+        barcode,
        status,
        companyId,
-        companyName,
        warehouseLocationId,
-        warehouseName,
        purchaseDate,
        purchasePrice,
-        currentValue,
-        warrantyExpiry,
-        lastMaintenanceDate,
-        nextMaintenanceDate,
-        const DeepCollectionEquality().hash(_specifications),
-        notes,
+        lastInspectionDate,
+        nextInspectionDate,
+        remark,
        createdAt,
        updatedAt
      ]);
@@ -567,24 +516,22 @@ class _$EquipmentDtoImpl implements _EquipmentDto {
 abstract class _EquipmentDto implements EquipmentDto {
  const factory _EquipmentDto(
      {required final int id,
-      @JsonKey(name: 'serial_number') required final String serialNumber,
-      required final String name,
-      final String? category,
-      final String? manufacturer,
-      final String? model,
+      @JsonKey(name: 'equipment_number') required final String equipmentNumber,
+      @JsonKey(name: 'serial_number') final String? serialNumber,
+      final String? category1,
+      final String? category2,
+      final String? category3,
+      required final String manufacturer,
+      @JsonKey(name: 'model_name') final String? modelName,
+      final String? barcode,
      required final String status,
-      @JsonKey(name: 'company_id') required final int companyId,
-      @JsonKey(name: 'company_name') final String? companyName,
+      @JsonKey(name: 'company_id') final int? companyId,
      @JsonKey(name: 'warehouse_location_id') final int? warehouseLocationId,
-      @JsonKey(name: 'warehouse_name') final String? warehouseName,
      @JsonKey(name: 'purchase_date') final String? purchaseDate,
      @JsonKey(name: 'purchase_price') final double? purchasePrice,
-      @JsonKey(name: 'current_value') final double? currentValue,
-      @JsonKey(name: 'warranty_expiry') final String? warrantyExpiry,
-      @JsonKey(name: 'last_maintenance_date') final String? lastMaintenanceDate,
-      @JsonKey(name: 'next_maintenance_date') final String? nextMaintenanceDate,
-      final Map<String, dynamic>? specifications,
-      final String? notes,
+      @JsonKey(name: 'last_inspection_date') final String? lastInspectionDate,
+      @JsonKey(name: 'next_inspection_date') final String? nextInspectionDate,
+      final String? remark,
      @JsonKey(name: 'created_at') final DateTime? createdAt,
      @JsonKey(name: 'updated_at')
      final DateTime? updatedAt}) = _$EquipmentDtoImpl;
@@ -595,52 +542,46 @@ abstract class _EquipmentDto implements EquipmentDto {
  @override
  int get id;
  @override
+  @JsonKey(name: 'equipment_number')
+  String get equipmentNumber;
+  @override
  @JsonKey(name: 'serial_number')
-  String get serialNumber;
+  String? get serialNumber;
  @override
-  String get name;
+  String? get category1;
  @override
-  String? get category;
+  String? get category2;
  @override
-  String? get manufacturer;
+  String? get category3;
  @override
-  String? get model;
+  String get manufacturer;
+  @override
+  @JsonKey(name: 'model_name')
+  String? get modelName;
+  @override
+  String? get barcode;
  @override
  String get status;
  @override
  @JsonKey(name: 'company_id')
-  int get companyId;
-  @override
-  @JsonKey(name: 'company_name')
-  String? get companyName;
+  int? get companyId;
  @override
  @JsonKey(name: 'warehouse_location_id')
  int? get warehouseLocationId;
  @override
-  @JsonKey(name: 'warehouse_name')
-  String? get warehouseName;
-  @override
  @JsonKey(name: 'purchase_date')
  String? get purchaseDate;
  @override
  @JsonKey(name: 'purchase_price')
  double? get purchasePrice;
  @override
-  @JsonKey(name: 'current_value')
-  double? get currentValue;
+  @JsonKey(name: 'last_inspection_date')
+  String? get lastInspectionDate;
  @override
-  @JsonKey(name: 'warranty_expiry')
-  String? get warrantyExpiry;
+  @JsonKey(name: 'next_inspection_date')
+  String? get nextInspectionDate;
  @override
-  @JsonKey(name: 'last_maintenance_date')
-  String? get lastMaintenanceDate;
-  @override
-  @JsonKey(name: 'next_maintenance_date')
-  String? get nextMaintenanceDate;
-  @override
-  Map<String, dynamic>? get specifications;
-  @override
-  String? get notes;
+  String? get remark;
  @override
  @JsonKey(name: 'created_at')
  DateTime? get createdAt;
--- a/lib/data/models/equipment/equipment_dto.g.dart
+++ b/lib/data/models/equipment/equipment_dto.g.dart
@@ -9,24 +9,22 @@ part of 'equipment_dto.dart';
 _$EquipmentDtoImpl _$$EquipmentDtoImplFromJson(Map<String, dynamic> json) =>
    _$EquipmentDtoImpl(
      id: (json['id'] as num).toInt(),
-      serialNumber: json['serial_number'] as String,
-      name: json['name'] as String,
-      category: json['category'] as String?,
-      manufacturer: json['manufacturer'] as String?,
-      model: json['model'] as String?,
+      equipmentNumber: json['equipment_number'] as String,
+      serialNumber: json['serial_number'] as String?,
+      category1: json['category1'] as String?,
+      category2: json['category2'] as String?,
+      category3: json['category3'] as String?,
+      manufacturer: json['manufacturer'] as String,
+      modelName: json['model_name'] as String?,
+      barcode: json['barcode'] as String?,
      status: json['status'] as String,
-      companyId: (json['company_id'] as num).toInt(),
-      companyName: json['company_name'] as String?,
+      companyId: (json['company_id'] as num?)?.toInt(),
      warehouseLocationId: (json['warehouse_location_id'] as num?)?.toInt(),
-      warehouseName: json['warehouse_name'] as String?,
      purchaseDate: json['purchase_date'] as String?,
      purchasePrice: (json['purchase_price'] as num?)?.toDouble(),
-      currentValue: (json['current_value'] as num?)?.toDouble(),
-      warrantyExpiry: json['warranty_expiry'] as String?,
-      lastMaintenanceDate: json['last_maintenance_date'] as String?,
-      nextMaintenanceDate: json['next_maintenance_date'] as String?,
-      specifications: json['specifications'] as Map<String, dynamic>?,
-      notes: json['notes'] as String?,
+      lastInspectionDate: json['last_inspection_date'] as String?,
+      nextInspectionDate: json['next_inspection_date'] as String?,
+      remark: json['remark'] as String?,
      createdAt: json['created_at'] == null
          ? null
          : DateTime.parse(json['created_at'] as String),
@@ -38,24 +36,22 @@ _$EquipmentDtoImpl _$$EquipmentDtoImplFromJson(Map<String, dynamic> json) =>
 Map<String, dynamic> _$$EquipmentDtoImplToJson(_$EquipmentDtoImpl instance) =>
    <String, dynamic>{
      'id': instance.id,
+      'equipment_number': instance.equipmentNumber,
      'serial_number': instance.serialNumber,
-      'name': instance.name,
-      'category': instance.category,
+      'category1': instance.category1,
+      'category2': instance.category2,
+      'category3': instance.category3,
      'manufacturer': instance.manufacturer,
-      'model': instance.model,
+      'model_name': instance.modelName,
+      'barcode': instance.barcode,
      'status': instance.status,
      'company_id': instance.companyId,
-      'company_name': instance.companyName,
      'warehouse_location_id': instance.warehouseLocationId,
-      'warehouse_name': instance.warehouseName,
      'purchase_date': instance.purchaseDate,
      'purchase_price': instance.purchasePrice,
-      'current_value': instance.currentValue,
-      'warranty_expiry': instance.warrantyExpiry,
-      'last_maintenance_date': instance.lastMaintenanceDate,
-      'next_maintenance_date': instance.nextMaintenanceDate,
-      'specifications': instance.specifications,
-      'notes': instance.notes,
+      'last_inspection_date': instance.lastInspectionDate,
+      'next_inspection_date': instance.nextInspectionDate,
+      'remark': instance.remark,
      'created_at': instance.createdAt?.toIso8601String(),
      'updated_at': instance.updatedAt?.toIso8601String(),
    };
--- a/lib/data/models/lookups/lookup_data.dart
+++ b/lib/data/models/lookups/lookup_data.dart
@@ -9,8 +9,10 @@ class LookupData with _$LookupData {
  const factory LookupData({
    @JsonKey(name: 'manufacturers', defaultValue: []) required List<LookupItem> manufacturers,
    @JsonKey(name: 'equipment_names', defaultValue: []) required List<EquipmentNameItem> equipmentNames,
-    @JsonKey(name: 'equipment_categories', defaultValue: []) required List<CategoryItem> equipmentCategories,
+    @JsonKey(name: 'equipment_categories', defaultValue: []) required List<CategoryCombinationItem> equipmentCategories,
    @JsonKey(name: 'equipment_statuses', defaultValue: []) required List<StatusItem> equipmentStatuses,
+    @JsonKey(name: 'companies', defaultValue: []) required List<LookupItem> companies,
+    @JsonKey(name: 'warehouses', defaultValue: []) required List<LookupItem> warehouses,
  }) = _LookupData;

  factory LookupData.fromJson(Map<String, dynamic> json) =>
@@ -21,7 +23,7 @@ class LookupData with _$LookupData {
@freezed
 class LookupItem with _$LookupItem {
  const factory LookupItem({
-    required int id,
+    int? id,
    required String name,
  }) = _LookupItem;

@@ -33,7 +35,7 @@ class LookupItem with _$LookupItem {
@freezed
 class EquipmentNameItem with _$EquipmentNameItem {
  const factory EquipmentNameItem({
-    required int id,
+    int? id,
    required String name,
    @JsonKey(name: 'model_number') String? modelNumber,
  }) = _EquipmentNameItem;
@@ -42,7 +44,20 @@ class EquipmentNameItem with _$EquipmentNameItem {
      _$EquipmentNameItemFromJson(json);
 }

-/// 카테고리 Lookup 아이템
+/// 카테고리 조합 Lookup 아이템 (백엔드 API 실제 구조)
+@freezed
+class CategoryCombinationItem with _$CategoryCombinationItem {
+  const factory CategoryCombinationItem({
+    required String category1,
+    required String category2,
+    required String category3,
+  }) = _CategoryCombinationItem;
+
+  factory CategoryCombinationItem.fromJson(Map<String, dynamic> json) =>
+      _$CategoryCombinationItemFromJson(json);
+}
+
+/// 개별 카테고리 아이템 (UI용)
@freezed
 class CategoryItem with _$CategoryItem {
  const factory CategoryItem({
--- a/lib/data/models/lookups/lookup_data.freezed.dart
+++ b/lib/data/models/lookups/lookup_data.freezed.dart
@@ -26,10 +26,14 @@ mixin _$LookupData {
  List<EquipmentNameItem> get equipmentNames =>
      throw _privateConstructorUsedError;
  @JsonKey(name: 'equipment_categories', defaultValue: [])
-  List<CategoryItem> get equipmentCategories =>
+  List<CategoryCombinationItem> get equipmentCategories =>
      throw _privateConstructorUsedError;
  @JsonKey(name: 'equipment_statuses', defaultValue: [])
  List<StatusItem> get equipmentStatuses => throw _privateConstructorUsedError;
+  @JsonKey(name: 'companies', defaultValue: [])
+  List<LookupItem> get companies => throw _privateConstructorUsedError;
+  @JsonKey(name: 'warehouses', defaultValue: [])
+  List<LookupItem> get warehouses => throw _privateConstructorUsedError;

  /// Serializes this LookupData to a JSON map.
  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@@ -53,9 +57,12 @@ abstract class $LookupDataCopyWith<$Res> {
      @JsonKey(name: 'equipment_names', defaultValue: [])
      List<EquipmentNameItem> equipmentNames,
      @JsonKey(name: 'equipment_categories', defaultValue: [])
-      List<CategoryItem> equipmentCategories,
+      List<CategoryCombinationItem> equipmentCategories,
      @JsonKey(name: 'equipment_statuses', defaultValue: [])
-      List<StatusItem> equipmentStatuses});
+      List<StatusItem> equipmentStatuses,
+      @JsonKey(name: 'companies', defaultValue: []) List<LookupItem> companies,
+      @JsonKey(name: 'warehouses', defaultValue: [])
+      List<LookupItem> warehouses});
 }

 /// @nodoc
@@ -77,6 +84,8 @@ class _$LookupDataCopyWithImpl<$Res, $Val extends LookupData>
    Object? equipmentNames = null,
    Object? equipmentCategories = null,
    Object? equipmentStatuses = null,
+    Object? companies = null,
+    Object? warehouses = null,
  }) {
    return _then(_value.copyWith(
      manufacturers: null == manufacturers
@@ -90,11 +99,19 @@ class _$LookupDataCopyWithImpl<$Res, $Val extends LookupData>
      equipmentCategories: null == equipmentCategories
          ? _value.equipmentCategories
          : equipmentCategories // ignore: cast_nullable_to_non_nullable
-              as List<CategoryItem>,
+              as List<CategoryCombinationItem>,
      equipmentStatuses: null == equipmentStatuses
          ? _value.equipmentStatuses
          : equipmentStatuses // ignore: cast_nullable_to_non_nullable
              as List<StatusItem>,
+      companies: null == companies
+          ? _value.companies
+          : companies // ignore: cast_nullable_to_non_nullable
+              as List<LookupItem>,
+      warehouses: null == warehouses
+          ? _value.warehouses
+          : warehouses // ignore: cast_nullable_to_non_nullable
+              as List<LookupItem>,
    ) as $Val);
  }
 }
@@ -113,9 +130,12 @@ abstract class _$$LookupDataImplCopyWith<$Res>
      @JsonKey(name: 'equipment_names', defaultValue: [])
      List<EquipmentNameItem> equipmentNames,
      @JsonKey(name: 'equipment_categories', defaultValue: [])
-      List<CategoryItem> equipmentCategories,
+      List<CategoryCombinationItem> equipmentCategories,
      @JsonKey(name: 'equipment_statuses', defaultValue: [])
-      List<StatusItem> equipmentStatuses});
+      List<StatusItem> equipmentStatuses,
+      @JsonKey(name: 'companies', defaultValue: []) List<LookupItem> companies,
+      @JsonKey(name: 'warehouses', defaultValue: [])
+      List<LookupItem> warehouses});
 }

 /// @nodoc
@@ -135,6 +155,8 @@ class __$$LookupDataImplCopyWithImpl<$Res>
    Object? equipmentNames = null,
    Object? equipmentCategories = null,
    Object? equipmentStatuses = null,
+    Object? companies = null,
+    Object? warehouses = null,
  }) {
    return _then(_$LookupDataImpl(
      manufacturers: null == manufacturers
@@ -148,11 +170,19 @@ class __$$LookupDataImplCopyWithImpl<$Res>
      equipmentCategories: null == equipmentCategories
          ? _value._equipmentCategories
          : equipmentCategories // ignore: cast_nullable_to_non_nullable
-              as List<CategoryItem>,
+              as List<CategoryCombinationItem>,
      equipmentStatuses: null == equipmentStatuses
          ? _value._equipmentStatuses
          : equipmentStatuses // ignore: cast_nullable_to_non_nullable
              as List<StatusItem>,
+      companies: null == companies
+          ? _value._companies
+          : companies // ignore: cast_nullable_to_non_nullable
+              as List<LookupItem>,
+      warehouses: null == warehouses
+          ? _value._warehouses
+          : warehouses // ignore: cast_nullable_to_non_nullable
+              as List<LookupItem>,
    ));
  }
 }
@@ -166,13 +196,19 @@ class _$LookupDataImpl implements _LookupData {
      @JsonKey(name: 'equipment_names', defaultValue: [])
      required final List<EquipmentNameItem> equipmentNames,
      @JsonKey(name: 'equipment_categories', defaultValue: [])
-      required final List<CategoryItem> equipmentCategories,
+      required final List<CategoryCombinationItem> equipmentCategories,
      @JsonKey(name: 'equipment_statuses', defaultValue: [])
-      required final List<StatusItem> equipmentStatuses})
+      required final List<StatusItem> equipmentStatuses,
+      @JsonKey(name: 'companies', defaultValue: [])
+      required final List<LookupItem> companies,
+      @JsonKey(name: 'warehouses', defaultValue: [])
+      required final List<LookupItem> warehouses})
      : _manufacturers = manufacturers,
        _equipmentNames = equipmentNames,
        _equipmentCategories = equipmentCategories,
-        _equipmentStatuses = equipmentStatuses;
+        _equipmentStatuses = equipmentStatuses,
+        _companies = companies,
+        _warehouses = warehouses;

  factory _$LookupDataImpl.fromJson(Map<String, dynamic> json) =>
      _$$LookupDataImplFromJson(json);
@@ -195,10 +231,10 @@ class _$LookupDataImpl implements _LookupData {
    return EqualUnmodifiableListView(_equipmentNames);
  }

-  final List<CategoryItem> _equipmentCategories;
+  final List<CategoryCombinationItem> _equipmentCategories;
  @override
  @JsonKey(name: 'equipment_categories', defaultValue: [])
-  List<CategoryItem> get equipmentCategories {
+  List<CategoryCombinationItem> get equipmentCategories {
    if (_equipmentCategories is EqualUnmodifiableListView)
      return _equipmentCategories;
    // ignore: implicit_dynamic_type
@@ -215,9 +251,27 @@ class _$LookupDataImpl implements _LookupData {
    return EqualUnmodifiableListView(_equipmentStatuses);
  }

+  final List<LookupItem> _companies;
+  @override
+  @JsonKey(name: 'companies', defaultValue: [])
+  List<LookupItem> get companies {
+    if (_companies is EqualUnmodifiableListView) return _companies;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_companies);
+  }
+
+  final List<LookupItem> _warehouses;
+  @override
+  @JsonKey(name: 'warehouses', defaultValue: [])
+  List<LookupItem> get warehouses {
+    if (_warehouses is EqualUnmodifiableListView) return _warehouses;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_warehouses);
+  }
+
  @override
  String toString() {
-    return 'LookupData(manufacturers: $manufacturers, equipmentNames: $equipmentNames, equipmentCategories: $equipmentCategories, equipmentStatuses: $equipmentStatuses)';
+    return 'LookupData(manufacturers: $manufacturers, equipmentNames: $equipmentNames, equipmentCategories: $equipmentCategories, equipmentStatuses: $equipmentStatuses, companies: $companies, warehouses: $warehouses)';
  }

  @override
@@ -232,7 +286,11 @@ class _$LookupDataImpl implements _LookupData {
            const DeepCollectionEquality()
                .equals(other._equipmentCategories, _equipmentCategories) &&
            const DeepCollectionEquality()
-                .equals(other._equipmentStatuses, _equipmentStatuses));
+                .equals(other._equipmentStatuses, _equipmentStatuses) &&
+            const DeepCollectionEquality()
+                .equals(other._companies, _companies) &&
+            const DeepCollectionEquality()
+                .equals(other._warehouses, _warehouses));
  }

  @JsonKey(includeFromJson: false, includeToJson: false)
@@ -242,7 +300,9 @@ class _$LookupDataImpl implements _LookupData {
      const DeepCollectionEquality().hash(_manufacturers),
      const DeepCollectionEquality().hash(_equipmentNames),
      const DeepCollectionEquality().hash(_equipmentCategories),
-      const DeepCollectionEquality().hash(_equipmentStatuses));
+      const DeepCollectionEquality().hash(_equipmentStatuses),
+      const DeepCollectionEquality().hash(_companies),
+      const DeepCollectionEquality().hash(_warehouses));

  /// Create a copy of LookupData
  /// with the given fields replaced by the non-null parameter values.
@@ -267,9 +327,13 @@ abstract class _LookupData implements LookupData {
      @JsonKey(name: 'equipment_names', defaultValue: [])
      required final List<EquipmentNameItem> equipmentNames,
      @JsonKey(name: 'equipment_categories', defaultValue: [])
-      required final List<CategoryItem> equipmentCategories,
+      required final List<CategoryCombinationItem> equipmentCategories,
      @JsonKey(name: 'equipment_statuses', defaultValue: [])
-      required final List<StatusItem> equipmentStatuses}) = _$LookupDataImpl;
+      required final List<StatusItem> equipmentStatuses,
+      @JsonKey(name: 'companies', defaultValue: [])
+      required final List<LookupItem> companies,
+      @JsonKey(name: 'warehouses', defaultValue: [])
+      required final List<LookupItem> warehouses}) = _$LookupDataImpl;

  factory _LookupData.fromJson(Map<String, dynamic> json) =
      _$LookupDataImpl.fromJson;
@@ -282,10 +346,16 @@ abstract class _LookupData implements LookupData {
  List<EquipmentNameItem> get equipmentNames;
  @override
  @JsonKey(name: 'equipment_categories', defaultValue: [])
-  List<CategoryItem> get equipmentCategories;
+  List<CategoryCombinationItem> get equipmentCategories;
  @override
  @JsonKey(name: 'equipment_statuses', defaultValue: [])
  List<StatusItem> get equipmentStatuses;
+  @override
+  @JsonKey(name: 'companies', defaultValue: [])
+  List<LookupItem> get companies;
+  @override
+  @JsonKey(name: 'warehouses', defaultValue: [])
+  List<LookupItem> get warehouses;

  /// Create a copy of LookupData
  /// with the given fields replaced by the non-null parameter values.
@@ -301,7 +371,7 @@ LookupItem _$LookupItemFromJson(Map<String, dynamic> json) {

 /// @nodoc
 mixin _$LookupItem {
-  int get id => throw _privateConstructorUsedError;
+  int? get id => throw _privateConstructorUsedError;
  String get name => throw _privateConstructorUsedError;

  /// Serializes this LookupItem to a JSON map.
@@ -320,7 +390,7 @@ abstract class $LookupItemCopyWith<$Res> {
          LookupItem value, $Res Function(LookupItem) then) =
      _$LookupItemCopyWithImpl<$Res, LookupItem>;
  @useResult
-  $Res call({int id, String name});
+  $Res call({int? id, String name});
 }

 /// @nodoc
@@ -338,14 +408,14 @@ class _$LookupItemCopyWithImpl<$Res, $Val extends LookupItem>
  @pragma('vm:prefer-inline')
  @override
  $Res call({
-    Object? id = null,
+    Object? id = freezed,
    Object? name = null,
  }) {
    return _then(_value.copyWith(
-      id: null == id
+      id: freezed == id
          ? _value.id
          : id // ignore: cast_nullable_to_non_nullable
-              as int,
+              as int?,
      name: null == name
          ? _value.name
          : name // ignore: cast_nullable_to_non_nullable
@@ -362,7 +432,7 @@ abstract class _$$LookupItemImplCopyWith<$Res>
      __$$LookupItemImplCopyWithImpl<$Res>;
  @override
  @useResult
-  $Res call({int id, String name});
+  $Res call({int? id, String name});
 }

 /// @nodoc
@@ -378,14 +448,14 @@ class __$$LookupItemImplCopyWithImpl<$Res>
  @pragma('vm:prefer-inline')
  @override
  $Res call({
-    Object? id = null,
+    Object? id = freezed,
    Object? name = null,
  }) {
    return _then(_$LookupItemImpl(
-      id: null == id
+      id: freezed == id
          ? _value.id
          : id // ignore: cast_nullable_to_non_nullable
-              as int,
+              as int?,
      name: null == name
          ? _value.name
          : name // ignore: cast_nullable_to_non_nullable
@@ -397,13 +467,13 @@ class __$$LookupItemImplCopyWithImpl<$Res>
 /// @nodoc
@JsonSerializable()
 class _$LookupItemImpl implements _LookupItem {
-  const _$LookupItemImpl({required this.id, required this.name});
+  const _$LookupItemImpl({this.id, required this.name});

  factory _$LookupItemImpl.fromJson(Map<String, dynamic> json) =>
      _$$LookupItemImplFromJson(json);

  @override
-  final int id;
+  final int? id;
  @override
  final String name;

@@ -442,14 +512,14 @@ class _$LookupItemImpl implements _LookupItem {
 }

 abstract class _LookupItem implements LookupItem {
-  const factory _LookupItem(
-      {required final int id, required final String name}) = _$LookupItemImpl;
+  const factory _LookupItem({final int? id, required final String name}) =
+      _$LookupItemImpl;

  factory _LookupItem.fromJson(Map<String, dynamic> json) =
      _$LookupItemImpl.fromJson;

  @override
-  int get id;
+  int? get id;
  @override
  String get name;

@@ -467,7 +537,7 @@ EquipmentNameItem _$EquipmentNameItemFromJson(Map<String, dynamic> json) {

 /// @nodoc
 mixin _$EquipmentNameItem {
-  int get id => throw _privateConstructorUsedError;
+  int? get id => throw _privateConstructorUsedError;
  String get name => throw _privateConstructorUsedError;
  @JsonKey(name: 'model_number')
  String? get modelNumber => throw _privateConstructorUsedError;
@@ -489,7 +559,7 @@ abstract class $EquipmentNameItemCopyWith<$Res> {
      _$EquipmentNameItemCopyWithImpl<$Res, EquipmentNameItem>;
  @useResult
  $Res call(
-      {int id,
+      {int? id,
      String name,
      @JsonKey(name: 'model_number') String? modelNumber});
 }
@@ -509,15 +579,15 @@ class _$EquipmentNameItemCopyWithImpl<$Res, $Val extends EquipmentNameItem>
  @pragma('vm:prefer-inline')
  @override
  $Res call({
-    Object? id = null,
+    Object? id = freezed,
    Object? name = null,
    Object? modelNumber = freezed,
  }) {
    return _then(_value.copyWith(
-      id: null == id
+      id: freezed == id
          ? _value.id
          : id // ignore: cast_nullable_to_non_nullable
-              as int,
+              as int?,
      name: null == name
          ? _value.name
          : name // ignore: cast_nullable_to_non_nullable
@@ -539,7 +609,7 @@ abstract class _$$EquipmentNameItemImplCopyWith<$Res>
  @override
  @useResult
  $Res call(
-      {int id,
+      {int? id,
      String name,
      @JsonKey(name: 'model_number') String? modelNumber});
 }
@@ -557,15 +627,15 @@ class __$$EquipmentNameItemImplCopyWithImpl<$Res>
  @pragma('vm:prefer-inline')
  @override
  $Res call({
-    Object? id = null,
+    Object? id = freezed,
    Object? name = null,
    Object? modelNumber = freezed,
  }) {
    return _then(_$EquipmentNameItemImpl(
-      id: null == id
+      id: freezed == id
          ? _value.id
          : id // ignore: cast_nullable_to_non_nullable
-              as int,
+              as int?,
      name: null == name
          ? _value.name
          : name // ignore: cast_nullable_to_non_nullable
@@ -582,7 +652,7 @@ class __$$EquipmentNameItemImplCopyWithImpl<$Res>
@JsonSerializable()
 class _$EquipmentNameItemImpl implements _EquipmentNameItem {
  const _$EquipmentNameItemImpl(
-      {required this.id,
+      {this.id,
      required this.name,
      @JsonKey(name: 'model_number') this.modelNumber});

@@ -590,7 +660,7 @@ class _$EquipmentNameItemImpl implements _EquipmentNameItem {
      _$$EquipmentNameItemImplFromJson(json);

  @override
-  final int id;
+  final int? id;
  @override
  final String name;
  @override
@@ -636,7 +706,7 @@ class _$EquipmentNameItemImpl implements _EquipmentNameItem {

 abstract class _EquipmentNameItem implements EquipmentNameItem {
  const factory _EquipmentNameItem(
-          {required final int id,
+          {final int? id,
          required final String name,
          @JsonKey(name: 'model_number') final String? modelNumber}) =
      _$EquipmentNameItemImpl;
@@ -645,7 +715,7 @@ abstract class _EquipmentNameItem implements EquipmentNameItem {
      _$EquipmentNameItemImpl.fromJson;

  @override
-  int get id;
+  int? get id;
  @override
  String get name;
  @override
@@ -660,6 +730,202 @@ abstract class _EquipmentNameItem implements EquipmentNameItem {
      throw _privateConstructorUsedError;
 }

+CategoryCombinationItem _$CategoryCombinationItemFromJson(
+    Map<String, dynamic> json) {
+  return _CategoryCombinationItem.fromJson(json);
+}
+
+/// @nodoc
+mixin _$CategoryCombinationItem {
+  String get category1 => throw _privateConstructorUsedError;
+  String get category2 => throw _privateConstructorUsedError;
+  String get category3 => throw _privateConstructorUsedError;
+
+  /// Serializes this CategoryCombinationItem to a JSON map.
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+
+  /// Create a copy of CategoryCombinationItem
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $CategoryCombinationItemCopyWith<CategoryCombinationItem> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $CategoryCombinationItemCopyWith<$Res> {
+  factory $CategoryCombinationItemCopyWith(CategoryCombinationItem value,
+          $Res Function(CategoryCombinationItem) then) =
+      _$CategoryCombinationItemCopyWithImpl<$Res, CategoryCombinationItem>;
+  @useResult
+  $Res call({String category1, String category2, String category3});
+}
+
+/// @nodoc
+class _$CategoryCombinationItemCopyWithImpl<$Res,
+        $Val extends CategoryCombinationItem>
+    implements $CategoryCombinationItemCopyWith<$Res> {
+  _$CategoryCombinationItemCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of CategoryCombinationItem
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? category1 = null,
+    Object? category2 = null,
+    Object? category3 = null,
+  }) {
+    return _then(_value.copyWith(
+      category1: null == category1
+          ? _value.category1
+          : category1 // ignore: cast_nullable_to_non_nullable
+              as String,
+      category2: null == category2
+          ? _value.category2
+          : category2 // ignore: cast_nullable_to_non_nullable
+              as String,
+      category3: null == category3
+          ? _value.category3
+          : category3 // ignore: cast_nullable_to_non_nullable
+              as String,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$CategoryCombinationItemImplCopyWith<$Res>
+    implements $CategoryCombinationItemCopyWith<$Res> {
+  factory _$$CategoryCombinationItemImplCopyWith(
+          _$CategoryCombinationItemImpl value,
+          $Res Function(_$CategoryCombinationItemImpl) then) =
+      __$$CategoryCombinationItemImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({String category1, String category2, String category3});
+}
+
+/// @nodoc
+class __$$CategoryCombinationItemImplCopyWithImpl<$Res>
+    extends _$CategoryCombinationItemCopyWithImpl<$Res,
+        _$CategoryCombinationItemImpl>
+    implements _$$CategoryCombinationItemImplCopyWith<$Res> {
+  __$$CategoryCombinationItemImplCopyWithImpl(
+      _$CategoryCombinationItemImpl _value,
+      $Res Function(_$CategoryCombinationItemImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of CategoryCombinationItem
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? category1 = null,
+    Object? category2 = null,
+    Object? category3 = null,
+  }) {
+    return _then(_$CategoryCombinationItemImpl(
+      category1: null == category1
+          ? _value.category1
+          : category1 // ignore: cast_nullable_to_non_nullable
+              as String,
+      category2: null == category2
+          ? _value.category2
+          : category2 // ignore: cast_nullable_to_non_nullable
+              as String,
+      category3: null == category3
+          ? _value.category3
+          : category3 // ignore: cast_nullable_to_non_nullable
+              as String,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$CategoryCombinationItemImpl implements _CategoryCombinationItem {
+  const _$CategoryCombinationItemImpl(
+      {required this.category1,
+      required this.category2,
+      required this.category3});
+
+  factory _$CategoryCombinationItemImpl.fromJson(Map<String, dynamic> json) =>
+      _$$CategoryCombinationItemImplFromJson(json);
+
+  @override
+  final String category1;
+  @override
+  final String category2;
+  @override
+  final String category3;
+
+  @override
+  String toString() {
+    return 'CategoryCombinationItem(category1: $category1, category2: $category2, category3: $category3)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$CategoryCombinationItemImpl &&
+            (identical(other.category1, category1) ||
+                other.category1 == category1) &&
+            (identical(other.category2, category2) ||
+                other.category2 == category2) &&
+            (identical(other.category3, category3) ||
+                other.category3 == category3));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(runtimeType, category1, category2, category3);
+
+  /// Create a copy of CategoryCombinationItem
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$CategoryCombinationItemImplCopyWith<_$CategoryCombinationItemImpl>
+      get copyWith => __$$CategoryCombinationItemImplCopyWithImpl<
+          _$CategoryCombinationItemImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$CategoryCombinationItemImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _CategoryCombinationItem implements CategoryCombinationItem {
+  const factory _CategoryCombinationItem(
+      {required final String category1,
+      required final String category2,
+      required final String category3}) = _$CategoryCombinationItemImpl;
+
+  factory _CategoryCombinationItem.fromJson(Map<String, dynamic> json) =
+      _$CategoryCombinationItemImpl.fromJson;
+
+  @override
+  String get category1;
+  @override
+  String get category2;
+  @override
+  String get category3;
+
+  /// Create a copy of CategoryCombinationItem
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$CategoryCombinationItemImplCopyWith<_$CategoryCombinationItemImpl>
+      get copyWith => throw _privateConstructorUsedError;
+}
+
 CategoryItem _$CategoryItemFromJson(Map<String, dynamic> json) {
  return _CategoryItem.fromJson(json);
 }
--- a/lib/data/models/lookups/lookup_data.g.dart
+++ b/lib/data/models/lookups/lookup_data.g.dart
@@ -18,13 +18,22 @@ _$LookupDataImpl _$$LookupDataImplFromJson(Map<String, dynamic> json) =>
              .toList() ??
          [],
      equipmentCategories: (json['equipment_categories'] as List<dynamic>?)
-              ?.map((e) => CategoryItem.fromJson(e as Map<String, dynamic>))
+              ?.map((e) =>
+                  CategoryCombinationItem.fromJson(e as Map<String, dynamic>))
              .toList() ??
          [],
      equipmentStatuses: (json['equipment_statuses'] as List<dynamic>?)
              ?.map((e) => StatusItem.fromJson(e as Map<String, dynamic>))
              .toList() ??
          [],
+      companies: (json['companies'] as List<dynamic>?)
+              ?.map((e) => LookupItem.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          [],
+      warehouses: (json['warehouses'] as List<dynamic>?)
+              ?.map((e) => LookupItem.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          [],
    );

 Map<String, dynamic> _$$LookupDataImplToJson(_$LookupDataImpl instance) =>
@@ -33,11 +42,13 @@ Map<String, dynamic> _$$LookupDataImplToJson(_$LookupDataImpl instance) =>
      'equipment_names': instance.equipmentNames,
      'equipment_categories': instance.equipmentCategories,
      'equipment_statuses': instance.equipmentStatuses,
+      'companies': instance.companies,
+      'warehouses': instance.warehouses,
    };

 _$LookupItemImpl _$$LookupItemImplFromJson(Map<String, dynamic> json) =>
    _$LookupItemImpl(
-      id: (json['id'] as num).toInt(),
+      id: (json['id'] as num?)?.toInt(),
      name: json['name'] as String,
    );

@@ -50,7 +61,7 @@ Map<String, dynamic> _$$LookupItemImplToJson(_$LookupItemImpl instance) =>
 _$EquipmentNameItemImpl _$$EquipmentNameItemImplFromJson(
        Map<String, dynamic> json) =>
    _$EquipmentNameItemImpl(
-      id: (json['id'] as num).toInt(),
+      id: (json['id'] as num?)?.toInt(),
      name: json['name'] as String,
      modelNumber: json['model_number'] as String?,
    );
@@ -63,6 +74,22 @@ Map<String, dynamic> _$$EquipmentNameItemImplToJson(
      'model_number': instance.modelNumber,
    };

+_$CategoryCombinationItemImpl _$$CategoryCombinationItemImplFromJson(
+        Map<String, dynamic> json) =>
+    _$CategoryCombinationItemImpl(
+      category1: json['category1'] as String,
+      category2: json['category2'] as String,
+      category3: json['category3'] as String,
+    );
+
+Map<String, dynamic> _$$CategoryCombinationItemImplToJson(
+        _$CategoryCombinationItemImpl instance) =>
+    <String, dynamic>{
+      'category1': instance.category1,
+      'category2': instance.category2,
+      'category3': instance.category3,
+    };
+
 _$CategoryItemImpl _$$CategoryItemImplFromJson(Map<String, dynamic> json) =>
    _$CategoryItemImpl(
      id: json['id'] as String,