feat(approvals): Approval Flow v2 프런트엔드 전면 개편
- 환경/라우터 모듈에 approval_flow_v2 토글을 추가하고 FeatureFlags 초기화를 연결 (.env*, lib/core/**) - ApiClient 빌더·ApiRoutes 확장과 ApprovalRepositoryRemote 리팩터링으로 include·액션 시그니처를 정합화 - ApprovalFlow·ApprovalDraft 엔티티/레포/유즈케이스를 도입해 서버 초안과 단계 액션(승인·회수·재상신)을 지원 - Approval 컨트롤러·히스토리·템플릿 페이지와 공유 위젯을 재작성해 감사 로그·회수 UX·템플릿 CRUD를 반영 - Inbound/Outbound/Rental 컨트롤러·페이지에 결재 섹션을 삽입하고 대시보드 pending 카드 요약을 갱신 - SuperportDialog·FormField 등 공통 위젯을 보강하고 승인 위젯 가이드를 추가해 UI 가이드를 정리 - 결재/재고 테스트 픽스처와 단위·위젯·통합 테스트를 확장하고 flutter_test_config로 스테이징 호스트를 허용 - Approval Flow 레포트/플랜 문서를 업데이트하고 ApprovalFlow_System_Integration_and_ChangePlan.md를 추가 - 실행: flutter analyze, flutter test
This commit is contained in:
@@ -0,0 +1,43 @@
|
||||
import '../../../transactions/domain/entities/stock_transaction_input.dart';
|
||||
|
||||
/// 출고 생성 요청 입력 값.
|
||||
///
|
||||
/// - 결재 구성을 포함한 재고 트랜잭션 생성 데이터를 보관한다.
|
||||
class CreateOutboundRequestInput {
|
||||
CreateOutboundRequestInput({
|
||||
required this.transactionTypeId,
|
||||
required this.transactionStatusId,
|
||||
required this.warehouseId,
|
||||
required this.transactionDate,
|
||||
required this.createdById,
|
||||
required this.approval,
|
||||
this.note,
|
||||
this.lines = const [],
|
||||
this.customers = const [],
|
||||
});
|
||||
|
||||
final int transactionTypeId;
|
||||
final int transactionStatusId;
|
||||
final int warehouseId;
|
||||
final DateTime transactionDate;
|
||||
final int createdById;
|
||||
final String? note;
|
||||
final List<TransactionLineCreateInput> lines;
|
||||
final List<TransactionCustomerCreateInput> customers;
|
||||
final StockTransactionApprovalInput approval;
|
||||
|
||||
/// 공통 재고 트랜잭션 입력 모델로 변환한다.
|
||||
StockTransactionCreateInput toTransactionInput() {
|
||||
return StockTransactionCreateInput(
|
||||
transactionTypeId: transactionTypeId,
|
||||
transactionStatusId: transactionStatusId,
|
||||
warehouseId: warehouseId,
|
||||
transactionDate: transactionDate,
|
||||
createdById: createdById,
|
||||
note: note,
|
||||
lines: lines,
|
||||
customers: customers,
|
||||
approval: approval,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,13 @@
|
||||
import 'dart:async';
|
||||
import 'dart:collection';
|
||||
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:superport_v2/core/common/models/paginated_result.dart';
|
||||
import 'package:superport_v2/core/network/failure.dart';
|
||||
import 'package:superport_v2/features/approvals/domain/entities/approval_draft.dart';
|
||||
import 'package:superport_v2/features/approvals/domain/usecases/get_approval_draft_use_case.dart';
|
||||
import 'package:superport_v2/features/approvals/domain/usecases/list_approval_drafts_use_case.dart';
|
||||
import 'package:superport_v2/features/approvals/domain/usecases/save_approval_draft_use_case.dart';
|
||||
import 'package:superport_v2/features/inventory/lookups/domain/entities/lookup_item.dart';
|
||||
import 'package:superport_v2/features/inventory/lookups/domain/repositories/inventory_lookup_repository.dart';
|
||||
import 'package:superport_v2/features/inventory/outbound/presentation/models/outbound_record.dart';
|
||||
@@ -20,10 +25,16 @@ class OutboundController extends ChangeNotifier {
|
||||
required InventoryLookupRepository lookupRepository,
|
||||
List<String> fallbackStatusOptions = const ['작성중', '출고대기', '출고완료'],
|
||||
List<String> transactionTypeKeywords = const ['출고', 'outbound'],
|
||||
SaveApprovalDraftUseCase? saveDraftUseCase,
|
||||
GetApprovalDraftUseCase? getDraftUseCase,
|
||||
ListApprovalDraftsUseCase? listDraftsUseCase,
|
||||
}) : _transactionRepository = transactionRepository,
|
||||
_lineRepository = lineRepository,
|
||||
_customerRepository = customerRepository,
|
||||
_lookupRepository = lookupRepository,
|
||||
_saveDraftUseCase = saveDraftUseCase,
|
||||
_getDraftUseCase = getDraftUseCase,
|
||||
_listDraftsUseCase = listDraftsUseCase,
|
||||
_fallbackStatusOptions = List<String>.unmodifiable(
|
||||
fallbackStatusOptions,
|
||||
),
|
||||
@@ -37,6 +48,9 @@ class OutboundController extends ChangeNotifier {
|
||||
final TransactionLineRepository _lineRepository;
|
||||
final TransactionCustomerRepository _customerRepository;
|
||||
final InventoryLookupRepository _lookupRepository;
|
||||
final SaveApprovalDraftUseCase? _saveDraftUseCase;
|
||||
final GetApprovalDraftUseCase? _getDraftUseCase;
|
||||
final ListApprovalDraftsUseCase? _listDraftsUseCase;
|
||||
final List<String> _fallbackStatusOptions;
|
||||
final List<String> _transactionTypeKeywords;
|
||||
|
||||
@@ -49,6 +63,7 @@ class OutboundController extends ChangeNotifier {
|
||||
String? _errorMessage;
|
||||
StockTransactionListFilter? _lastFilter;
|
||||
final Set<int> _processingTransactionIds = <int>{};
|
||||
StockTransactionApprovalInput? _approvalDraft;
|
||||
|
||||
UnmodifiableListView<String> get statusOptions =>
|
||||
UnmodifiableListView(_statusOptions);
|
||||
@@ -73,6 +88,7 @@ class OutboundController extends ChangeNotifier {
|
||||
|
||||
UnmodifiableSetView<int> get processingTransactionIds =>
|
||||
UnmodifiableSetView(_processingTransactionIds);
|
||||
StockTransactionApprovalInput? get approvalDraft => _approvalDraft;
|
||||
|
||||
/// 트랜잭션 상태 값을 불러온다.
|
||||
Future<void> loadStatusOptions() async {
|
||||
@@ -119,6 +135,64 @@ class OutboundController extends ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
/// 결재 구성 초안 상태를 갱신한다.
|
||||
void updateApprovalDraft(StockTransactionApprovalInput approval) {
|
||||
_approvalDraft = approval;
|
||||
notifyListeners();
|
||||
_persistApprovalDraft(approval);
|
||||
}
|
||||
|
||||
/// 결재 구성 초안을 초기화한다.
|
||||
void clearApprovalDraft() {
|
||||
if (_approvalDraft == null) {
|
||||
return;
|
||||
}
|
||||
_approvalDraft = null;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> loadApprovalDraftFromServer({
|
||||
required int requesterId,
|
||||
int? transactionId,
|
||||
}) async {
|
||||
final listUseCase = _listDraftsUseCase;
|
||||
final getUseCase = _getDraftUseCase;
|
||||
if (listUseCase == null || getUseCase == null) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
final result = await listUseCase.call(
|
||||
ApprovalDraftListFilter(
|
||||
requesterId: requesterId,
|
||||
transactionId: transactionId,
|
||||
pageSize: 10,
|
||||
),
|
||||
);
|
||||
if (result.items.isEmpty) {
|
||||
return;
|
||||
}
|
||||
final sessionKey = _draftSessionKey(
|
||||
requesterId,
|
||||
transactionId: transactionId,
|
||||
);
|
||||
final summary = result.items.firstWhere(
|
||||
(item) => item.sessionKey == sessionKey,
|
||||
orElse: () => result.items.first,
|
||||
);
|
||||
final detail = await getUseCase.call(
|
||||
id: summary.id,
|
||||
requesterId: requesterId,
|
||||
);
|
||||
if (detail == null) {
|
||||
return;
|
||||
}
|
||||
_approvalDraft = _toTransactionApproval(detail);
|
||||
notifyListeners();
|
||||
} catch (error, stackTrace) {
|
||||
debugPrint('[OutboundController] 초안 복구 실패: $error\n$stackTrace');
|
||||
}
|
||||
}
|
||||
|
||||
/// 조건에 맞는 출고 트랜잭션 목록을 요청한다.
|
||||
Future<void> fetchTransactions({
|
||||
required StockTransactionListFilter filter,
|
||||
@@ -159,12 +233,91 @@ class OutboundController extends ChangeNotifier {
|
||||
await fetchTransactions(filter: target);
|
||||
}
|
||||
|
||||
void _persistApprovalDraft(StockTransactionApprovalInput approval) {
|
||||
final useCase = _saveDraftUseCase;
|
||||
if (useCase == null) {
|
||||
return;
|
||||
}
|
||||
if (approval.steps.isEmpty) {
|
||||
return;
|
||||
}
|
||||
final input = _buildApprovalDraftSaveInput(approval);
|
||||
if (!input.hasSteps) {
|
||||
return;
|
||||
}
|
||||
unawaited(
|
||||
Future<void>(() async {
|
||||
try {
|
||||
await useCase.call(input);
|
||||
} catch (error, stackTrace) {
|
||||
debugPrint('[OutboundController] 초안 저장 실패: $error\n$stackTrace');
|
||||
}
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
ApprovalDraftSaveInput _buildApprovalDraftSaveInput(
|
||||
StockTransactionApprovalInput approval,
|
||||
) {
|
||||
final steps = approval.steps
|
||||
.map(
|
||||
(step) => ApprovalDraftStep(
|
||||
stepOrder: step.stepOrder,
|
||||
approverId: step.approverId,
|
||||
note: step.note,
|
||||
),
|
||||
)
|
||||
.toList(growable: false);
|
||||
return ApprovalDraftSaveInput(
|
||||
requesterId: approval.requestedById,
|
||||
transactionId: null,
|
||||
templateId: approval.templateId,
|
||||
title: approval.title,
|
||||
summary: approval.summary,
|
||||
note: approval.note,
|
||||
metadata: approval.metadata,
|
||||
sessionKey: _draftSessionKey(approval.requestedById),
|
||||
statusId: approval.approvalStatusId,
|
||||
steps: steps,
|
||||
);
|
||||
}
|
||||
|
||||
String _draftSessionKey(int requesterId, {int? transactionId}) {
|
||||
final base = 'inventory_outbound_$requesterId';
|
||||
if (transactionId == null) {
|
||||
return base;
|
||||
}
|
||||
return '${base}_$transactionId';
|
||||
}
|
||||
|
||||
StockTransactionApprovalInput _toTransactionApproval(
|
||||
ApprovalDraftDetail detail,
|
||||
) {
|
||||
final submission = detail.toSubmissionInput(defaultStatusId: null);
|
||||
return StockTransactionApprovalInput(
|
||||
requestedById: submission.requesterId,
|
||||
approvalStatusId: submission.statusId == 0 ? null : submission.statusId,
|
||||
templateId: submission.templateId,
|
||||
finalApproverId: submission.finalApproverId,
|
||||
requestedAt: submission.requestedAt,
|
||||
decidedAt: submission.decidedAt,
|
||||
cancelledAt: submission.cancelledAt,
|
||||
lastActionAt: submission.lastActionAt,
|
||||
title: submission.title,
|
||||
summary: submission.summary,
|
||||
note: submission.note,
|
||||
metadata: submission.metadata,
|
||||
steps: submission.steps,
|
||||
);
|
||||
}
|
||||
|
||||
/// 출고 트랜잭션을 생성한다.
|
||||
Future<OutboundRecord> createTransaction(
|
||||
StockTransactionCreateInput input, {
|
||||
bool refreshAfter = true,
|
||||
StockTransactionListFilter? refreshFilter,
|
||||
}) {
|
||||
_approvalDraft = input.approval;
|
||||
return _executeMutation(
|
||||
() => _transactionRepository.create(input),
|
||||
refreshAfter: refreshAfter,
|
||||
|
||||
@@ -16,6 +16,13 @@ import 'package:superport_v2/features/inventory/shared/widgets/product_autocompl
|
||||
import 'package:superport_v2/features/inventory/shared/widgets/employee_autocomplete_field.dart';
|
||||
import 'package:superport_v2/features/inventory/shared/widgets/customer_multi_select_field.dart';
|
||||
import 'package:superport_v2/features/inventory/shared/widgets/warehouse_select_field.dart';
|
||||
import 'package:superport_v2/features/approvals/request/presentation/controllers/approval_request_controller.dart';
|
||||
import 'package:superport_v2/features/approvals/request/presentation/utils/approval_form_initializer.dart';
|
||||
import 'package:superport_v2/features/approvals/request/presentation/widgets/approval_step_configurator.dart';
|
||||
import 'package:superport_v2/features/approvals/request/presentation/widgets/approval_template_picker.dart';
|
||||
import 'package:superport_v2/features/approvals/domain/usecases/get_approval_draft_use_case.dart';
|
||||
import 'package:superport_v2/features/approvals/domain/usecases/list_approval_drafts_use_case.dart';
|
||||
import 'package:superport_v2/features/approvals/domain/usecases/save_approval_draft_use_case.dart';
|
||||
import 'package:superport_v2/core/config/environment.dart';
|
||||
import 'package:superport_v2/core/network/failure.dart';
|
||||
import 'package:superport_v2/core/common/utils/pagination_utils.dart';
|
||||
@@ -31,6 +38,7 @@ import 'package:superport_v2/features/inventory/transactions/presentation/servic
|
||||
import 'package:superport_v2/features/inventory/transactions/presentation/widgets/transaction_detail_dialog.dart';
|
||||
import 'package:superport_v2/features/masters/customer/domain/entities/customer.dart';
|
||||
import 'package:superport_v2/features/masters/customer/domain/repositories/customer_repository.dart';
|
||||
import 'package:superport_v2/features/auth/application/auth_service.dart';
|
||||
import '../../../lookups/domain/entities/lookup_item.dart';
|
||||
import '../../../lookups/domain/repositories/inventory_lookup_repository.dart';
|
||||
import '../widgets/outbound_detail_view.dart';
|
||||
@@ -133,6 +141,15 @@ class _OutboundPageState extends State<OutboundPage> {
|
||||
lookupRepository: getIt<InventoryLookupRepository>(),
|
||||
fallbackStatusOptions: OutboundTableSpec.fallbackStatusOptions,
|
||||
transactionTypeKeywords: OutboundTableSpec.transactionTypeKeywords,
|
||||
saveDraftUseCase: getIt.isRegistered<SaveApprovalDraftUseCase>()
|
||||
? getIt<SaveApprovalDraftUseCase>()
|
||||
: null,
|
||||
getDraftUseCase: getIt.isRegistered<GetApprovalDraftUseCase>()
|
||||
? getIt<GetApprovalDraftUseCase>()
|
||||
: null,
|
||||
listDraftsUseCase: getIt.isRegistered<ListApprovalDraftsUseCase>()
|
||||
? getIt<ListApprovalDraftsUseCase>()
|
||||
: null,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -143,6 +160,10 @@ class _OutboundPageState extends State<OutboundPage> {
|
||||
}
|
||||
Future.microtask(() async {
|
||||
await controller.loadStatusOptions();
|
||||
final requester = _resolveCurrentWriter();
|
||||
if (requester != null) {
|
||||
await controller.loadApprovalDraftFromServer(requesterId: requester.id);
|
||||
}
|
||||
final hasType = await controller.resolveTransactionType();
|
||||
if (!mounted) {
|
||||
return;
|
||||
@@ -213,6 +234,26 @@ class _OutboundPageState extends State<OutboundPage> {
|
||||
}
|
||||
}
|
||||
|
||||
InventoryEmployeeSuggestion? _resolveCurrentWriter() {
|
||||
final getIt = GetIt.I;
|
||||
if (!getIt.isRegistered<AuthService>()) {
|
||||
return null;
|
||||
}
|
||||
final session = getIt<AuthService>().session;
|
||||
final user = session?.user;
|
||||
if (user == null) {
|
||||
return null;
|
||||
}
|
||||
final employeeNo = (user.employeeNo ?? '').trim().isEmpty
|
||||
? user.id.toString()
|
||||
: user.employeeNo!.trim();
|
||||
return InventoryEmployeeSuggestion(
|
||||
id: user.id,
|
||||
employeeNo: employeeNo,
|
||||
name: user.name,
|
||||
);
|
||||
}
|
||||
|
||||
void _handleControllerChanged() {
|
||||
if (!mounted) {
|
||||
return;
|
||||
@@ -1556,6 +1597,25 @@ class _OutboundPageState extends State<OutboundPage> {
|
||||
return '${suggestion.name} (${suggestion.employeeNo})';
|
||||
}
|
||||
|
||||
final approvalController = ApprovalRequestController();
|
||||
final defaultRequester = () {
|
||||
final writer = writerSelection;
|
||||
if (writer == null) {
|
||||
return null;
|
||||
}
|
||||
return ApprovalRequestParticipant(
|
||||
id: writer.id,
|
||||
name: writer.name,
|
||||
employeeNo: writer.employeeNo,
|
||||
);
|
||||
}();
|
||||
ApprovalFormInitializer.populate(
|
||||
controller: approvalController,
|
||||
existingApproval: initial?.raw?.approval,
|
||||
draft: _controller?.approvalDraft,
|
||||
defaultRequester: defaultRequester,
|
||||
);
|
||||
|
||||
final writerController = TextEditingController(
|
||||
text: writerLabel(writerSelection),
|
||||
);
|
||||
@@ -1814,6 +1874,23 @@ class _OutboundPageState extends State<OutboundPage> {
|
||||
)
|
||||
.toList(growable: false);
|
||||
|
||||
StockTransactionApprovalInput approvalInput;
|
||||
try {
|
||||
approvalInput = approvalController.buildTransactionApprovalInput(
|
||||
approvalStatusId: null,
|
||||
note: approvalNoteValue.isEmpty ? null : approvalNoteValue,
|
||||
);
|
||||
} on StateError catch (error) {
|
||||
updateSaving(false);
|
||||
SuperportToast.error(context, error.message);
|
||||
return;
|
||||
} catch (_) {
|
||||
updateSaving(false);
|
||||
SuperportToast.error(context, '결재 구성을 확인하고 다시 시도하세요.');
|
||||
return;
|
||||
}
|
||||
controller.updateApprovalDraft(approvalInput);
|
||||
|
||||
final created = await controller.createTransaction(
|
||||
StockTransactionCreateInput(
|
||||
transactionTypeId: transactionTypeLookup.id,
|
||||
@@ -1824,10 +1901,7 @@ class _OutboundPageState extends State<OutboundPage> {
|
||||
note: remarkValue,
|
||||
lines: createLines,
|
||||
customers: createCustomers,
|
||||
approval: StockTransactionApprovalInput(
|
||||
requestedById: createdById,
|
||||
note: approvalNoteValue.isEmpty ? null : approvalNoteValue,
|
||||
),
|
||||
approval: approvalInput,
|
||||
),
|
||||
);
|
||||
result = created;
|
||||
@@ -2011,6 +2085,15 @@ class _OutboundPageState extends State<OutboundPage> {
|
||||
enabled: initial == null,
|
||||
onSuggestionSelected: (suggestion) {
|
||||
writerSelection = suggestion;
|
||||
approvalController.setRequester(
|
||||
suggestion == null
|
||||
? null
|
||||
: ApprovalRequestParticipant(
|
||||
id: suggestion.id,
|
||||
name: suggestion.name,
|
||||
employeeNo: suggestion.employeeNo,
|
||||
),
|
||||
);
|
||||
if (writerError != null) {
|
||||
setState(() {
|
||||
writerError = null;
|
||||
@@ -2026,6 +2109,7 @@ class _OutboundPageState extends State<OutboundPage> {
|
||||
if (currentText.isEmpty ||
|
||||
currentText != selectedLabel) {
|
||||
writerSelection = null;
|
||||
approvalController.setRequester(null);
|
||||
}
|
||||
if (writerError != null) {
|
||||
setState(() {
|
||||
@@ -2099,6 +2183,15 @@ class _OutboundPageState extends State<OutboundPage> {
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
if (initial == null) ...[
|
||||
ApprovalTemplatePicker(controller: approvalController),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
ApprovalStepConfigurator(
|
||||
controller: approvalController,
|
||||
readOnly: initial != null,
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
if (headerNotice != null)
|
||||
Padding(
|
||||
@@ -2215,6 +2308,7 @@ class _OutboundPageState extends State<OutboundPage> {
|
||||
transactionTypeController.dispose();
|
||||
approvalNoteController.dispose();
|
||||
processedAt.dispose();
|
||||
approvalController.dispose();
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -27,10 +27,7 @@ class OutboundDetailView extends StatelessWidget {
|
||||
children: [
|
||||
if (!transitionsEnabled) ...[
|
||||
ShadBadge.outline(
|
||||
child: Text(
|
||||
'재고 상태 전이가 비활성화된 상태입니다.',
|
||||
style: theme.textTheme.small,
|
||||
),
|
||||
child: Text('재고 상태 전이가 비활성화된 상태입니다.', style: theme.textTheme.small),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
@@ -76,8 +73,10 @@ class OutboundDetailView extends StatelessWidget {
|
||||
for (final customer in record.customers)
|
||||
ShadBadge(
|
||||
child: Padding(
|
||||
padding:
|
||||
const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 10,
|
||||
vertical: 6,
|
||||
),
|
||||
child: Text('${customer.name} · ${customer.code}'),
|
||||
),
|
||||
),
|
||||
@@ -111,9 +110,7 @@ class OutboundDetailView extends StatelessWidget {
|
||||
ShadTableCell(child: Text(item.manufacturer)),
|
||||
ShadTableCell(child: Text(item.unit)),
|
||||
ShadTableCell(child: Text('${item.quantity}')),
|
||||
ShadTableCell(
|
||||
child: Text(currencyFormatter.format(item.price)),
|
||||
),
|
||||
ShadTableCell(child: Text(currencyFormatter.format(item.price))),
|
||||
ShadTableCell(
|
||||
child: Text(item.remark.isEmpty ? '-' : item.remark),
|
||||
),
|
||||
@@ -146,13 +143,13 @@ class _DetailChip extends StatelessWidget {
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
Text(label, style: theme.textTheme.small, textAlign: TextAlign.center),
|
||||
const SizedBox(height: 4),
|
||||
Text(
|
||||
value,
|
||||
style: theme.textTheme.p,
|
||||
label,
|
||||
style: theme.textTheme.small,
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
Text(value, style: theme.textTheme.p, textAlign: TextAlign.center),
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user