feat: 소프트 딜리트 기능 전면 구현 완료

## 주요 변경사항 - Company, Equipment, License, Warehouse Location 모든 화면에 소프트 딜리트 구현 - 관리자 권한으로 삭제된 데이터 조회 가능 (includeInactive 파라미터) - 데이터 무결성 보장을 위한 논리 삭제 시스템 완성 ## 기능 개선 - 각 리스트 컨트롤러에 toggleIncludeInactive() 메서드 추가 - UI에 "비활성 포함" 체크박스 추가 (관리자 전용) - API 데이터소스에 includeInactive 파라미터 지원 ## 문서 정리 - 불필요한 문서 파일 제거 및 재구성 - CLAUDE.md 프로젝트 상태 업데이트 (진행률 80%) - 테스트 결과 문서화 (test20250812v01.md) ## UI 컴포넌트 - Equipment 화면 위젯 모듈화 (custom_dropdown_field, equipment_basic_info_section) - 폼 유효성 검증 강화 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
2025-08-12 20:02:54 +09:00
parent 1645182b38
commit e7860ae028
48 changed files with 2096 additions and 1242 deletions
--- a/lib/data/models/company/company_dto.dart
+++ b/lib/data/models/company/company_dto.dart
@@ -13,6 +13,8 @@ class CreateCompanyRequest with _$CreateCompanyRequest {
    @JsonKey(name: 'contact_phone') required String contactPhone,
    @JsonKey(name: 'contact_email') required String contactEmail,
    @JsonKey(name: 'company_types') @Default([]) List<String> companyTypes,
+    @JsonKey(name: 'is_partner') @Default(false) bool isPartner,
+    @JsonKey(name: 'is_customer') @Default(true) bool isCustomer,
    String? remark,
  }) = _CreateCompanyRequest;

--- a/lib/data/models/company/company_dto.freezed.dart
+++ b/lib/data/models/company/company_dto.freezed.dart
@@ -32,6 +32,10 @@ mixin _$CreateCompanyRequest {
  String get contactEmail => throw _privateConstructorUsedError;
  @JsonKey(name: 'company_types')
  List<String> get companyTypes => throw _privateConstructorUsedError;
+  @JsonKey(name: 'is_partner')
+  bool get isPartner => throw _privateConstructorUsedError;
+  @JsonKey(name: 'is_customer')
+  bool get isCustomer => throw _privateConstructorUsedError;
  String? get remark => throw _privateConstructorUsedError;

  /// Serializes this CreateCompanyRequest to a JSON map.
@@ -58,6 +62,8 @@ abstract class $CreateCompanyRequestCopyWith<$Res> {
      @JsonKey(name: 'contact_phone') String contactPhone,
      @JsonKey(name: 'contact_email') String contactEmail,
      @JsonKey(name: 'company_types') List<String> companyTypes,
+      @JsonKey(name: 'is_partner') bool isPartner,
+      @JsonKey(name: 'is_customer') bool isCustomer,
      String? remark});
 }

@@ -84,6 +90,8 @@ class _$CreateCompanyRequestCopyWithImpl<$Res,
    Object? contactPhone = null,
    Object? contactEmail = null,
    Object? companyTypes = null,
+    Object? isPartner = null,
+    Object? isCustomer = null,
    Object? remark = freezed,
  }) {
    return _then(_value.copyWith(
@@ -115,6 +123,14 @@ class _$CreateCompanyRequestCopyWithImpl<$Res,
          ? _value.companyTypes
          : companyTypes // ignore: cast_nullable_to_non_nullable
              as List<String>,
+      isPartner: null == isPartner
+          ? _value.isPartner
+          : isPartner // ignore: cast_nullable_to_non_nullable
+              as bool,
+      isCustomer: null == isCustomer
+          ? _value.isCustomer
+          : isCustomer // ignore: cast_nullable_to_non_nullable
+              as bool,
      remark: freezed == remark
          ? _value.remark
          : remark // ignore: cast_nullable_to_non_nullable
@@ -139,6 +155,8 @@ abstract class _$$CreateCompanyRequestImplCopyWith<$Res>
      @JsonKey(name: 'contact_phone') String contactPhone,
      @JsonKey(name: 'contact_email') String contactEmail,
      @JsonKey(name: 'company_types') List<String> companyTypes,
+      @JsonKey(name: 'is_partner') bool isPartner,
+      @JsonKey(name: 'is_customer') bool isCustomer,
      String? remark});
 }

@@ -162,6 +180,8 @@ class __$$CreateCompanyRequestImplCopyWithImpl<$Res>
    Object? contactPhone = null,
    Object? contactEmail = null,
    Object? companyTypes = null,
+    Object? isPartner = null,
+    Object? isCustomer = null,
    Object? remark = freezed,
  }) {
    return _then(_$CreateCompanyRequestImpl(
@@ -193,6 +213,14 @@ class __$$CreateCompanyRequestImplCopyWithImpl<$Res>
          ? _value._companyTypes
          : companyTypes // ignore: cast_nullable_to_non_nullable
              as List<String>,
+      isPartner: null == isPartner
+          ? _value.isPartner
+          : isPartner // ignore: cast_nullable_to_non_nullable
+              as bool,
+      isCustomer: null == isCustomer
+          ? _value.isCustomer
+          : isCustomer // ignore: cast_nullable_to_non_nullable
+              as bool,
      remark: freezed == remark
          ? _value.remark
          : remark // ignore: cast_nullable_to_non_nullable
@@ -213,6 +241,8 @@ class _$CreateCompanyRequestImpl implements _CreateCompanyRequest {
      @JsonKey(name: 'contact_email') required this.contactEmail,
      @JsonKey(name: 'company_types')
      final List<String> companyTypes = const [],
+      @JsonKey(name: 'is_partner') this.isPartner = false,
+      @JsonKey(name: 'is_customer') this.isCustomer = true,
      this.remark})
      : _companyTypes = companyTypes;

@@ -244,12 +274,18 @@ class _$CreateCompanyRequestImpl implements _CreateCompanyRequest {
    return EqualUnmodifiableListView(_companyTypes);
  }

+  @override
+  @JsonKey(name: 'is_partner')
+  final bool isPartner;
+  @override
+  @JsonKey(name: 'is_customer')
+  final bool isCustomer;
  @override
  final String? remark;

  @override
  String toString() {
-    return 'CreateCompanyRequest(name: $name, address: $address, contactName: $contactName, contactPosition: $contactPosition, contactPhone: $contactPhone, contactEmail: $contactEmail, companyTypes: $companyTypes, remark: $remark)';
+    return 'CreateCompanyRequest(name: $name, address: $address, contactName: $contactName, contactPosition: $contactPosition, contactPhone: $contactPhone, contactEmail: $contactEmail, companyTypes: $companyTypes, isPartner: $isPartner, isCustomer: $isCustomer, remark: $remark)';
  }

  @override
@@ -269,6 +305,10 @@ class _$CreateCompanyRequestImpl implements _CreateCompanyRequest {
                other.contactEmail == contactEmail) &&
            const DeepCollectionEquality()
                .equals(other._companyTypes, _companyTypes) &&
+            (identical(other.isPartner, isPartner) ||
+                other.isPartner == isPartner) &&
+            (identical(other.isCustomer, isCustomer) ||
+                other.isCustomer == isCustomer) &&
            (identical(other.remark, remark) || other.remark == remark));
  }

@@ -283,6 +323,8 @@ class _$CreateCompanyRequestImpl implements _CreateCompanyRequest {
      contactPhone,
      contactEmail,
      const DeepCollectionEquality().hash(_companyTypes),
+      isPartner,
+      isCustomer,
      remark);

  /// Create a copy of CreateCompanyRequest
@@ -312,6 +354,8 @@ abstract class _CreateCompanyRequest implements CreateCompanyRequest {
      @JsonKey(name: 'contact_phone') required final String contactPhone,
      @JsonKey(name: 'contact_email') required final String contactEmail,
      @JsonKey(name: 'company_types') final List<String> companyTypes,
+      @JsonKey(name: 'is_partner') final bool isPartner,
+      @JsonKey(name: 'is_customer') final bool isCustomer,
      final String? remark}) = _$CreateCompanyRequestImpl;

  factory _CreateCompanyRequest.fromJson(Map<String, dynamic> json) =
@@ -337,6 +381,12 @@ abstract class _CreateCompanyRequest implements CreateCompanyRequest {
  @JsonKey(name: 'company_types')
  List<String> get companyTypes;
  @override
+  @JsonKey(name: 'is_partner')
+  bool get isPartner;
+  @override
+  @JsonKey(name: 'is_customer')
+  bool get isCustomer;
+  @override
  String? get remark;

  /// Create a copy of CreateCompanyRequest
--- a/lib/data/models/company/company_dto.g.dart
+++ b/lib/data/models/company/company_dto.g.dart
@@ -19,6 +19,8 @@ _$CreateCompanyRequestImpl _$$CreateCompanyRequestImplFromJson(
              ?.map((e) => e as String)
              .toList() ??
          const [],
+      isPartner: json['is_partner'] as bool? ?? false,
+      isCustomer: json['is_customer'] as bool? ?? true,
      remark: json['remark'] as String?,
    );

@@ -32,6 +34,8 @@ Map<String, dynamic> _$$CreateCompanyRequestImplToJson(
      'contact_phone': instance.contactPhone,
      'contact_email': instance.contactEmail,
      'company_types': instance.companyTypes,
+      'is_partner': instance.isPartner,
+      'is_customer': instance.isCustomer,
      'remark': instance.remark,
    };

--- a/lib/data/models/equipment/equipment_request.dart
+++ b/lib/data/models/equipment/equipment_request.dart
@@ -7,15 +7,15 @@ part 'equipment_request.g.dart';
@freezed
 class CreateEquipmentRequest with _$CreateEquipmentRequest {
  const factory CreateEquipmentRequest({
-    required String equipmentNumber,
+    @JsonKey(name: 'equipment_number') required String equipmentNumber,
    String? category1,
    String? category2,
    String? category3,
    required String manufacturer,
-    String? modelName,
-    String? serialNumber,
-    DateTime? purchaseDate,
-    double? purchasePrice,
+    @JsonKey(name: 'model_name') String? modelName,
+    @JsonKey(name: 'serial_number') String? serialNumber,
+    @JsonKey(name: 'purchase_date') DateTime? purchaseDate,
+    @JsonKey(name: 'purchase_price') double? purchasePrice,
    String? remark,
  }) = _CreateEquipmentRequest;

@@ -30,17 +30,17 @@ class UpdateEquipmentRequest with _$UpdateEquipmentRequest {
    String? category2,
    String? category3,
    String? manufacturer,
-    String? modelName,
-    String? serialNumber,
+    @JsonKey(name: 'model_name') String? modelName,
+    @JsonKey(name: 'serial_number') String? serialNumber,
    String? barcode,
-    DateTime? purchaseDate,
-    double? purchasePrice,
+    @JsonKey(name: 'purchase_date') DateTime? purchaseDate,
+    @JsonKey(name: 'purchase_price') double? purchasePrice,
    @EquipmentStatusJsonConverter() String? status,
-    int? currentCompanyId,
-    int? currentBranchId,
-    int? warehouseLocationId,
-    DateTime? lastInspectionDate,
-    DateTime? nextInspectionDate,
+    @JsonKey(name: 'current_company_id') int? currentCompanyId,
+    @JsonKey(name: 'current_branch_id') int? currentBranchId,
+    @JsonKey(name: 'warehouse_location_id') int? warehouseLocationId,
+    @JsonKey(name: 'last_inspection_date') DateTime? lastInspectionDate,
+    @JsonKey(name: 'next_inspection_date') DateTime? nextInspectionDate,
    String? remark,
  }) = _UpdateEquipmentRequest;

--- a/lib/data/models/equipment/equipment_request.freezed.dart
+++ b/lib/data/models/equipment/equipment_request.freezed.dart
@@ -21,14 +21,19 @@ CreateEquipmentRequest _$CreateEquipmentRequestFromJson(

 /// @nodoc
 mixin _$CreateEquipmentRequest {
+  @JsonKey(name: 'equipment_number')
  String get equipmentNumber => 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;
+  @JsonKey(name: 'serial_number')
  String? get serialNumber => throw _privateConstructorUsedError;
+  @JsonKey(name: 'purchase_date')
  DateTime? get purchaseDate => throw _privateConstructorUsedError;
+  @JsonKey(name: 'purchase_price')
  double? get purchasePrice => throw _privateConstructorUsedError;
  String? get remark => throw _privateConstructorUsedError;

@@ -49,15 +54,15 @@ abstract class $CreateEquipmentRequestCopyWith<$Res> {
      _$CreateEquipmentRequestCopyWithImpl<$Res, CreateEquipmentRequest>;
  @useResult
  $Res call(
-      {String equipmentNumber,
+      {@JsonKey(name: 'equipment_number') String equipmentNumber,
      String? category1,
      String? category2,
      String? category3,
      String manufacturer,
-      String? modelName,
-      String? serialNumber,
-      DateTime? purchaseDate,
-      double? purchasePrice,
+      @JsonKey(name: 'model_name') String? modelName,
+      @JsonKey(name: 'serial_number') String? serialNumber,
+      @JsonKey(name: 'purchase_date') DateTime? purchaseDate,
+      @JsonKey(name: 'purchase_price') double? purchasePrice,
      String? remark});
 }

@@ -143,15 +148,15 @@ abstract class _$$CreateEquipmentRequestImplCopyWith<$Res>
  @override
  @useResult
  $Res call(
-      {String equipmentNumber,
+      {@JsonKey(name: 'equipment_number') String equipmentNumber,
      String? category1,
      String? category2,
      String? category3,
      String manufacturer,
-      String? modelName,
-      String? serialNumber,
-      DateTime? purchaseDate,
-      double? purchasePrice,
+      @JsonKey(name: 'model_name') String? modelName,
+      @JsonKey(name: 'serial_number') String? serialNumber,
+      @JsonKey(name: 'purchase_date') DateTime? purchaseDate,
+      @JsonKey(name: 'purchase_price') double? purchasePrice,
      String? remark});
 }

@@ -230,21 +235,22 @@ class __$$CreateEquipmentRequestImplCopyWithImpl<$Res>
@JsonSerializable()
 class _$CreateEquipmentRequestImpl implements _CreateEquipmentRequest {
  const _$CreateEquipmentRequestImpl(
-      {required this.equipmentNumber,
+      {@JsonKey(name: 'equipment_number') required this.equipmentNumber,
      this.category1,
      this.category2,
      this.category3,
      required this.manufacturer,
-      this.modelName,
-      this.serialNumber,
-      this.purchaseDate,
-      this.purchasePrice,
+      @JsonKey(name: 'model_name') this.modelName,
+      @JsonKey(name: 'serial_number') this.serialNumber,
+      @JsonKey(name: 'purchase_date') this.purchaseDate,
+      @JsonKey(name: 'purchase_price') this.purchasePrice,
      this.remark});

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

  @override
+  @JsonKey(name: 'equipment_number')
  final String equipmentNumber;
  @override
  final String? category1;
@@ -255,12 +261,16 @@ class _$CreateEquipmentRequestImpl implements _CreateEquipmentRequest {
  @override
  final String manufacturer;
  @override
+  @JsonKey(name: 'model_name')
  final String? modelName;
  @override
+  @JsonKey(name: 'serial_number')
  final String? serialNumber;
  @override
+  @JsonKey(name: 'purchase_date')
  final DateTime? purchaseDate;
  @override
+  @JsonKey(name: 'purchase_price')
  final double? purchasePrice;
  @override
  final String? remark;
@@ -330,21 +340,22 @@ class _$CreateEquipmentRequestImpl implements _CreateEquipmentRequest {

 abstract class _CreateEquipmentRequest implements CreateEquipmentRequest {
  const factory _CreateEquipmentRequest(
-      {required final String equipmentNumber,
+      {@JsonKey(name: 'equipment_number') required final String equipmentNumber,
      final String? category1,
      final String? category2,
      final String? category3,
      required final String manufacturer,
-      final String? modelName,
-      final String? serialNumber,
-      final DateTime? purchaseDate,
-      final double? purchasePrice,
+      @JsonKey(name: 'model_name') final String? modelName,
+      @JsonKey(name: 'serial_number') final String? serialNumber,
+      @JsonKey(name: 'purchase_date') final DateTime? purchaseDate,
+      @JsonKey(name: 'purchase_price') final double? purchasePrice,
      final String? remark}) = _$CreateEquipmentRequestImpl;

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

  @override
+  @JsonKey(name: 'equipment_number')
  String get equipmentNumber;
  @override
  String? get category1;
@@ -355,12 +366,16 @@ abstract class _CreateEquipmentRequest implements CreateEquipmentRequest {
  @override
  String get manufacturer;
  @override
+  @JsonKey(name: 'model_name')
  String? get modelName;
  @override
+  @JsonKey(name: 'serial_number')
  String? get serialNumber;
  @override
+  @JsonKey(name: 'purchase_date')
  DateTime? get purchaseDate;
  @override
+  @JsonKey(name: 'purchase_price')
  double? get purchasePrice;
  @override
  String? get remark;
@@ -384,17 +399,26 @@ mixin _$UpdateEquipmentRequest {
  String? get category2 => throw _privateConstructorUsedError;
  String? get category3 => throw _privateConstructorUsedError;
  String? get manufacturer => throw _privateConstructorUsedError;
+  @JsonKey(name: 'model_name')
  String? get modelName => throw _privateConstructorUsedError;
+  @JsonKey(name: 'serial_number')
  String? get serialNumber => throw _privateConstructorUsedError;
  String? get barcode => throw _privateConstructorUsedError;
+  @JsonKey(name: 'purchase_date')
  DateTime? get purchaseDate => throw _privateConstructorUsedError;
+  @JsonKey(name: 'purchase_price')
  double? get purchasePrice => throw _privateConstructorUsedError;
  @EquipmentStatusJsonConverter()
  String? get status => throw _privateConstructorUsedError;
+  @JsonKey(name: 'current_company_id')
  int? get currentCompanyId => throw _privateConstructorUsedError;
+  @JsonKey(name: 'current_branch_id')
  int? get currentBranchId => throw _privateConstructorUsedError;
+  @JsonKey(name: 'warehouse_location_id')
  int? get warehouseLocationId => throw _privateConstructorUsedError;
+  @JsonKey(name: 'last_inspection_date')
  DateTime? get lastInspectionDate => throw _privateConstructorUsedError;
+  @JsonKey(name: 'next_inspection_date')
  DateTime? get nextInspectionDate => throw _privateConstructorUsedError;
  String? get remark => throw _privateConstructorUsedError;

@@ -419,17 +443,17 @@ abstract class $UpdateEquipmentRequestCopyWith<$Res> {
      String? category2,
      String? category3,
      String? manufacturer,
-      String? modelName,
-      String? serialNumber,
+      @JsonKey(name: 'model_name') String? modelName,
+      @JsonKey(name: 'serial_number') String? serialNumber,
      String? barcode,
-      DateTime? purchaseDate,
-      double? purchasePrice,
+      @JsonKey(name: 'purchase_date') DateTime? purchaseDate,
+      @JsonKey(name: 'purchase_price') double? purchasePrice,
      @EquipmentStatusJsonConverter() String? status,
-      int? currentCompanyId,
-      int? currentBranchId,
-      int? warehouseLocationId,
-      DateTime? lastInspectionDate,
-      DateTime? nextInspectionDate,
+      @JsonKey(name: 'current_company_id') int? currentCompanyId,
+      @JsonKey(name: 'current_branch_id') int? currentBranchId,
+      @JsonKey(name: 'warehouse_location_id') int? warehouseLocationId,
+      @JsonKey(name: 'last_inspection_date') DateTime? lastInspectionDate,
+      @JsonKey(name: 'next_inspection_date') DateTime? nextInspectionDate,
      String? remark});
 }

@@ -549,17 +573,17 @@ abstract class _$$UpdateEquipmentRequestImplCopyWith<$Res>
      String? category2,
      String? category3,
      String? manufacturer,
-      String? modelName,
-      String? serialNumber,
+      @JsonKey(name: 'model_name') String? modelName,
+      @JsonKey(name: 'serial_number') String? serialNumber,
      String? barcode,
-      DateTime? purchaseDate,
-      double? purchasePrice,
+      @JsonKey(name: 'purchase_date') DateTime? purchaseDate,
+      @JsonKey(name: 'purchase_price') double? purchasePrice,
      @EquipmentStatusJsonConverter() String? status,
-      int? currentCompanyId,
-      int? currentBranchId,
-      int? warehouseLocationId,
-      DateTime? lastInspectionDate,
-      DateTime? nextInspectionDate,
+      @JsonKey(name: 'current_company_id') int? currentCompanyId,
+      @JsonKey(name: 'current_branch_id') int? currentBranchId,
+      @JsonKey(name: 'warehouse_location_id') int? warehouseLocationId,
+      @JsonKey(name: 'last_inspection_date') DateTime? lastInspectionDate,
+      @JsonKey(name: 'next_inspection_date') DateTime? nextInspectionDate,
      String? remark});
 }

@@ -672,17 +696,17 @@ class _$UpdateEquipmentRequestImpl implements _UpdateEquipmentRequest {
      this.category2,
      this.category3,
      this.manufacturer,
-      this.modelName,
-      this.serialNumber,
+      @JsonKey(name: 'model_name') this.modelName,
+      @JsonKey(name: 'serial_number') this.serialNumber,
      this.barcode,
-      this.purchaseDate,
-      this.purchasePrice,
+      @JsonKey(name: 'purchase_date') this.purchaseDate,
+      @JsonKey(name: 'purchase_price') this.purchasePrice,
      @EquipmentStatusJsonConverter() this.status,
-      this.currentCompanyId,
-      this.currentBranchId,
-      this.warehouseLocationId,
-      this.lastInspectionDate,
-      this.nextInspectionDate,
+      @JsonKey(name: 'current_company_id') this.currentCompanyId,
+      @JsonKey(name: 'current_branch_id') this.currentBranchId,
+      @JsonKey(name: 'warehouse_location_id') this.warehouseLocationId,
+      @JsonKey(name: 'last_inspection_date') this.lastInspectionDate,
+      @JsonKey(name: 'next_inspection_date') this.nextInspectionDate,
      this.remark});

  factory _$UpdateEquipmentRequestImpl.fromJson(Map<String, dynamic> json) =>
@@ -697,27 +721,36 @@ class _$UpdateEquipmentRequestImpl implements _UpdateEquipmentRequest {
  @override
  final String? manufacturer;
  @override
+  @JsonKey(name: 'model_name')
  final String? modelName;
  @override
+  @JsonKey(name: 'serial_number')
  final String? serialNumber;
  @override
  final String? barcode;
  @override
+  @JsonKey(name: 'purchase_date')
  final DateTime? purchaseDate;
  @override
+  @JsonKey(name: 'purchase_price')
  final double? purchasePrice;
  @override
  @EquipmentStatusJsonConverter()
  final String? status;
  @override
+  @JsonKey(name: 'current_company_id')
  final int? currentCompanyId;
  @override
+  @JsonKey(name: 'current_branch_id')
  final int? currentBranchId;
  @override
+  @JsonKey(name: 'warehouse_location_id')
  final int? warehouseLocationId;
  @override
+  @JsonKey(name: 'last_inspection_date')
  final DateTime? lastInspectionDate;
  @override
+  @JsonKey(name: 'next_inspection_date')
  final DateTime? nextInspectionDate;
  @override
  final String? remark;
@@ -807,17 +840,17 @@ abstract class _UpdateEquipmentRequest implements UpdateEquipmentRequest {
      final String? category2,
      final String? category3,
      final String? manufacturer,
-      final String? modelName,
-      final String? serialNumber,
+      @JsonKey(name: 'model_name') final String? modelName,
+      @JsonKey(name: 'serial_number') final String? serialNumber,
      final String? barcode,
-      final DateTime? purchaseDate,
-      final double? purchasePrice,
+      @JsonKey(name: 'purchase_date') final DateTime? purchaseDate,
+      @JsonKey(name: 'purchase_price') final double? purchasePrice,
      @EquipmentStatusJsonConverter() final String? status,
-      final int? currentCompanyId,
-      final int? currentBranchId,
-      final int? warehouseLocationId,
-      final DateTime? lastInspectionDate,
-      final DateTime? nextInspectionDate,
+      @JsonKey(name: 'current_company_id') final int? currentCompanyId,
+      @JsonKey(name: 'current_branch_id') final int? currentBranchId,
+      @JsonKey(name: 'warehouse_location_id') final int? warehouseLocationId,
+      @JsonKey(name: 'last_inspection_date') final DateTime? lastInspectionDate,
+      @JsonKey(name: 'next_inspection_date') final DateTime? nextInspectionDate,
      final String? remark}) = _$UpdateEquipmentRequestImpl;

  factory _UpdateEquipmentRequest.fromJson(Map<String, dynamic> json) =
@@ -832,27 +865,36 @@ abstract class _UpdateEquipmentRequest implements UpdateEquipmentRequest {
  @override
  String? get manufacturer;
  @override
+  @JsonKey(name: 'model_name')
  String? get modelName;
  @override
+  @JsonKey(name: 'serial_number')
  String? get serialNumber;
  @override
  String? get barcode;
  @override
+  @JsonKey(name: 'purchase_date')
  DateTime? get purchaseDate;
  @override
+  @JsonKey(name: 'purchase_price')
  double? get purchasePrice;
  @override
  @EquipmentStatusJsonConverter()
  String? get status;
  @override
+  @JsonKey(name: 'current_company_id')
  int? get currentCompanyId;
  @override
+  @JsonKey(name: 'current_branch_id')
  int? get currentBranchId;
  @override
+  @JsonKey(name: 'warehouse_location_id')
  int? get warehouseLocationId;
  @override
+  @JsonKey(name: 'last_inspection_date')
  DateTime? get lastInspectionDate;
  @override
+  @JsonKey(name: 'next_inspection_date')
  DateTime? get nextInspectionDate;
  @override
  String? get remark;
--- a/lib/data/models/equipment/equipment_request.g.dart
+++ b/lib/data/models/equipment/equipment_request.g.dart
@@ -9,32 +9,32 @@ part of 'equipment_request.dart';
 _$CreateEquipmentRequestImpl _$$CreateEquipmentRequestImplFromJson(
        Map<String, dynamic> json) =>
    _$CreateEquipmentRequestImpl(
-      equipmentNumber: json['equipmentNumber'] as String,
+      equipmentNumber: json['equipment_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['modelName'] as String?,
-      serialNumber: json['serialNumber'] as String?,
-      purchaseDate: json['purchaseDate'] == null
+      modelName: json['model_name'] as String?,
+      serialNumber: json['serial_number'] as String?,
+      purchaseDate: json['purchase_date'] == null
          ? null
-          : DateTime.parse(json['purchaseDate'] as String),
-      purchasePrice: (json['purchasePrice'] as num?)?.toDouble(),
+          : DateTime.parse(json['purchase_date'] as String),
+      purchasePrice: (json['purchase_price'] as num?)?.toDouble(),
      remark: json['remark'] as String?,
    );

 Map<String, dynamic> _$$CreateEquipmentRequestImplToJson(
        _$CreateEquipmentRequestImpl instance) =>
    <String, dynamic>{
-      'equipmentNumber': instance.equipmentNumber,
+      'equipment_number': instance.equipmentNumber,
      'category1': instance.category1,
      'category2': instance.category2,
      'category3': instance.category3,
      'manufacturer': instance.manufacturer,
-      'modelName': instance.modelName,
-      'serialNumber': instance.serialNumber,
-      'purchaseDate': instance.purchaseDate?.toIso8601String(),
-      'purchasePrice': instance.purchasePrice,
+      'model_name': instance.modelName,
+      'serial_number': instance.serialNumber,
+      'purchase_date': instance.purchaseDate?.toIso8601String(),
+      'purchase_price': instance.purchasePrice,
      'remark': instance.remark,
    };

@@ -45,24 +45,24 @@ _$UpdateEquipmentRequestImpl _$$UpdateEquipmentRequestImplFromJson(
      category2: json['category2'] as String?,
      category3: json['category3'] as String?,
      manufacturer: json['manufacturer'] as String?,
-      modelName: json['modelName'] as String?,
-      serialNumber: json['serialNumber'] as String?,
+      modelName: json['model_name'] as String?,
+      serialNumber: json['serial_number'] as String?,
      barcode: json['barcode'] as String?,
-      purchaseDate: json['purchaseDate'] == null
+      purchaseDate: json['purchase_date'] == null
          ? null
-          : DateTime.parse(json['purchaseDate'] as String),
-      purchasePrice: (json['purchasePrice'] as num?)?.toDouble(),
+          : DateTime.parse(json['purchase_date'] as String),
+      purchasePrice: (json['purchase_price'] as num?)?.toDouble(),
      status: _$JsonConverterFromJson<String, String>(
          json['status'], const EquipmentStatusJsonConverter().fromJson),
-      currentCompanyId: (json['currentCompanyId'] as num?)?.toInt(),
-      currentBranchId: (json['currentBranchId'] as num?)?.toInt(),
-      warehouseLocationId: (json['warehouseLocationId'] as num?)?.toInt(),
-      lastInspectionDate: json['lastInspectionDate'] == null
+      currentCompanyId: (json['current_company_id'] as num?)?.toInt(),
+      currentBranchId: (json['current_branch_id'] as num?)?.toInt(),
+      warehouseLocationId: (json['warehouse_location_id'] as num?)?.toInt(),
+      lastInspectionDate: json['last_inspection_date'] == null
          ? null
-          : DateTime.parse(json['lastInspectionDate'] as String),
-      nextInspectionDate: json['nextInspectionDate'] == null
+          : DateTime.parse(json['last_inspection_date'] as String),
+      nextInspectionDate: json['next_inspection_date'] == null
          ? null
-          : DateTime.parse(json['nextInspectionDate'] as String),
+          : DateTime.parse(json['next_inspection_date'] as String),
      remark: json['remark'] as String?,
    );

@@ -73,18 +73,18 @@ Map<String, dynamic> _$$UpdateEquipmentRequestImplToJson(
      'category2': instance.category2,
      'category3': instance.category3,
      'manufacturer': instance.manufacturer,
-      'modelName': instance.modelName,
-      'serialNumber': instance.serialNumber,
+      'model_name': instance.modelName,
+      'serial_number': instance.serialNumber,
      'barcode': instance.barcode,
-      'purchaseDate': instance.purchaseDate?.toIso8601String(),
-      'purchasePrice': instance.purchasePrice,
+      'purchase_date': instance.purchaseDate?.toIso8601String(),
+      'purchase_price': instance.purchasePrice,
      'status': _$JsonConverterToJson<String, String>(
          instance.status, const EquipmentStatusJsonConverter().toJson),
-      'currentCompanyId': instance.currentCompanyId,
-      'currentBranchId': instance.currentBranchId,
-      'warehouseLocationId': instance.warehouseLocationId,
-      'lastInspectionDate': instance.lastInspectionDate?.toIso8601String(),
-      'nextInspectionDate': instance.nextInspectionDate?.toIso8601String(),
+      'current_company_id': instance.currentCompanyId,
+      'current_branch_id': instance.currentBranchId,
+      'warehouse_location_id': instance.warehouseLocationId,
+      'last_inspection_date': instance.lastInspectionDate?.toIso8601String(),
+      'next_inspection_date': instance.nextInspectionDate?.toIso8601String(),
      'remark': instance.remark,
    };

--- a/lib/data/models/equipment/equipment_response.dart
+++ b/lib/data/models/equipment/equipment_response.dart
@@ -8,29 +8,29 @@ part 'equipment_response.g.dart';
 class EquipmentResponse with _$EquipmentResponse {
  const factory EquipmentResponse({
    required int id,
-    required String equipmentNumber,
+    @JsonKey(name: 'equipment_number') required String equipmentNumber,
    String? category1,
    String? category2,
    String? category3,
    required String manufacturer,
-    String? modelName,
-    String? serialNumber,
+    @JsonKey(name: 'model_name') String? modelName,
+    @JsonKey(name: 'serial_number') String? serialNumber,
    String? barcode,
-    DateTime? purchaseDate,
-    double? purchasePrice,
+    @JsonKey(name: 'purchase_date') DateTime? purchaseDate,
+    @JsonKey(name: 'purchase_price') String? purchasePrice,
    @EquipmentStatusJsonConverter() required String status,
-    int? currentCompanyId,
-    int? currentBranchId,
-    int? warehouseLocationId,
-    DateTime? lastInspectionDate,
-    DateTime? nextInspectionDate,
+    @JsonKey(name: 'current_company_id') int? currentCompanyId,
+    @JsonKey(name: 'current_branch_id') int? currentBranchId,
+    @JsonKey(name: 'warehouse_location_id') int? warehouseLocationId,
+    @JsonKey(name: 'last_inspection_date') DateTime? lastInspectionDate,
+    @JsonKey(name: 'next_inspection_date') DateTime? nextInspectionDate,
    String? remark,
-    required DateTime createdAt,
-    required DateTime updatedAt,
+    @JsonKey(name: 'created_at') required DateTime createdAt,
+    @JsonKey(name: 'updated_at') required DateTime updatedAt,
    // 추가 필드 (조인된 데이터)
-    String? companyName,
-    String? branchName,
-    String? warehouseName,
+    @JsonKey(name: 'company_name') String? companyName,
+    @JsonKey(name: 'branch_name') String? branchName,
+    @JsonKey(name: 'warehouse_name') String? warehouseName,
  }) = _EquipmentResponse;

  factory EquipmentResponse.fromJson(Map<String, dynamic> json) =>
--- a/lib/data/models/equipment/equipment_response.freezed.dart
+++ b/lib/data/models/equipment/equipment_response.freezed.dart
@@ -21,29 +21,44 @@ EquipmentResponse _$EquipmentResponseFromJson(Map<String, dynamic> json) {
 /// @nodoc
 mixin _$EquipmentResponse {
  int get id => throw _privateConstructorUsedError;
+  @JsonKey(name: 'equipment_number')
  String get equipmentNumber => 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;
+  @JsonKey(name: 'serial_number')
  String? get serialNumber => throw _privateConstructorUsedError;
  String? get barcode => throw _privateConstructorUsedError;
+  @JsonKey(name: 'purchase_date')
  DateTime? get purchaseDate => throw _privateConstructorUsedError;
-  double? get purchasePrice => throw _privateConstructorUsedError;
+  @JsonKey(name: 'purchase_price')
+  String? get purchasePrice => throw _privateConstructorUsedError;
  @EquipmentStatusJsonConverter()
  String get status => throw _privateConstructorUsedError;
+  @JsonKey(name: 'current_company_id')
  int? get currentCompanyId => throw _privateConstructorUsedError;
+  @JsonKey(name: 'current_branch_id')
  int? get currentBranchId => throw _privateConstructorUsedError;
+  @JsonKey(name: 'warehouse_location_id')
  int? get warehouseLocationId => throw _privateConstructorUsedError;
+  @JsonKey(name: 'last_inspection_date')
  DateTime? get lastInspectionDate => throw _privateConstructorUsedError;
+  @JsonKey(name: 'next_inspection_date')
  DateTime? get nextInspectionDate => throw _privateConstructorUsedError;
  String? get remark => throw _privateConstructorUsedError;
+  @JsonKey(name: 'created_at')
  DateTime get createdAt => throw _privateConstructorUsedError;
+  @JsonKey(name: 'updated_at')
  DateTime get updatedAt =>
      throw _privateConstructorUsedError; // 추가 필드 (조인된 데이터)
+  @JsonKey(name: 'company_name')
  String? get companyName => throw _privateConstructorUsedError;
+  @JsonKey(name: 'branch_name')
  String? get branchName => throw _privateConstructorUsedError;
+  @JsonKey(name: 'warehouse_name')
  String? get warehouseName => throw _privateConstructorUsedError;

  /// Serializes this EquipmentResponse to a JSON map.
@@ -64,28 +79,28 @@ abstract class $EquipmentResponseCopyWith<$Res> {
  @useResult
  $Res call(
      {int id,
-      String equipmentNumber,
+      @JsonKey(name: 'equipment_number') String equipmentNumber,
      String? category1,
      String? category2,
      String? category3,
      String manufacturer,
-      String? modelName,
-      String? serialNumber,
+      @JsonKey(name: 'model_name') String? modelName,
+      @JsonKey(name: 'serial_number') String? serialNumber,
      String? barcode,
-      DateTime? purchaseDate,
-      double? purchasePrice,
+      @JsonKey(name: 'purchase_date') DateTime? purchaseDate,
+      @JsonKey(name: 'purchase_price') String? purchasePrice,
      @EquipmentStatusJsonConverter() String status,
-      int? currentCompanyId,
-      int? currentBranchId,
-      int? warehouseLocationId,
-      DateTime? lastInspectionDate,
-      DateTime? nextInspectionDate,
+      @JsonKey(name: 'current_company_id') int? currentCompanyId,
+      @JsonKey(name: 'current_branch_id') int? currentBranchId,
+      @JsonKey(name: 'warehouse_location_id') int? warehouseLocationId,
+      @JsonKey(name: 'last_inspection_date') DateTime? lastInspectionDate,
+      @JsonKey(name: 'next_inspection_date') DateTime? nextInspectionDate,
      String? remark,
-      DateTime createdAt,
-      DateTime updatedAt,
-      String? companyName,
-      String? branchName,
-      String? warehouseName});
+      @JsonKey(name: 'created_at') DateTime createdAt,
+      @JsonKey(name: 'updated_at') DateTime updatedAt,
+      @JsonKey(name: 'company_name') String? companyName,
+      @JsonKey(name: 'branch_name') String? branchName,
+      @JsonKey(name: 'warehouse_name') String? warehouseName});
 }

 /// @nodoc
@@ -171,7 +186,7 @@ class _$EquipmentResponseCopyWithImpl<$Res, $Val extends EquipmentResponse>
      purchasePrice: freezed == purchasePrice
          ? _value.purchasePrice
          : purchasePrice // ignore: cast_nullable_to_non_nullable
-              as double?,
+              as String?,
      status: null == status
          ? _value.status
          : status // ignore: cast_nullable_to_non_nullable
@@ -234,28 +249,28 @@ abstract class _$$EquipmentResponseImplCopyWith<$Res>
  @useResult
  $Res call(
      {int id,
-      String equipmentNumber,
+      @JsonKey(name: 'equipment_number') String equipmentNumber,
      String? category1,
      String? category2,
      String? category3,
      String manufacturer,
-      String? modelName,
-      String? serialNumber,
+      @JsonKey(name: 'model_name') String? modelName,
+      @JsonKey(name: 'serial_number') String? serialNumber,
      String? barcode,
-      DateTime? purchaseDate,
-      double? purchasePrice,
+      @JsonKey(name: 'purchase_date') DateTime? purchaseDate,
+      @JsonKey(name: 'purchase_price') String? purchasePrice,
      @EquipmentStatusJsonConverter() String status,
-      int? currentCompanyId,
-      int? currentBranchId,
-      int? warehouseLocationId,
-      DateTime? lastInspectionDate,
-      DateTime? nextInspectionDate,
+      @JsonKey(name: 'current_company_id') int? currentCompanyId,
+      @JsonKey(name: 'current_branch_id') int? currentBranchId,
+      @JsonKey(name: 'warehouse_location_id') int? warehouseLocationId,
+      @JsonKey(name: 'last_inspection_date') DateTime? lastInspectionDate,
+      @JsonKey(name: 'next_inspection_date') DateTime? nextInspectionDate,
      String? remark,
-      DateTime createdAt,
-      DateTime updatedAt,
-      String? companyName,
-      String? branchName,
-      String? warehouseName});
+      @JsonKey(name: 'created_at') DateTime createdAt,
+      @JsonKey(name: 'updated_at') DateTime updatedAt,
+      @JsonKey(name: 'company_name') String? companyName,
+      @JsonKey(name: 'branch_name') String? branchName,
+      @JsonKey(name: 'warehouse_name') String? warehouseName});
 }

 /// @nodoc
@@ -339,7 +354,7 @@ class __$$EquipmentResponseImplCopyWithImpl<$Res>
      purchasePrice: freezed == purchasePrice
          ? _value.purchasePrice
          : purchasePrice // ignore: cast_nullable_to_non_nullable
-              as double?,
+              as String?,
      status: null == status
          ? _value.status
          : status // ignore: cast_nullable_to_non_nullable
@@ -397,28 +412,28 @@ class __$$EquipmentResponseImplCopyWithImpl<$Res>
 class _$EquipmentResponseImpl implements _EquipmentResponse {
  const _$EquipmentResponseImpl(
      {required this.id,
-      required this.equipmentNumber,
+      @JsonKey(name: 'equipment_number') required this.equipmentNumber,
      this.category1,
      this.category2,
      this.category3,
      required this.manufacturer,
-      this.modelName,
-      this.serialNumber,
+      @JsonKey(name: 'model_name') this.modelName,
+      @JsonKey(name: 'serial_number') this.serialNumber,
      this.barcode,
-      this.purchaseDate,
-      this.purchasePrice,
+      @JsonKey(name: 'purchase_date') this.purchaseDate,
+      @JsonKey(name: 'purchase_price') this.purchasePrice,
      @EquipmentStatusJsonConverter() required this.status,
-      this.currentCompanyId,
-      this.currentBranchId,
-      this.warehouseLocationId,
-      this.lastInspectionDate,
-      this.nextInspectionDate,
+      @JsonKey(name: 'current_company_id') this.currentCompanyId,
+      @JsonKey(name: 'current_branch_id') this.currentBranchId,
+      @JsonKey(name: 'warehouse_location_id') this.warehouseLocationId,
+      @JsonKey(name: 'last_inspection_date') this.lastInspectionDate,
+      @JsonKey(name: 'next_inspection_date') this.nextInspectionDate,
      this.remark,
-      required this.createdAt,
-      required this.updatedAt,
-      this.companyName,
-      this.branchName,
-      this.warehouseName});
+      @JsonKey(name: 'created_at') required this.createdAt,
+      @JsonKey(name: 'updated_at') required this.updatedAt,
+      @JsonKey(name: 'company_name') this.companyName,
+      @JsonKey(name: 'branch_name') this.branchName,
+      @JsonKey(name: 'warehouse_name') this.warehouseName});

  factory _$EquipmentResponseImpl.fromJson(Map<String, dynamic> json) =>
      _$$EquipmentResponseImplFromJson(json);
@@ -426,6 +441,7 @@ class _$EquipmentResponseImpl implements _EquipmentResponse {
  @override
  final int id;
  @override
+  @JsonKey(name: 'equipment_number')
  final String equipmentNumber;
  @override
  final String? category1;
@@ -436,40 +452,54 @@ class _$EquipmentResponseImpl implements _EquipmentResponse {
  @override
  final String manufacturer;
  @override
+  @JsonKey(name: 'model_name')
  final String? modelName;
  @override
+  @JsonKey(name: 'serial_number')
  final String? serialNumber;
  @override
  final String? barcode;
  @override
+  @JsonKey(name: 'purchase_date')
  final DateTime? purchaseDate;
  @override
-  final double? purchasePrice;
+  @JsonKey(name: 'purchase_price')
+  final String? purchasePrice;
  @override
  @EquipmentStatusJsonConverter()
  final String status;
  @override
+  @JsonKey(name: 'current_company_id')
  final int? currentCompanyId;
  @override
+  @JsonKey(name: 'current_branch_id')
  final int? currentBranchId;
  @override
+  @JsonKey(name: 'warehouse_location_id')
  final int? warehouseLocationId;
  @override
+  @JsonKey(name: 'last_inspection_date')
  final DateTime? lastInspectionDate;
  @override
+  @JsonKey(name: 'next_inspection_date')
  final DateTime? nextInspectionDate;
  @override
  final String? remark;
  @override
+  @JsonKey(name: 'created_at')
  final DateTime createdAt;
  @override
+  @JsonKey(name: 'updated_at')
  final DateTime updatedAt;
 // 추가 필드 (조인된 데이터)
  @override
+  @JsonKey(name: 'company_name')
  final String? companyName;
  @override
+  @JsonKey(name: 'branch_name')
  final String? branchName;
  @override
+  @JsonKey(name: 'warehouse_name')
  final String? warehouseName;

  @override
@@ -575,27 +605,28 @@ class _$EquipmentResponseImpl implements _EquipmentResponse {
 abstract class _EquipmentResponse implements EquipmentResponse {
  const factory _EquipmentResponse(
      {required final int id,
-      required final String equipmentNumber,
+      @JsonKey(name: 'equipment_number') required final String equipmentNumber,
      final String? category1,
      final String? category2,
      final String? category3,
      required final String manufacturer,
-      final String? modelName,
-      final String? serialNumber,
+      @JsonKey(name: 'model_name') final String? modelName,
+      @JsonKey(name: 'serial_number') final String? serialNumber,
      final String? barcode,
-      final DateTime? purchaseDate,
-      final double? purchasePrice,
+      @JsonKey(name: 'purchase_date') final DateTime? purchaseDate,
+      @JsonKey(name: 'purchase_price') final String? purchasePrice,
      @EquipmentStatusJsonConverter() required final String status,
-      final int? currentCompanyId,
-      final int? currentBranchId,
-      final int? warehouseLocationId,
-      final DateTime? lastInspectionDate,
-      final DateTime? nextInspectionDate,
+      @JsonKey(name: 'current_company_id') final int? currentCompanyId,
+      @JsonKey(name: 'current_branch_id') final int? currentBranchId,
+      @JsonKey(name: 'warehouse_location_id') final int? warehouseLocationId,
+      @JsonKey(name: 'last_inspection_date') final DateTime? lastInspectionDate,
+      @JsonKey(name: 'next_inspection_date') final DateTime? nextInspectionDate,
      final String? remark,
-      required final DateTime createdAt,
-      required final DateTime updatedAt,
-      final String? companyName,
-      final String? branchName,
+      @JsonKey(name: 'created_at') required final DateTime createdAt,
+      @JsonKey(name: 'updated_at') required final DateTime updatedAt,
+      @JsonKey(name: 'company_name') final String? companyName,
+      @JsonKey(name: 'branch_name') final String? branchName,
+      @JsonKey(name: 'warehouse_name')
      final String? warehouseName}) = _$EquipmentResponseImpl;

  factory _EquipmentResponse.fromJson(Map<String, dynamic> json) =
@@ -604,6 +635,7 @@ abstract class _EquipmentResponse implements EquipmentResponse {
  @override
  int get id;
  @override
+  @JsonKey(name: 'equipment_number')
  String get equipmentNumber;
  @override
  String? get category1;
@@ -614,39 +646,53 @@ abstract class _EquipmentResponse implements EquipmentResponse {
  @override
  String get manufacturer;
  @override
+  @JsonKey(name: 'model_name')
  String? get modelName;
  @override
+  @JsonKey(name: 'serial_number')
  String? get serialNumber;
  @override
  String? get barcode;
  @override
+  @JsonKey(name: 'purchase_date')
  DateTime? get purchaseDate;
  @override
-  double? get purchasePrice;
+  @JsonKey(name: 'purchase_price')
+  String? get purchasePrice;
  @override
  @EquipmentStatusJsonConverter()
  String get status;
  @override
+  @JsonKey(name: 'current_company_id')
  int? get currentCompanyId;
  @override
+  @JsonKey(name: 'current_branch_id')
  int? get currentBranchId;
  @override
+  @JsonKey(name: 'warehouse_location_id')
  int? get warehouseLocationId;
  @override
+  @JsonKey(name: 'last_inspection_date')
  DateTime? get lastInspectionDate;
  @override
+  @JsonKey(name: 'next_inspection_date')
  DateTime? get nextInspectionDate;
  @override
  String? get remark;
  @override
+  @JsonKey(name: 'created_at')
  DateTime get createdAt;
  @override
+  @JsonKey(name: 'updated_at')
  DateTime get updatedAt; // 추가 필드 (조인된 데이터)
  @override
+  @JsonKey(name: 'company_name')
  String? get companyName;
  @override
+  @JsonKey(name: 'branch_name')
  String? get branchName;
  @override
+  @JsonKey(name: 'warehouse_name')
  String? get warehouseName;

  /// Create a copy of EquipmentResponse
--- a/lib/data/models/equipment/equipment_response.g.dart
+++ b/lib/data/models/equipment/equipment_response.g.dart
@@ -10,61 +10,61 @@ _$EquipmentResponseImpl _$$EquipmentResponseImplFromJson(
        Map<String, dynamic> json) =>
    _$EquipmentResponseImpl(
      id: (json['id'] as num).toInt(),
-      equipmentNumber: json['equipmentNumber'] as String,
+      equipmentNumber: json['equipment_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['modelName'] as String?,
-      serialNumber: json['serialNumber'] as String?,
+      modelName: json['model_name'] as String?,
+      serialNumber: json['serial_number'] as String?,
      barcode: json['barcode'] as String?,
-      purchaseDate: json['purchaseDate'] == null
+      purchaseDate: json['purchase_date'] == null
          ? null
-          : DateTime.parse(json['purchaseDate'] as String),
-      purchasePrice: (json['purchasePrice'] as num?)?.toDouble(),
+          : DateTime.parse(json['purchase_date'] as String),
+      purchasePrice: json['purchase_price'] as String?,
      status: const EquipmentStatusJsonConverter()
          .fromJson(json['status'] as String),
-      currentCompanyId: (json['currentCompanyId'] as num?)?.toInt(),
-      currentBranchId: (json['currentBranchId'] as num?)?.toInt(),
-      warehouseLocationId: (json['warehouseLocationId'] as num?)?.toInt(),
-      lastInspectionDate: json['lastInspectionDate'] == null
+      currentCompanyId: (json['current_company_id'] as num?)?.toInt(),
+      currentBranchId: (json['current_branch_id'] as num?)?.toInt(),
+      warehouseLocationId: (json['warehouse_location_id'] as num?)?.toInt(),
+      lastInspectionDate: json['last_inspection_date'] == null
          ? null
-          : DateTime.parse(json['lastInspectionDate'] as String),
-      nextInspectionDate: json['nextInspectionDate'] == null
+          : DateTime.parse(json['last_inspection_date'] as String),
+      nextInspectionDate: json['next_inspection_date'] == null
          ? null
-          : DateTime.parse(json['nextInspectionDate'] as String),
+          : DateTime.parse(json['next_inspection_date'] as String),
      remark: json['remark'] as String?,
-      createdAt: DateTime.parse(json['createdAt'] as String),
-      updatedAt: DateTime.parse(json['updatedAt'] as String),
-      companyName: json['companyName'] as String?,
-      branchName: json['branchName'] as String?,
-      warehouseName: json['warehouseName'] as String?,
+      createdAt: DateTime.parse(json['created_at'] as String),
+      updatedAt: DateTime.parse(json['updated_at'] as String),
+      companyName: json['company_name'] as String?,
+      branchName: json['branch_name'] as String?,
+      warehouseName: json['warehouse_name'] as String?,
    );

 Map<String, dynamic> _$$EquipmentResponseImplToJson(
        _$EquipmentResponseImpl instance) =>
    <String, dynamic>{
      'id': instance.id,
-      'equipmentNumber': instance.equipmentNumber,
+      'equipment_number': instance.equipmentNumber,
      'category1': instance.category1,
      'category2': instance.category2,
      'category3': instance.category3,
      'manufacturer': instance.manufacturer,
-      'modelName': instance.modelName,
-      'serialNumber': instance.serialNumber,
+      'model_name': instance.modelName,
+      'serial_number': instance.serialNumber,
      'barcode': instance.barcode,
-      'purchaseDate': instance.purchaseDate?.toIso8601String(),
-      'purchasePrice': instance.purchasePrice,
+      'purchase_date': instance.purchaseDate?.toIso8601String(),
+      'purchase_price': instance.purchasePrice,
      'status': const EquipmentStatusJsonConverter().toJson(instance.status),
-      'currentCompanyId': instance.currentCompanyId,
-      'currentBranchId': instance.currentBranchId,
-      'warehouseLocationId': instance.warehouseLocationId,
-      'lastInspectionDate': instance.lastInspectionDate?.toIso8601String(),
-      'nextInspectionDate': instance.nextInspectionDate?.toIso8601String(),
+      'current_company_id': instance.currentCompanyId,
+      'current_branch_id': instance.currentBranchId,
+      'warehouse_location_id': instance.warehouseLocationId,
+      'last_inspection_date': instance.lastInspectionDate?.toIso8601String(),
+      'next_inspection_date': instance.nextInspectionDate?.toIso8601String(),
      'remark': instance.remark,
-      'createdAt': instance.createdAt.toIso8601String(),
-      'updatedAt': instance.updatedAt.toIso8601String(),
-      'companyName': instance.companyName,
-      'branchName': instance.branchName,
-      'warehouseName': instance.warehouseName,
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'company_name': instance.companyName,
+      'branch_name': instance.branchName,
+      'warehouse_name': instance.warehouseName,
    };
--- a/lib/data/models/warehouse/warehouse_dto.dart
+++ b/lib/data/models/warehouse/warehouse_dto.dart
@@ -16,6 +16,7 @@ class CreateWarehouseLocationRequest with _$CreateWarehouseLocationRequest {
    int? capacity,
    @JsonKey(name: 'manager_id') int? managerId,
    @JsonKey(name: 'company_id') int? companyId,
+    String? remark,
  }) = _CreateWarehouseLocationRequest;

  factory CreateWarehouseLocationRequest.fromJson(Map<String, dynamic> json) =>
@@ -35,6 +36,7 @@ class UpdateWarehouseLocationRequest with _$UpdateWarehouseLocationRequest {
    int? capacity,
    @JsonKey(name: 'manager_id') int? managerId,
    @JsonKey(name: 'is_active') bool? isActive,
+    String? remark,
  }) = _UpdateWarehouseLocationRequest;

  factory UpdateWarehouseLocationRequest.fromJson(Map<String, dynamic> json) =>
--- a/lib/data/models/warehouse/warehouse_dto.freezed.dart
+++ b/lib/data/models/warehouse/warehouse_dto.freezed.dart
@@ -33,6 +33,7 @@ mixin _$CreateWarehouseLocationRequest {
  int? get managerId => throw _privateConstructorUsedError;
  @JsonKey(name: 'company_id')
  int? get companyId => throw _privateConstructorUsedError;
+  String? get remark => throw _privateConstructorUsedError;

  /// Serializes this CreateWarehouseLocationRequest to a JSON map.
  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@@ -61,7 +62,8 @@ abstract class $CreateWarehouseLocationRequestCopyWith<$Res> {
      String? country,
      int? capacity,
      @JsonKey(name: 'manager_id') int? managerId,
-      @JsonKey(name: 'company_id') int? companyId});
+      @JsonKey(name: 'company_id') int? companyId,
+      String? remark});
 }

 /// @nodoc
@@ -89,6 +91,7 @@ class _$CreateWarehouseLocationRequestCopyWithImpl<$Res,
    Object? capacity = freezed,
    Object? managerId = freezed,
    Object? companyId = freezed,
+    Object? remark = freezed,
  }) {
    return _then(_value.copyWith(
      name: null == name
@@ -127,6 +130,10 @@ class _$CreateWarehouseLocationRequestCopyWithImpl<$Res,
          ? _value.companyId
          : companyId // ignore: cast_nullable_to_non_nullable
              as int?,
+      remark: freezed == remark
+          ? _value.remark
+          : remark // ignore: cast_nullable_to_non_nullable
+              as String?,
    ) as $Val);
  }
 }
@@ -149,7 +156,8 @@ abstract class _$$CreateWarehouseLocationRequestImplCopyWith<$Res>
      String? country,
      int? capacity,
      @JsonKey(name: 'manager_id') int? managerId,
-      @JsonKey(name: 'company_id') int? companyId});
+      @JsonKey(name: 'company_id') int? companyId,
+      String? remark});
 }

 /// @nodoc
@@ -176,6 +184,7 @@ class __$$CreateWarehouseLocationRequestImplCopyWithImpl<$Res>
    Object? capacity = freezed,
    Object? managerId = freezed,
    Object? companyId = freezed,
+    Object? remark = freezed,
  }) {
    return _then(_$CreateWarehouseLocationRequestImpl(
      name: null == name
@@ -214,6 +223,10 @@ class __$$CreateWarehouseLocationRequestImplCopyWithImpl<$Res>
          ? _value.companyId
          : companyId // ignore: cast_nullable_to_non_nullable
              as int?,
+      remark: freezed == remark
+          ? _value.remark
+          : remark // ignore: cast_nullable_to_non_nullable
+              as String?,
    ));
  }
 }
@@ -231,7 +244,8 @@ class _$CreateWarehouseLocationRequestImpl
      this.country,
      this.capacity,
      @JsonKey(name: 'manager_id') this.managerId,
-      @JsonKey(name: 'company_id') this.companyId});
+      @JsonKey(name: 'company_id') this.companyId,
+      this.remark});

  factory _$CreateWarehouseLocationRequestImpl.fromJson(
          Map<String, dynamic> json) =>
@@ -258,10 +272,12 @@ class _$CreateWarehouseLocationRequestImpl
  @override
  @JsonKey(name: 'company_id')
  final int? companyId;
+  @override
+  final String? remark;

  @override
  String toString() {
-    return 'CreateWarehouseLocationRequest(name: $name, address: $address, city: $city, state: $state, postalCode: $postalCode, country: $country, capacity: $capacity, managerId: $managerId, companyId: $companyId)';
+    return 'CreateWarehouseLocationRequest(name: $name, address: $address, city: $city, state: $state, postalCode: $postalCode, country: $country, capacity: $capacity, managerId: $managerId, companyId: $companyId, remark: $remark)';
  }

  @override
@@ -281,13 +297,14 @@ class _$CreateWarehouseLocationRequestImpl
            (identical(other.managerId, managerId) ||
                other.managerId == managerId) &&
            (identical(other.companyId, companyId) ||
-                other.companyId == companyId));
+                other.companyId == companyId) &&
+            (identical(other.remark, remark) || other.remark == remark));
  }

  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  int get hashCode => Object.hash(runtimeType, name, address, city, state,
-      postalCode, country, capacity, managerId, companyId);
+      postalCode, country, capacity, managerId, companyId, remark);

  /// Create a copy of CreateWarehouseLocationRequest
  /// with the given fields replaced by the non-null parameter values.
@@ -310,16 +327,16 @@ class _$CreateWarehouseLocationRequestImpl
 abstract class _CreateWarehouseLocationRequest
    implements CreateWarehouseLocationRequest {
  const factory _CreateWarehouseLocationRequest(
-          {required final String name,
-          final String? address,
-          final String? city,
-          final String? state,
-          @JsonKey(name: 'postal_code') final String? postalCode,
-          final String? country,
-          final int? capacity,
-          @JsonKey(name: 'manager_id') final int? managerId,
-          @JsonKey(name: 'company_id') final int? companyId}) =
-      _$CreateWarehouseLocationRequestImpl;
+      {required final String name,
+      final String? address,
+      final String? city,
+      final String? state,
+      @JsonKey(name: 'postal_code') final String? postalCode,
+      final String? country,
+      final int? capacity,
+      @JsonKey(name: 'manager_id') final int? managerId,
+      @JsonKey(name: 'company_id') final int? companyId,
+      final String? remark}) = _$CreateWarehouseLocationRequestImpl;

  factory _CreateWarehouseLocationRequest.fromJson(Map<String, dynamic> json) =
      _$CreateWarehouseLocationRequestImpl.fromJson;
@@ -345,6 +362,8 @@ abstract class _CreateWarehouseLocationRequest
  @override
  @JsonKey(name: 'company_id')
  int? get companyId;
+  @override
+  String? get remark;

  /// Create a copy of CreateWarehouseLocationRequest
  /// with the given fields replaced by the non-null parameter values.
@@ -374,6 +393,7 @@ mixin _$UpdateWarehouseLocationRequest {
  int? get managerId => throw _privateConstructorUsedError;
  @JsonKey(name: 'is_active')
  bool? get isActive => throw _privateConstructorUsedError;
+  String? get remark => throw _privateConstructorUsedError;

  /// Serializes this UpdateWarehouseLocationRequest to a JSON map.
  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@@ -402,7 +422,8 @@ abstract class $UpdateWarehouseLocationRequestCopyWith<$Res> {
      String? country,
      int? capacity,
      @JsonKey(name: 'manager_id') int? managerId,
-      @JsonKey(name: 'is_active') bool? isActive});
+      @JsonKey(name: 'is_active') bool? isActive,
+      String? remark});
 }

 /// @nodoc
@@ -430,6 +451,7 @@ class _$UpdateWarehouseLocationRequestCopyWithImpl<$Res,
    Object? capacity = freezed,
    Object? managerId = freezed,
    Object? isActive = freezed,
+    Object? remark = freezed,
  }) {
    return _then(_value.copyWith(
      name: freezed == name
@@ -468,6 +490,10 @@ class _$UpdateWarehouseLocationRequestCopyWithImpl<$Res,
          ? _value.isActive
          : isActive // ignore: cast_nullable_to_non_nullable
              as bool?,
+      remark: freezed == remark
+          ? _value.remark
+          : remark // ignore: cast_nullable_to_non_nullable
+              as String?,
    ) as $Val);
  }
 }
@@ -490,7 +516,8 @@ abstract class _$$UpdateWarehouseLocationRequestImplCopyWith<$Res>
      String? country,
      int? capacity,
      @JsonKey(name: 'manager_id') int? managerId,
-      @JsonKey(name: 'is_active') bool? isActive});
+      @JsonKey(name: 'is_active') bool? isActive,
+      String? remark});
 }

 /// @nodoc
@@ -517,6 +544,7 @@ class __$$UpdateWarehouseLocationRequestImplCopyWithImpl<$Res>
    Object? capacity = freezed,
    Object? managerId = freezed,
    Object? isActive = freezed,
+    Object? remark = freezed,
  }) {
    return _then(_$UpdateWarehouseLocationRequestImpl(
      name: freezed == name
@@ -555,6 +583,10 @@ class __$$UpdateWarehouseLocationRequestImplCopyWithImpl<$Res>
          ? _value.isActive
          : isActive // ignore: cast_nullable_to_non_nullable
              as bool?,
+      remark: freezed == remark
+          ? _value.remark
+          : remark // ignore: cast_nullable_to_non_nullable
+              as String?,
    ));
  }
 }
@@ -572,7 +604,8 @@ class _$UpdateWarehouseLocationRequestImpl
      this.country,
      this.capacity,
      @JsonKey(name: 'manager_id') this.managerId,
-      @JsonKey(name: 'is_active') this.isActive});
+      @JsonKey(name: 'is_active') this.isActive,
+      this.remark});

  factory _$UpdateWarehouseLocationRequestImpl.fromJson(
          Map<String, dynamic> json) =>
@@ -599,10 +632,12 @@ class _$UpdateWarehouseLocationRequestImpl
  @override
  @JsonKey(name: 'is_active')
  final bool? isActive;
+  @override
+  final String? remark;

  @override
  String toString() {
-    return 'UpdateWarehouseLocationRequest(name: $name, address: $address, city: $city, state: $state, postalCode: $postalCode, country: $country, capacity: $capacity, managerId: $managerId, isActive: $isActive)';
+    return 'UpdateWarehouseLocationRequest(name: $name, address: $address, city: $city, state: $state, postalCode: $postalCode, country: $country, capacity: $capacity, managerId: $managerId, isActive: $isActive, remark: $remark)';
  }

  @override
@@ -622,13 +657,14 @@ class _$UpdateWarehouseLocationRequestImpl
            (identical(other.managerId, managerId) ||
                other.managerId == managerId) &&
            (identical(other.isActive, isActive) ||
-                other.isActive == isActive));
+                other.isActive == isActive) &&
+            (identical(other.remark, remark) || other.remark == remark));
  }

  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  int get hashCode => Object.hash(runtimeType, name, address, city, state,
-      postalCode, country, capacity, managerId, isActive);
+      postalCode, country, capacity, managerId, isActive, remark);

  /// Create a copy of UpdateWarehouseLocationRequest
  /// with the given fields replaced by the non-null parameter values.
@@ -651,16 +687,16 @@ class _$UpdateWarehouseLocationRequestImpl
 abstract class _UpdateWarehouseLocationRequest
    implements UpdateWarehouseLocationRequest {
  const factory _UpdateWarehouseLocationRequest(
-          {final String? name,
-          final String? address,
-          final String? city,
-          final String? state,
-          @JsonKey(name: 'postal_code') final String? postalCode,
-          final String? country,
-          final int? capacity,
-          @JsonKey(name: 'manager_id') final int? managerId,
-          @JsonKey(name: 'is_active') final bool? isActive}) =
-      _$UpdateWarehouseLocationRequestImpl;
+      {final String? name,
+      final String? address,
+      final String? city,
+      final String? state,
+      @JsonKey(name: 'postal_code') final String? postalCode,
+      final String? country,
+      final int? capacity,
+      @JsonKey(name: 'manager_id') final int? managerId,
+      @JsonKey(name: 'is_active') final bool? isActive,
+      final String? remark}) = _$UpdateWarehouseLocationRequestImpl;

  factory _UpdateWarehouseLocationRequest.fromJson(Map<String, dynamic> json) =
      _$UpdateWarehouseLocationRequestImpl.fromJson;
@@ -686,6 +722,8 @@ abstract class _UpdateWarehouseLocationRequest
  @override
  @JsonKey(name: 'is_active')
  bool? get isActive;
+  @override
+  String? get remark;

  /// Create a copy of UpdateWarehouseLocationRequest
  /// with the given fields replaced by the non-null parameter values.
--- a/lib/data/models/warehouse/warehouse_dto.g.dart
+++ b/lib/data/models/warehouse/warehouse_dto.g.dart
@@ -18,6 +18,7 @@ _$CreateWarehouseLocationRequestImpl
          capacity: (json['capacity'] as num?)?.toInt(),
          managerId: (json['manager_id'] as num?)?.toInt(),
          companyId: (json['company_id'] as num?)?.toInt(),
+          remark: json['remark'] as String?,
        );

 Map<String, dynamic> _$$CreateWarehouseLocationRequestImplToJson(
@@ -32,6 +33,7 @@ Map<String, dynamic> _$$CreateWarehouseLocationRequestImplToJson(
      'capacity': instance.capacity,
      'manager_id': instance.managerId,
      'company_id': instance.companyId,
+      'remark': instance.remark,
    };

 _$UpdateWarehouseLocationRequestImpl
@@ -46,6 +48,7 @@ _$UpdateWarehouseLocationRequestImpl
          capacity: (json['capacity'] as num?)?.toInt(),
          managerId: (json['manager_id'] as num?)?.toInt(),
          isActive: json['is_active'] as bool?,
+          remark: json['remark'] as String?,
        );

 Map<String, dynamic> _$$UpdateWarehouseLocationRequestImplToJson(
@@ -60,6 +63,7 @@ Map<String, dynamic> _$$UpdateWarehouseLocationRequestImplToJson(
      'capacity': instance.capacity,
      'manager_id': instance.managerId,
      'is_active': instance.isActive,
+      'remark': instance.remark,
    };

 _$WarehouseLocationDtoImpl _$$WarehouseLocationDtoImplFromJson(