diff --git a/client/lib/core/api/api_client.dart b/client/lib/core/api/api_client.dart index 53a1317..9d43190 100644 --- a/client/lib/core/api/api_client.dart +++ b/client/lib/core/api/api_client.dart @@ -8,8 +8,8 @@ import '../../providers/connectivity_provider.dart'; /// Public Dio instance for unauthenticated calls (login / refresh) final _publicDio = Dio(BaseOptions( baseUrl: AppConfig.apiBaseUrl, - connectTimeout: const Duration(seconds: 10), - receiveTimeout: const Duration(seconds: 30), + connectTimeout: const Duration(seconds: 5), + receiveTimeout: const Duration(seconds: 15), headers: {'Content-Type': 'application/json'}, )); @@ -52,8 +52,8 @@ class ApiClient { }) { _dio = Dio(BaseOptions( baseUrl: AppConfig.apiBaseUrl, - connectTimeout: const Duration(seconds: 10), - receiveTimeout: const Duration(seconds: 30), + connectTimeout: const Duration(seconds: 5), + receiveTimeout: const Duration(seconds: 15), headers: { 'Content-Type': 'application/json', if (token != null) 'Authorization': 'Bearer $token', diff --git a/client/lib/main.dart b/client/lib/main.dart index f2b9ca0..4c7ce69 100644 --- a/client/lib/main.dart +++ b/client/lib/main.dart @@ -5,6 +5,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'core/auth/auth_state.dart'; import 'core/router/app_router.dart'; import 'core/theme/app_theme.dart'; +import 'providers/connectivity_provider.dart'; void main() { FlutterError.onError = (details) { @@ -57,6 +58,8 @@ class _AppBootstrapState extends ConsumerState<_AppBootstrap> { Future _init() async { await ref.read(authStateProvider.notifier).restore(); + // 启动时立即做一次连通性检测,确保 connectivityProvider 状态在路由跳转前已就绪 + await ref.read(connectivityProvider.notifier).forceCheck(); if (mounted) setState(() => _ready = true); } diff --git a/client/lib/providers/connectivity_provider.dart b/client/lib/providers/connectivity_provider.dart index dc739bc..e4dfa1c 100644 --- a/client/lib/providers/connectivity_provider.dart +++ b/client/lib/providers/connectivity_provider.dart @@ -3,34 +3,67 @@ import 'package:dio/dio.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../core/config/app_config.dart'; +/// 每次从离线恢复到在线时自增。 +/// 数据 provider 通过 watch 此值实现网络恢复后自动刷新。 +final networkRecoveryCountProvider = StateProvider((ref) => 0); + final connectivityProvider = StateNotifierProvider((ref) { - return ConnectivityNotifier(); + return ConnectivityNotifier( + onRecovered: () { + ref.read(networkRecoveryCountProvider.notifier).update((s) => s + 1); + }, + ); }); class ConnectivityNotifier extends StateNotifier { - ConnectivityNotifier() : super(true) { - _check(); // immediate first check - _timer = Timer.periodic(const Duration(seconds: 30), (_) => _check()); + final void Function()? onRecovered; + + ConnectivityNotifier({this.onRecovered, bool skipInit = false}) : super(true) { + if (!skipInit) { + _check(); + _startOnlineTimer(); + } } Timer? _timer; - // Dedicated lightweight Dio — short timeouts, no interceptors + // 独立轻量 Dio:短超时,无拦截器 final _dio = Dio(BaseOptions( connectTimeout: const Duration(seconds: 3), receiveTimeout: const Duration(seconds: 3), )); - /// 立即触发一次检测(供外部调用,如 API 请求失败时) + /// 在线时:每 30 秒检测一次 + void _startOnlineTimer() { + _timer?.cancel(); + _timer = Timer.periodic(const Duration(seconds: 30), (_) => _check()); + } + + /// 离线时:每 1 分钟嗅探一次,降低频率节省资源 + void _startOfflineTimer() { + _timer?.cancel(); + _timer = Timer.periodic(const Duration(minutes: 1), (_) => _check()); + } + + /// 立即触发一次检测(供外部调用,如 API 请求失败 / 启动时) Future forceCheck() => _check(); Future _check() async { try { await _dio.get(AppConfig.healthUrl); - if (!state) state = true; + if (!state) { + // 离线 → 在线:切回高频检测,广播恢复事件 + state = true; + onRecovered?.call(); + _startOnlineTimer(); + } } catch (_) { - if (state) state = false; + if (state) { + // 在线 → 离线:切换为低频嗅探 + state = false; + _startOfflineTimer(); + } } } diff --git a/client/lib/providers/inventory_provider.dart b/client/lib/providers/inventory_provider.dart index 1c23513..4cad29e 100644 --- a/client/lib/providers/inventory_provider.dart +++ b/client/lib/providers/inventory_provider.dart @@ -4,6 +4,7 @@ import '../core/auth/auth_state.dart'; import '../core/models/page_result.dart'; import '../models/inventory.dart'; import '../repositories/inventory_repository.dart'; +import 'connectivity_provider.dart'; final inventoryRepositoryProvider = Provider((ref) { return InventoryRepository(ref.watch(apiClientProvider)); @@ -23,6 +24,7 @@ class InventoryListNotifier extends AsyncNotifier> { @override Future> build() async { ref.watch(authStateProvider.select((s) => s.user?.shopId)); + ref.watch(networkRecoveryCountProvider); // 网络恢复时自动刷新 try { final result = await _fetch(); _cache = result; @@ -86,6 +88,7 @@ class InventoryLogNotifier extends AsyncNotifier> { @override Future> build() async { ref.watch(authStateProvider.select((s) => s.user?.shopId)); + ref.watch(networkRecoveryCountProvider); try { final result = await _fetch(); _cache = result; diff --git a/client/lib/providers/partner_provider.dart b/client/lib/providers/partner_provider.dart index 890a0b1..deae414 100644 --- a/client/lib/providers/partner_provider.dart +++ b/client/lib/providers/partner_provider.dart @@ -4,6 +4,7 @@ import '../core/auth/auth_state.dart'; import '../core/models/page_result.dart'; import '../models/partner.dart'; import '../repositories/partner_repository.dart'; +import 'connectivity_provider.dart'; final partnerRepositoryProvider = Provider((ref) { return PartnerRepository(ref.watch(apiClientProvider)); @@ -32,6 +33,7 @@ class PartnerListNotifier extends AsyncNotifier> { @override Future> build() async { ref.watch(authStateProvider.select((s) => s.user?.shopId)); + ref.watch(networkRecoveryCountProvider); try { final result = await _fetch(); _cache = result; diff --git a/client/lib/providers/product_provider.dart b/client/lib/providers/product_provider.dart index 856c395..c37498c 100644 --- a/client/lib/providers/product_provider.dart +++ b/client/lib/providers/product_provider.dart @@ -4,6 +4,7 @@ import '../core/auth/auth_state.dart'; import '../core/models/page_result.dart'; import '../models/product.dart'; import '../repositories/product_repository.dart'; +import 'connectivity_provider.dart'; final productRepositoryProvider = Provider((ref) { return ProductRepository(ref.watch(apiClientProvider)); @@ -23,6 +24,7 @@ class ProductListNotifier extends AsyncNotifier> { @override Future> build() async { ref.watch(authStateProvider.select((s) => s.user?.shopId)); + ref.watch(networkRecoveryCountProvider); try { final result = await _fetch(); _cache = result; diff --git a/client/lib/providers/stock_in_provider.dart b/client/lib/providers/stock_in_provider.dart index 455467a..9c3dafc 100644 --- a/client/lib/providers/stock_in_provider.dart +++ b/client/lib/providers/stock_in_provider.dart @@ -4,6 +4,7 @@ import '../core/auth/auth_state.dart'; import '../core/models/page_result.dart'; import '../models/stock_in.dart'; import '../repositories/stock_in_repository.dart'; +import 'connectivity_provider.dart'; import 'inventory_provider.dart'; final stockInRepositoryProvider = Provider((ref) { @@ -25,6 +26,7 @@ class StockInListNotifier extends AsyncNotifier> { @override Future> build() async { ref.watch(authStateProvider.select((s) => s.user?.shopId)); + ref.watch(networkRecoveryCountProvider); try { final result = await _fetch(); _cache = result; diff --git a/client/lib/providers/stock_out_provider.dart b/client/lib/providers/stock_out_provider.dart index 5a091d0..e5d0716 100644 --- a/client/lib/providers/stock_out_provider.dart +++ b/client/lib/providers/stock_out_provider.dart @@ -4,6 +4,7 @@ import '../core/auth/auth_state.dart'; import '../core/models/page_result.dart'; import '../models/stock_out.dart'; import '../repositories/stock_out_repository.dart'; +import 'connectivity_provider.dart'; import 'inventory_provider.dart'; final stockOutRepositoryProvider = Provider((ref) { @@ -25,6 +26,7 @@ class StockOutListNotifier extends AsyncNotifier> { @override Future> build() async { ref.watch(authStateProvider.select((s) => s.user?.shopId)); + ref.watch(networkRecoveryCountProvider); try { final result = await _fetch(); _cache = result; diff --git a/client/lib/repositories/auth_repository.dart b/client/lib/repositories/auth_repository.dart index 9474e7a..6e9adbb 100644 --- a/client/lib/repositories/auth_repository.dart +++ b/client/lib/repositories/auth_repository.dart @@ -1,7 +1,14 @@ +import 'package:flutter/foundation.dart'; import 'package:dio/dio.dart'; import '../core/api/api_client.dart'; import '../core/auth/auth_state.dart'; +typedef AuthLoginFn = Future Function({ + required String shopCode, + required String username, + required String password, +}); + class AuthException implements Exception { final String message; const AuthException(this.message); @@ -10,6 +17,9 @@ class AuthException implements Exception { } class AuthRepository { + @visibleForTesting + static AuthLoginFn? loginOverride; + /// POST /api/v1/auth/login /// Request: { shop_code, username, password } /// Response: { data: { access_token, refresh_token, expires_in, user: { id, username, real_name, role } } } @@ -18,6 +28,14 @@ class AuthRepository { required String username, required String password, }) async { + final override = loginOverride; + if (override != null) { + return override( + shopCode: shopCode, + username: username, + password: password, + ); + } try { final resp = await PublicApiClient.post('/auth/login', data: { 'shop_code': shopCode, diff --git a/client/lib/screens/auth/login_screen.dart b/client/lib/screens/auth/login_screen.dart index b7bc608..bfa4888 100644 --- a/client/lib/screens/auth/login_screen.dart +++ b/client/lib/screens/auth/login_screen.dart @@ -6,6 +6,7 @@ import 'package:go_router/go_router.dart'; import '../../core/auth/auth_state.dart'; import '../../core/theme/app_theme.dart'; import '../../core/storage/login_history.dart'; +import '../../providers/connectivity_provider.dart'; import '../../repositories/auth_repository.dart'; class LoginScreen extends ConsumerStatefulWidget { @@ -195,6 +196,14 @@ class _LoginScreenState extends ConsumerState { Future _login() async { if (!_formKey.currentState!.validate()) return; + + // 登录前先检查连通性 + final isOnline = ref.read(connectivityProvider); + if (!isOnline) { + setState(() => _errorMessage = '服务器不可达,请检查网络连接后重试'); + return; + } + setState(() { _loading = true; _errorMessage = null; @@ -382,6 +391,38 @@ class _LoginScreenState extends ConsumerState { onFieldSubmitted: (_) => _login(), ), + // 离线提示(connectivityProvider 在 _AppBootstrap 中已预热) + if (!ref.watch(connectivityProvider)) ...[ + const SizedBox(height: 12), + Container( + width: double.infinity, + padding: const EdgeInsets.symmetric( + horizontal: 12, vertical: 10), + decoration: BoxDecoration( + color: const Color(0xFFFFF8E1), + borderRadius: BorderRadius.circular(4), + border: Border.all( + color: const Color(0xFFF57F17) + .withAlpha(120)), + ), + child: const Row( + children: [ + Icon(Icons.wifi_off, + color: Color(0xFFF57F17), size: 16), + SizedBox(width: 8), + Expanded( + child: Text( + '服务器不可达,请检查网络连接', + style: TextStyle( + color: Color(0xFF5D4037), + fontSize: 13), + ), + ), + ], + ), + ), + ], + // Inline error if (_errorMessage != null) ...[ const SizedBox(height: 12), diff --git a/client/lib/screens/finance/finance_screen.dart b/client/lib/screens/finance/finance_screen.dart index c57cf05..6b1bb57 100644 --- a/client/lib/screens/finance/finance_screen.dart +++ b/client/lib/screens/finance/finance_screen.dart @@ -6,6 +6,7 @@ import '../../providers/finance_provider.dart'; import '../../widgets/data_table_card.dart'; import '../../widgets/multi_select_dropdown.dart' show ColDef, ColumnToggleButton, FilterableColumnHeader; import '../../widgets/page_scaffold.dart'; +import '../../providers/connectivity_provider.dart'; class FinanceScreen extends ConsumerWidget { const FinanceScreen({super.key}); @@ -101,6 +102,9 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> { @override Widget build(BuildContext context) { + // 网络恢复时自动刷新 + ref.listen(networkRecoveryCountProvider, (_, __) => _refetch()); + return FutureBuilder>( future: _future, builder: (context, snap) { diff --git a/client/lib/screens/inventory/batch_tracking_screen.dart b/client/lib/screens/inventory/batch_tracking_screen.dart index 483df92..b9eabb7 100644 --- a/client/lib/screens/inventory/batch_tracking_screen.dart +++ b/client/lib/screens/inventory/batch_tracking_screen.dart @@ -5,6 +5,7 @@ import '../../models/inventory.dart'; import '../../providers/inventory_provider.dart'; import '../../widgets/data_table_card.dart'; import '../../widgets/multi_select_dropdown.dart' show ColDef, ColumnToggleButton, FilterableColumnHeader; +import '../../providers/connectivity_provider.dart'; class BatchTrackingScreen extends ConsumerStatefulWidget { const BatchTrackingScreen({super.key}); @@ -77,6 +78,9 @@ class _BatchTrackingScreenState extends ConsumerState { @override Widget build(BuildContext context) { + // 网络恢复时自动刷新 + ref.listen(networkRecoveryCountProvider, (_, __) => _refetch()); + return FutureBuilder>( future: _future, builder: (context, snap) { diff --git a/client/lib/screens/shell/app_shell.dart b/client/lib/screens/shell/app_shell.dart index c4f5e11..a88d2c8 100644 --- a/client/lib/screens/shell/app_shell.dart +++ b/client/lib/screens/shell/app_shell.dart @@ -274,7 +274,7 @@ class _AppShellState extends ConsumerState { size: 16, color: Colors.white), SizedBox(width: 8), Text( - '网络连接已断开 · 当前处于只读模式,所有写操作已禁用', + '网络连接已断开 · 当前显示离线缓存数据,恢复后将自动刷新', style: TextStyle( color: Colors.white, fontSize: 13, diff --git a/client/test/inventory_repository_test.dart b/client/test/inventory_repository_test.dart index bdc15b4..3a032d1 100644 --- a/client/test/inventory_repository_test.dart +++ b/client/test/inventory_repository_test.dart @@ -49,14 +49,16 @@ void main() { 'data': [ { 'warehouse_id': 1, - 'warehouse_name': '主仓库', 'product_id': 1, - 'product_name': '五粮液', - 'product_code': 'P001', - 'product_spec': '500ml', - 'product_unit': '瓶', - 'product_brand': '五粮液集团', - 'min_stock': 10, + 'warehouse': {'name': '主仓库'}, + 'product': { + 'name': '五粮液', + 'code': 'P001', + 'spec': '500ml', + 'unit': '瓶', + 'brand': '五粮液集团', + 'min_stock': 10, + }, 'quantity': 50.0, } ], @@ -171,9 +173,9 @@ void main() { 'data': [ { 'warehouse_id': 1, - 'warehouse_name': '主仓库', 'product_id': 1, - 'product_name': '五粮液', + 'warehouse': {'name': '主仓库'}, + 'product': {'name': '五粮液'}, 'direction': 'in', 'quantity': 20.0, 'qty_before': 30.0, diff --git a/client/test/login_flow_test.dart b/client/test/login_flow_test.dart new file mode 100644 index 0000000..1263de5 --- /dev/null +++ b/client/test/login_flow_test.dart @@ -0,0 +1,91 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:go_router/go_router.dart'; +import 'package:jiu_client/core/auth/auth_state.dart'; +import 'package:jiu_client/providers/connectivity_provider.dart'; +import 'package:jiu_client/repositories/auth_repository.dart'; +import 'package:jiu_client/screens/auth/login_screen.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +Widget _buildApp() { + final router = GoRouter( + initialLocation: '/login', + routes: [ + GoRoute( + path: '/login', + builder: (_, __) => const LoginScreen(), + ), + GoRoute( + path: '/stock-in', + builder: (_, __) => const Scaffold(body: Text('stock-in home')), + ), + ], + ); + + return ProviderScope( + overrides: [ + connectivityProvider.overrideWith( + (_) => ConnectivityNotifier(skipInit: true), + ), + ], + child: MaterialApp.router(routerConfig: router), + ); +} + +void main() { + setUp(() { + SharedPreferences.setMockInitialValues({}); + AuthRepository.loginOverride = null; + }); + + tearDown(() { + AuthRepository.loginOverride = null; + }); + + testWidgets('login success navigates to stock-in home', (tester) async { + tester.view.physicalSize = const Size(1280, 800); + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.resetPhysicalSize); + + AuthRepository.loginOverride = ({ + required String shopCode, + required String username, + required String password, + }) async { + expect(shopCode, 'S001'); + expect(username, 'admin'); + expect(password, 'password123'); + return const AuthUser( + accessToken: 'access-token', + refreshToken: 'refresh-token', + username: 'admin', + realName: '管理员', + shopNo: 'S001', + shopId: 1, + ); + }; + + await tester.pumpWidget(_buildApp()); + await tester.pumpAndSettle(); + + await tester.enterText( + find.widgetWithText(TextFormField, '请输入门店编号'), + 'S001', + ); + await tester.enterText( + find.widgetWithText(TextFormField, '请输入用户名'), + 'admin', + ); + await tester.enterText( + find.widgetWithText(TextFormField, '请输入密码'), + 'password123', + ); + + await tester.tap(find.text('登 录')); + await tester.pump(); + await tester.pumpAndSettle(); + + expect(find.text('stock-in home'), findsOneWidget); + }); +} diff --git a/client/test/login_screen_test.dart b/client/test/login_screen_test.dart index bd18897..64f3734 100644 --- a/client/test/login_screen_test.dart +++ b/client/test/login_screen_test.dart @@ -2,7 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; +import 'package:jiu_client/providers/connectivity_provider.dart'; import 'package:jiu_client/screens/auth/login_screen.dart'; +import 'package:shared_preferences/shared_preferences.dart'; /// Wrap the screen in the minimum required providers. Widget _buildTestApp() { @@ -21,11 +23,21 @@ Widget _buildTestApp() { ); return ProviderScope( + overrides: [ + // skipInit=true:避免测试环境中发起真实 HTTP 请求导致 pending timer + connectivityProvider.overrideWith( + (_) => ConnectivityNotifier(skipInit: true), + ), + ], child: MaterialApp.router(routerConfig: router), ); } void main() { + setUp(() { + SharedPreferences.setMockInitialValues({}); + }); + group('LoginScreen UI', () { testWidgets('renders all three input fields and login button', (tester) async { @@ -99,5 +111,30 @@ void main() { final btn = tester.widget(find.byType(ElevatedButton)); expect(btn.onPressed, isNotNull); }); + + testWidgets('selecting history item fills shop code input', (tester) async { + SharedPreferences.setMockInitialValues({ + 'login_history_hotels': ['S001', 'H001'], + }); + + tester.view.physicalSize = const Size(1280, 800); + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.resetPhysicalSize); + + await tester.pumpWidget(_buildTestApp()); + await tester.pumpAndSettle(); + + await tester.tap(find.widgetWithText(TextFormField, '请输入门店编号')); + await tester.pumpAndSettle(); + + expect(find.text('S001'), findsOneWidget); + await tester.tap(find.text('S001').last); + await tester.pumpAndSettle(); + + final field = tester.widget( + find.byType(TextFormField).first, + ); + expect(field.controller!.text, 'S001'); + }); }); } diff --git a/client/test/partners_screen_test.dart b/client/test/partners_screen_test.dart index 76d6c17..f8677e4 100644 --- a/client/test/partners_screen_test.dart +++ b/client/test/partners_screen_test.dart @@ -133,7 +133,7 @@ void main() { ); await tester.pump(); - expect(find.textContaining('加载失败'), findsOneWidget); + expect(find.text('暂无数据,网络不可用'), findsOneWidget); expect(find.text('重试'), findsOneWidget); }); diff --git a/client/test/products_load_flow_test.dart b/client/test/products_load_flow_test.dart new file mode 100644 index 0000000..c40b6b0 --- /dev/null +++ b/client/test/products_load_flow_test.dart @@ -0,0 +1,82 @@ +import 'dart:async'; + +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:jiu_client/core/models/page_result.dart'; +import 'package:jiu_client/models/product.dart'; +import 'package:jiu_client/providers/product_provider.dart'; +import 'package:jiu_client/screens/products/products_screen.dart'; + +class _DelayedProductNotifier extends ProductListNotifier { + final Completer> completer; + + _DelayedProductNotifier(this.completer); + + @override + Future> build() => completer.future; + + @override + void reload() {} + + @override + void setKeyword(String keyword) {} + + @override + void setPage(int page) {} + + @override + Future createProduct(Map data) async {} + + @override + Future updateProduct(int id, Map data) async {} + + @override + Future deleteProduct(int id) async {} +} + +void main() { + testWidgets('products screen auto loads and renders product list', + (tester) async { + tester.view.physicalSize = const Size(1280, 800); + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.resetPhysicalSize); + + final completer = Completer>(); + + await tester.pumpWidget( + ProviderScope( + overrides: [ + productListProvider.overrideWith( + () => _DelayedProductNotifier(completer), + ), + ], + child: const MaterialApp( + home: Scaffold(body: ProductsScreen()), + ), + ), + ); + + await tester.pump(); + expect(find.byType(CircularProgressIndicator), findsOneWidget); + + completer.complete( + const PageResult( + data: [ + Product(id: 1, code: 'P001', name: '五粮液', unit: '瓶'), + Product(id: 2, code: 'P002', name: '茅台', unit: '瓶'), + ], + total: 2, + page: 1, + pageSize: 20, + ), + ); + + await tester.pumpAndSettle(); + + expect(find.text('五粮液'), findsOneWidget); + expect(find.text('茅台'), findsOneWidget); + expect(find.text('P001'), findsOneWidget); + expect(find.text('P002'), findsOneWidget); + }); +} diff --git a/client/test/products_screen_test.dart b/client/test/products_screen_test.dart index 8568418..0d9ed7e 100644 --- a/client/test/products_screen_test.dart +++ b/client/test/products_screen_test.dart @@ -113,7 +113,7 @@ void main() { ); await tester.pump(); - expect(find.textContaining('加载失败'), findsOneWidget); + expect(find.text('暂无数据,网络不可用'), findsOneWidget); expect(find.text('重试'), findsOneWidget); }); diff --git a/client/test/readonly_write_forbidden_test.dart b/client/test/readonly_write_forbidden_test.dart new file mode 100644 index 0000000..4b50c91 --- /dev/null +++ b/client/test/readonly_write_forbidden_test.dart @@ -0,0 +1,68 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:jiu_client/core/exceptions.dart'; +import 'package:jiu_client/core/models/page_result.dart'; +import 'package:jiu_client/models/product.dart'; +import 'package:jiu_client/providers/product_provider.dart'; +import 'package:jiu_client/screens/products/products_screen.dart'; + +class _ReadonlyProductNotifier extends ProductListNotifier { + @override + Future> build() async { + return const PageResult(data: [], total: 0, page: 1, pageSize: 20); + } + + @override + void reload() {} + + @override + void setKeyword(String keyword) {} + + @override + void setPage(int page) {} + + @override + Future createProduct(Map data) async { + throw const AppException('readonly user', statusCode: 403); + } + + @override + Future updateProduct(int id, Map data) async {} + + @override + Future deleteProduct(int id) async {} +} + +void main() { + testWidgets('write operation shows forbidden error for readonly user', + (tester) async { + tester.view.physicalSize = const Size(1280, 800); + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.resetPhysicalSize); + + await tester.pumpWidget( + ProviderScope( + overrides: [ + productListProvider.overrideWith(() => _ReadonlyProductNotifier()), + ], + child: const MaterialApp( + home: Scaffold(body: ProductsScreen()), + ), + ), + ); + await tester.pumpAndSettle(); + + await tester.tap(find.text('新建')); + await tester.pumpAndSettle(); + + await tester.enterText(find.byType(TextFormField).at(0), '测试商品'); + await tester.enterText(find.byType(TextFormField).at(1), 'P999'); + + await tester.tap(find.text('保存')); + await tester.pump(); + await tester.pumpAndSettle(); + + expect(find.textContaining('保存失败:readonly user'), findsOneWidget); + }); +} diff --git a/client/test/stock_in_create_submit_flow_test.dart b/client/test/stock_in_create_submit_flow_test.dart new file mode 100644 index 0000000..b2e8e8c --- /dev/null +++ b/client/test/stock_in_create_submit_flow_test.dart @@ -0,0 +1,183 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:go_router/go_router.dart'; +import 'package:jiu_client/core/models/page_result.dart'; +import 'package:jiu_client/models/partner.dart'; +import 'package:jiu_client/models/product.dart'; +import 'package:jiu_client/models/stock_in.dart'; +import 'package:jiu_client/models/warehouse.dart'; +import 'package:jiu_client/providers/partner_provider.dart'; +import 'package:jiu_client/providers/product_provider.dart'; +import 'package:jiu_client/providers/stock_in_provider.dart'; +import 'package:jiu_client/providers/warehouse_provider.dart'; +import 'package:jiu_client/screens/stock_in/stock_in_form_screen.dart'; + +class _FakeWarehouseNotifier extends WarehouseListNotifier { + @override + Future> build() async { + return const [ + Warehouse(id: 1, name: '主仓库', isDefault: true), + ]; + } + + @override + Future reload() async {} +} + +class _FakeSupplierNotifier extends PartnerListNotifier { + _FakeSupplierNotifier() : super(type: 'supplier'); + + @override + Future> build() async { + return const PageResult( + data: [ + Partner(id: 1, name: '张家酒水', type: 'supplier'), + ], + total: 1, + page: 1, + pageSize: 20, + ); + } + + @override + void reload() {} +} + +class _FakeProductNotifier extends ProductListNotifier { + @override + Future> build() async { + return const PageResult( + data: [ + Product( + id: 1, + code: 'P001', + name: '五粮液', + spec: '500ml', + unit: '瓶', + purchasePrice: 100, + ), + ], + total: 1, + page: 1, + pageSize: 20, + ); + } + + @override + void reload() {} + + @override + void setKeyword(String keyword) {} + + @override + void setPage(int page) {} + + @override + Future createProduct(Map data) async {} + + @override + Future updateProduct(int id, Map data) async {} + + @override + Future deleteProduct(int id) async {} +} + +class _CapturingStockInNotifier extends StockInListNotifier { + Map? capturedData; + + @override + Future> build() async { + return const PageResult(data: [], total: 0, page: 1, pageSize: 20); + } + + @override + void reload() {} + + @override + void setPage(int page) {} + + @override + void setStatus(String status) {} + + @override + void setDateRange(String? startDate, String? endDate) {} + + @override + Future createOrder(Map data) async { + capturedData = data; + } + + @override + Future submitOrder(int id) async {} + + @override + Future approveOrder(int id) async {} + + @override + Future rejectOrder(int id) async {} +} + +void main() { + testWidgets('stock-in form creates and submits a pending order', + (tester) async { + tester.view.physicalSize = const Size(1440, 1200); + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.resetPhysicalSize); + + final stockInNotifier = _CapturingStockInNotifier(); + final router = GoRouter( + initialLocation: '/stock-in/new', + routes: [ + GoRoute( + path: '/stock-in', + builder: (_, __) => const Scaffold(body: Text('stock-in list')), + ), + GoRoute( + path: '/stock-in/new', + builder: (_, __) => const StockInFormScreen(), + ), + ], + ); + + await tester.pumpWidget( + ProviderScope( + overrides: [ + warehouseListProvider.overrideWith(() => _FakeWarehouseNotifier()), + supplierListProvider.overrideWith(() => _FakeSupplierNotifier()), + productListProvider.overrideWith(() => _FakeProductNotifier()), + stockInListProvider.overrideWith(() => stockInNotifier), + ], + child: MaterialApp.router(routerConfig: router), + ), + ); + await tester.pumpAndSettle(); + + await tester.tap(find.byType(DropdownButtonFormField).at(0)); + await tester.pumpAndSettle(); + await tester.tap(find.text('主仓库').last); + await tester.pumpAndSettle(); + + await tester.tap(find.byType(DropdownButtonFormField).at(2)); + await tester.pumpAndSettle(); + await tester.tap(find.text('五粮液(500ml)').last); + await tester.pumpAndSettle(); + + await tester.enterText(find.byType(TextFormField).at(1), '10'); + await tester.enterText(find.byType(TextFormField).at(2), '100'); + + await tester.tap(find.text('提交审核')); + await tester.pump(); + await tester.pumpAndSettle(); + + expect(find.text('stock-in list'), findsOneWidget); + expect(stockInNotifier.capturedData, isNotNull); + expect(stockInNotifier.capturedData!['warehouse_id'], 1); + expect(stockInNotifier.capturedData!['status'], 'pending'); + expect((stockInNotifier.capturedData!['items'] as List).length, 1); + expect( + (stockInNotifier.capturedData!['items'] as List).first['product_id'], + 1, + ); + }); +} diff --git a/client/test/stock_in_screen_test.dart b/client/test/stock_in_screen_test.dart index 9981068..1dcbd0a 100644 --- a/client/test/stock_in_screen_test.dart +++ b/client/test/stock_in_screen_test.dart @@ -175,7 +175,7 @@ void main() { ); await tester.pump(); - expect(find.textContaining('加载失败'), findsOneWidget); + expect(find.text('暂无数据,网络不可用'), findsOneWidget); expect(find.text('重试'), findsOneWidget); }); @@ -226,7 +226,7 @@ void main() { await tester.pumpWidget(_buildApp(const AsyncValue.data(empty))); await tester.pump(); - expect(find.text('新建入库单'), findsOneWidget); + expect(find.text('新建入库审核单'), findsOneWidget); }); testWidgets('tapping 新建入库单 navigates to new order route', (tester) async { @@ -240,7 +240,7 @@ void main() { await tester.pumpWidget(_buildApp(const AsyncValue.data(empty))); await tester.pump(); - await tester.tap(find.text('新建入库单')); + await tester.tap(find.text('新建入库审核单')); await tester.pumpAndSettle(); expect(find.text('new order form'), findsOneWidget); @@ -349,7 +349,9 @@ void main() { await tester.pumpWidget(_buildApp(const AsyncValue.data(empty))); await tester.pump(); - // The dropdown shows 全部状态 by default + await tester.tap(find.text('入库单')); + await tester.pumpAndSettle(); + expect(find.text('全部状态'), findsOneWidget); }); @@ -365,7 +367,7 @@ void main() { await tester.pumpWidget(_buildApp(AsyncValue.data(result))); await tester.pump(); - expect(find.textContaining('35'), findsAtLeastNWidgets(1)); + expect(find.textContaining('共 1 条记录'), findsOneWidget); }); }); } diff --git a/client/test/stock_out_insufficient_stock_flow_test.dart b/client/test/stock_out_insufficient_stock_flow_test.dart new file mode 100644 index 0000000..5ece44b --- /dev/null +++ b/client/test/stock_out_insufficient_stock_flow_test.dart @@ -0,0 +1,214 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:go_router/go_router.dart'; +import 'package:jiu_client/core/api/api_client.dart'; +import 'package:jiu_client/core/exceptions.dart'; +import 'package:jiu_client/core/models/page_result.dart'; +import 'package:jiu_client/models/inventory.dart'; +import 'package:jiu_client/models/partner.dart'; +import 'package:jiu_client/models/product.dart'; +import 'package:jiu_client/models/stock_out.dart'; +import 'package:jiu_client/models/warehouse.dart'; +import 'package:jiu_client/providers/inventory_provider.dart'; +import 'package:jiu_client/providers/partner_provider.dart'; +import 'package:jiu_client/providers/product_provider.dart'; +import 'package:jiu_client/providers/stock_out_provider.dart'; +import 'package:jiu_client/providers/warehouse_provider.dart'; +import 'package:jiu_client/repositories/inventory_repository.dart'; +import 'package:jiu_client/screens/stock_out/stock_out_form_screen.dart'; + +class _FakeWarehouseNotifier extends WarehouseListNotifier { + @override + Future> build() async { + return const [ + Warehouse(id: 1, name: '主仓库', isDefault: true), + ]; + } + + @override + Future reload() async {} +} + +class _FakeCustomerNotifier extends PartnerListNotifier { + _FakeCustomerNotifier() : super(type: 'customer'); + + @override + Future> build() async { + return const PageResult( + data: [ + Partner(id: 2, name: '王记饭店', type: 'customer'), + ], + total: 1, + page: 1, + pageSize: 20, + ); + } + + @override + void reload() {} +} + +class _FakeProductNotifier extends ProductListNotifier { + @override + Future> build() async { + return const PageResult( + data: [ + Product( + id: 1, + code: 'P001', + name: '五粮液', + spec: '500ml', + unit: '瓶', + salePrice: 120, + ), + ], + total: 1, + page: 1, + pageSize: 20, + ); + } + + @override + void reload() {} + + @override + void setKeyword(String keyword) {} + + @override + void setPage(int page) {} + + @override + Future createProduct(Map data) async {} + + @override + Future updateProduct(int id, Map data) async {} + + @override + Future deleteProduct(int id) async {} +} + +class _FakeInventoryRepository extends InventoryRepository { + _FakeInventoryRepository() : super(_DummyApiClient()); + + @override + Future> listInventory({ + int? warehouseId, + String? keyword, + int page = 1, + int pageSize = 50, + }) async { + return const PageResult( + data: [ + Inventory( + warehouseId: 1, + warehouseName: '主仓库', + productId: 1, + productName: '五粮液', + productUnit: '瓶', + quantity: 1, + ), + ], + total: 1, + page: 1, + pageSize: 50, + ); + } +} + +class _DummyApiClient extends ApiClient { + _DummyApiClient() : super(token: 'test-token'); +} + +class _FailingStockOutNotifier extends StockOutListNotifier { + @override + Future> build() async { + return const PageResult(data: [], total: 0, page: 1, pageSize: 20); + } + + @override + void reload() {} + + @override + void setPage(int page) {} + + @override + void setStatus(String status) {} + + @override + void setDateRange(String? startDate, String? endDate) {} + + @override + Future createOrder(Map data) async { + throw const AppException('库存不足:五粮液 当前库存 1,需要 5', statusCode: 400); + } + + @override + Future deleteOrder(int id) async {} + + @override + Future submitOrder(int id) async {} + + @override + Future approveOrder(int id) async {} + + @override + Future rejectOrder(int id) async {} +} + +void main() { + testWidgets('stock-out form shows insufficient stock error on submit', + (tester) async { + tester.view.physicalSize = const Size(1440, 1200); + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.resetPhysicalSize); + + final router = GoRouter( + initialLocation: '/stock-out/new', + routes: [ + GoRoute( + path: '/stock-out', + builder: (_, __) => const Scaffold(body: Text('stock-out list')), + ), + GoRoute( + path: '/stock-out/new', + builder: (_, __) => const StockOutFormScreen(), + ), + ], + ); + + await tester.pumpWidget( + ProviderScope( + overrides: [ + warehouseListProvider.overrideWith(() => _FakeWarehouseNotifier()), + customerListProvider.overrideWith(() => _FakeCustomerNotifier()), + productListProvider.overrideWith(() => _FakeProductNotifier()), + stockOutListProvider.overrideWith(() => _FailingStockOutNotifier()), + inventoryRepositoryProvider.overrideWith( + (ref) => _FakeInventoryRepository(), + ), + ], + child: MaterialApp.router(routerConfig: router), + ), + ); + await tester.pumpAndSettle(); + + await tester.tap(find.byType(DropdownButtonFormField).at(0)); + await tester.pumpAndSettle(); + await tester.tap(find.text('主仓库').last); + await tester.pumpAndSettle(); + + await tester.tap(find.byType(DropdownButtonFormField).at(2)); + await tester.pumpAndSettle(); + await tester.tap(find.text('五粮液(500ml)').last); + await tester.pumpAndSettle(); + + await tester.enterText(find.byType(TextFormField).at(1), '5'); + await tester.tap(find.text('提交审核')); + await tester.pump(); + await tester.pumpAndSettle(); + + expect(find.textContaining('库存不足'), findsOneWidget); + expect(find.text('stock-out list'), findsNothing); + }); +}