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>
This commit is contained in:
JiWoong Sul
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user