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/services/company_service.dart
+++ b/lib/services/company_service.dart
@@ -22,6 +22,7 @@ class CompanyService {
    int perPage = 20,
    String? search,
    bool? isActive,
+    bool includeInactive = false,
  }) async {
    try {
      final response = await _remoteDataSource.getCompanies(
@@ -29,6 +30,7 @@ class CompanyService {
        perPage: perPage,
        search: search,
        isActive: isActive,
+        includeInactive: includeInactive,
      );

      return PaginatedResponse<Company>(
--- a/lib/services/equipment_service.dart
+++ b/lib/services/equipment_service.dart
@@ -23,6 +23,7 @@ class EquipmentService {
    int? companyId,
    int? warehouseLocationId,
    String? search,
+    bool includeInactive = false,
  }) async {
    try {
      final response = await _remoteDataSource.getEquipments(
@@ -32,6 +33,7 @@ class EquipmentService {
        companyId: companyId,
        warehouseLocationId: warehouseLocationId,
        search: search,
+        includeInactive: includeInactive,
      );

      return PaginatedResponse<EquipmentListDto>(
@@ -58,6 +60,7 @@ class EquipmentService {
    int? companyId,
    int? warehouseLocationId,
    String? search,
+    bool includeInactive = false,
  }) async {
    try {
      final response = await _remoteDataSource.getEquipments(
@@ -67,6 +70,7 @@ class EquipmentService {
        companyId: companyId,
        warehouseLocationId: warehouseLocationId,
        search: search,
+        includeInactive: includeInactive,
      );

      return PaginatedResponse<Equipment>(
@@ -125,15 +129,15 @@ class EquipmentService {
  Future<Equipment> createEquipment(Equipment equipment) async {
    try {
      final request = CreateEquipmentRequest(
-        equipmentNumber: equipment.name, // Flutter model uses 'name' for equipment number
+        equipmentNumber: 'EQ-${DateTime.now().millisecondsSinceEpoch}', // 자동 생성 번호
        category1: equipment.category,
        category2: equipment.subCategory,
        category3: equipment.subSubCategory,
        manufacturer: equipment.manufacturer,
-        modelName: equipment.name,
+        modelName: equipment.name, // 실제 장비명
        serialNumber: equipment.serialNumber,
        purchaseDate: equipment.inDate,
-        purchasePrice: equipment.quantity.toDouble(), // Temporary mapping
+        purchasePrice: null, // 가격 정보는 별도 관리
        remark: equipment.remark,
      );

@@ -148,12 +152,24 @@ class EquipmentService {

  // 장비 상세 조회
  Future<Equipment> getEquipmentDetail(int id) async {
+    print('DEBUG [EquipmentService.getEquipmentDetail] Called with ID: $id');
    try {
      final response = await _remoteDataSource.getEquipmentDetail(id);
-      return _convertResponseToEquipment(response);
+      print('DEBUG [EquipmentService.getEquipmentDetail] Response received from datasource');
+      print('DEBUG [EquipmentService.getEquipmentDetail] Response data: ${response.toJson()}');
+      
+      final equipment = _convertResponseToEquipment(response);
+      print('DEBUG [EquipmentService.getEquipmentDetail] Converted to Equipment model');
+      print('DEBUG [EquipmentService.getEquipmentDetail] Equipment.manufacturer="${equipment.manufacturer}"');
+      print('DEBUG [EquipmentService.getEquipmentDetail] Equipment.name="${equipment.name}"');
+      
+      return equipment;
    } on ServerException catch (e) {
+      print('ERROR [EquipmentService.getEquipmentDetail] ServerException: ${e.message}');
      throw ServerFailure(message: e.message);
-    } catch (e) {
+    } catch (e, stackTrace) {
+      print('ERROR [EquipmentService.getEquipmentDetail] Unexpected error: $e');
+      print('ERROR [EquipmentService.getEquipmentDetail] Stack trace: $stackTrace');
      throw ServerFailure(message: 'Failed to fetch equipment detail: $e');
    }
  }
@@ -171,11 +187,11 @@ class EquipmentService {
        category2: equipment.subCategory,
        category3: equipment.subSubCategory,
        manufacturer: equipment.manufacturer,
-        modelName: equipment.name,
+        modelName: equipment.name, // 실제 장비명
        serialNumber: equipment.serialNumber,
        barcode: equipment.barcode,
        purchaseDate: equipment.inDate,
-        purchasePrice: equipment.quantity.toDouble(), // Temporary mapping
+        purchasePrice: null, // 가격 정보는 별도 관리
        remark: equipment.remark,
      );

@@ -293,7 +309,7 @@ class EquipmentService {
    return Equipment(
      id: dto.id,
      manufacturer: dto.manufacturer,
-      name: dto.modelName ?? dto.equipmentNumber,
+      name: dto.modelName ?? '', // modelName이 실제 장비명
      category: '', // Need to be fetched from detail or categories
      subCategory: '',
      subSubCategory: '',
@@ -306,10 +322,15 @@ class EquipmentService {
  }

  Equipment _convertResponseToEquipment(EquipmentResponse response) {
-    return Equipment(
+    print('DEBUG [_convertResponseToEquipment] Converting response to Equipment');
+    print('DEBUG [_convertResponseToEquipment] response.manufacturer="${response.manufacturer}"');
+    print('DEBUG [_convertResponseToEquipment] response.modelName="${response.modelName}"');
+    print('DEBUG [_convertResponseToEquipment] response.category1="${response.category1}"');
+    
+    final equipment = Equipment(
      id: response.id,
      manufacturer: response.manufacturer,
-      name: response.modelName ?? response.equipmentNumber,
+      name: response.modelName ?? '', // modelName이 실제 장비명
      category: response.category1 ?? '',
      subCategory: response.category2 ?? '',
      subSubCategory: response.category3 ?? '',
@@ -320,6 +341,12 @@ class EquipmentService {
      remark: response.remark,
      // Warranty information would need to be fetched from license API if available
    );
+    
+    print('DEBUG [_convertResponseToEquipment] Equipment created');
+    print('DEBUG [_convertResponseToEquipment] equipment.manufacturer="${equipment.manufacturer}"');
+    print('DEBUG [_convertResponseToEquipment] equipment.name="${equipment.name}"');
+    
+    return equipment;
  }

  // 장비 상태 상수
--- a/lib/services/license_service.dart
+++ b/lib/services/license_service.dart
@@ -23,6 +23,7 @@ class LicenseService {
    int? companyId,
    int? assignedUserId,
    String? licenseType,
+    bool includeInactive = false,
  }) async {
    debugPrint('\n╔════════════════════════════════════════════════════════════');
    debugPrint('║ 📤 LICENSE API REQUEST');
@@ -35,6 +36,7 @@ class LicenseService {
    if (companyId != null) debugPrint('║   - companyId: $companyId');
    if (assignedUserId != null) debugPrint('║   - assignedUserId: $assignedUserId');
    if (licenseType != null) debugPrint('║   - licenseType: $licenseType');
+    debugPrint('║   - includeInactive: $includeInactive');
    debugPrint('╚════════════════════════════════════════════════════════════\n');
    
    try {
@@ -45,6 +47,7 @@ class LicenseService {
        companyId: companyId,
        assignedUserId: assignedUserId,
        licenseType: licenseType,
+        includeInactive: includeInactive,
      );

      final licenses = response.items.map((dto) => _convertDtoToLicense(dto)).toList();
--- a/lib/services/warehouse_service.dart
+++ b/lib/services/warehouse_service.dart
@@ -18,12 +18,16 @@ class WarehouseService {
    int page = 1,
    int perPage = 20,
    bool? isActive,
+    String? search,
+    bool includeInactive = false,
  }) async {
    try {
      final response = await _remoteDataSource.getWarehouseLocations(
        page: page,
        perPage: perPage,
        isActive: isActive,
+        search: search,
+        includeInactive: includeInactive,
      );

      return PaginatedResponse<WarehouseLocation>(
@@ -66,6 +70,7 @@ class WarehouseService {
        city: location.address.region,
        postalCode: location.address.zipCode,
        country: 'KR', // 기본값
+        remark: location.remark,
      );

      final dto = await _remoteDataSource.createWarehouseLocation(request);
@@ -85,6 +90,8 @@ class WarehouseService {
        address: location.address.detailAddress,
        city: location.address.region,
        postalCode: location.address.zipCode,
+        country: 'KR', // country 필드 추가
+        remark: location.remark,
      );

      final dto = await _remoteDataSource.updateWarehouseLocation(location.id, request);