wangjia/jiu
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 130 Wiki Activity

chore: release client-v1.0.67
Deploy Client / build-client-web (push) Successful in 41s
Details
Deploy Client / build-windows (push) Successful in 1m52s
Details
Deploy Client / build-macos (push) Successful in 2m33s
Details
Deploy Client / build-android (push) Successful in 1m6s
Details
Deploy Client / build-ios (push) Successful in 2m42s
Details
Deploy Client / release-deploy-client (push) Successful in 1m27s
Details

Browse Source 
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01YZ4DskSRKsSiheQonFtQvx
This commit is contained in:
wangjia
2026-06-21 17:33:32 +08:00
parent 7b67466a3e
commit 6d70bd3e37
4 changed files with 180 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/lib/screens/stock_in/stock_in_form_screen.dart
+14
View File
@@ -604,6 +604,20 @@ class _StockInFormScreenState extends ConsumerState<StockInFormScreen> {
hint: '请选择供应商',
dialogTitle: '选择供应商',
isRequired: true,
onSearch: (kw) async {
final res = await ref
.read(partnerRepositoryProvider)
.list(
type: 'supplier',
keyword: kw,
pageSize: 50);
return res.data
.map((p) => OptionItem(
id: p.id,
name: p.name,
code: p.code))
.toList();
},
onChanged: (v) =>
setState(() => _partnerId = v),
),
client/lib/screens/stock_out/stock_out_form_screen.dart
+114 -51
View File
@@ -1,3 +1,5 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -7,6 +9,7 @@ import '../../core/theme/app_theme.dart';
import '../../core/auth/auth_state.dart';
import '../../core/utils/print_util.dart';
import '../../core/utils/date_util.dart';
import '../../models/inventory.dart';
import '../../models/stock_out.dart';
import '../../widgets/date_picker_field.dart';
import '../../widgets/searchable_option_field.dart';
@@ -39,6 +42,39 @@ class _PickerItem {
});
}
/// 把库存行按 product 聚合为选择器条目（同一 product 的多行数量相加）。
List<_PickerItem> _aggregatePickerItems(List<Inventory> rows) {
final Map<int, _PickerItem> map = {};
for (final inv in rows.where((inv) => inv.productId != null)) {
final pid = inv.productId!;
final existing = map[pid];
if (existing != null) {
map[pid] = _PickerItem(
productId: pid,
productCode: existing.productCode,
productName: existing.productName,
series: existing.series,
spec: existing.spec,
unit: existing.unit,
unitPrice: existing.unitPrice ?? inv.unitPrice,
availableQty: existing.availableQty + inv.quantity,
);
} else {
map[pid] = _PickerItem(
productId: pid,
productCode: inv.productCode,
productName: inv.productName,
series: inv.series,
spec: inv.spec,
unit: inv.unit,
unitPrice: inv.unitPrice,
availableQty: inv.quantity,
);
}
}
return map.values.toList();
}
class _ItemRow {
int? productId;
final String productCode;
@@ -158,36 +194,8 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
.listInventory(
warehouseId: warehouseId,
pageSize: AppConstants.stockOutPickerPageSize);
final Map<int, _PickerItem> productMap = {};
for (final inv in result.data.where((inv) => inv.productId != null)) {
final pid = inv.productId!;
if (productMap.containsKey(pid)) {
final existing = productMap[pid]!;
productMap[pid] = _PickerItem(
productId: pid,
productCode: existing.productCode,
productName: existing.productName,
series: existing.series,
spec: existing.spec,
unit: existing.unit,
unitPrice: existing.unitPrice ?? inv.unitPrice,
availableQty: existing.availableQty + inv.quantity,
);
} else {
productMap[pid] = _PickerItem(
productId: pid,
productCode: inv.productCode,
productName: inv.productName,
series: inv.series,
spec: inv.spec,
unit: inv.unit,
unitPrice: inv.unitPrice,
availableQty: inv.quantity,
);
}
}
setState(() {
_inventoryPickerItems = productMap.values.toList();
_inventoryPickerItems = _aggregatePickerItems(result.data);
_inventoryMap = {
for (final item in _inventoryPickerItems)
item.productId: item.availableQty
@@ -206,7 +214,10 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
}
final selected = await showDialog<List<_PickerItem>>(
context: context,
builder: (_) => _InventoryPickerDialog(items: _inventoryPickerItems),
builder: (_) => _InventoryPickerDialog(
items: _inventoryPickerItems,
warehouseId: _warehouseId,
),
);
if (selected == null || selected.isEmpty) return;
setState(() {
@@ -532,6 +543,20 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
selectedId: _partnerId,
hint: '请选择客户',
dialogTitle: '选择客户',
onSearch: (kw) async {
final res = await ref
.read(partnerRepositoryProvider)
.list(
type: 'customer',
keyword: kw,
pageSize: 50);
return res.data
.map((p) => OptionItem(
id: p.id,
name: p.name,
code: p.code))
.toList();
},
onChanged: (v) =>
setState(() => _partnerId = v),
),
@@ -873,39 +898,67 @@ class _FormField extends StatelessWidget {
}
}
class _InventoryPickerDialog extends StatefulWidget {
class _InventoryPickerDialog extends ConsumerStatefulWidget {
final List<_PickerItem> items;
const _InventoryPickerDialog({required this.items});
final int? warehouseId;
const _InventoryPickerDialog({required this.items, this.warehouseId});
@override
State<_InventoryPickerDialog> createState() => _InventoryPickerDialogState();
ConsumerState<_InventoryPickerDialog> createState() =>
_InventoryPickerDialogState();
}
class _InventoryPickerDialogState extends State<_InventoryPickerDialog> {
class _InventoryPickerDialogState
extends ConsumerState<_InventoryPickerDialog> {
final _searchCtrl = TextEditingController();
String _search = '';
final Set<int> _selected = {};
// 服务端搜索结果（替代一次性拉全部本地过滤）；初始用调用方已加载的首屏
late List<_PickerItem> _results = widget.items;
// 已见过的条目（跨多次搜索），用于确认时按 productId 还原所选
late final Map<int, _PickerItem> _known = {
for (final it in widget.items) it.productId: it
};
bool _loading = false;
Timer? _debounce;
@override
void dispose() {
_debounce?.cancel();
_searchCtrl.dispose();
super.dispose();
}
List<_PickerItem> get _filtered {
if (_search.isEmpty) return widget.items;
final q = _search.toLowerCase();
return widget.items
.where((item) =>
item.productName.toLowerCase().contains(q) ||
item.productCode.toLowerCase().contains(q) ||
item.series.toLowerCase().contains(q))
.toList();
void _onSearchChanged(String v) {
setState(() => _search = v);
_debounce?.cancel();
_debounce = Timer(const Duration(milliseconds: 300), _fetch);
}
Future<void> _fetch() async {
setState(() => _loading = true);
try {
final kw = _search.trim();
final result = await ref.read(inventoryRepositoryProvider).listInventory(
warehouseId: widget.warehouseId,
keyword: kw.isEmpty ? null : kw,
pageSize: AppConstants.stockOutPickerPageSize,
);
final items = _aggregatePickerItems(result.data);
for (final it in items) {
_known[it.productId] = it;
}
if (mounted) setState(() => _results = items);
} catch (_) {
// 忽略：保留上次结果
} finally {
if (mounted) setState(() => _loading = false);
}
}
@override
Widget build(BuildContext context) {
final filtered = _filtered;
final filtered = _results;
final allSelected = filtered.isNotEmpty &&
filtered.every((e) => _selected.contains(e.productId));
@@ -945,14 +998,24 @@ class _InventoryPickerDialogState extends State<_InventoryPickerDialog> {
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
child: TextField(
controller: _searchCtrl,
decoration: const InputDecoration(
decoration: InputDecoration(
hintText: '搜索商品编码、名称或系列',
prefixIcon: Icon(Icons.search, size: 18),
prefixIcon: const Icon(Icons.search, size: 18),
suffixIcon: _loading
? const Padding(
padding: EdgeInsets.all(12),
child: SizedBox(
width: 16,
height: 16,
child: CircularProgressIndicator(strokeWidth: 2),
),
)
: null,
isDense: true,
contentPadding:
EdgeInsets.symmetric(horizontal: 12, vertical: 10),
const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
),
onChanged: (v) => setState(() => _search = v),
onChanged: _onSearchChanged,
),
),
// Table header
@@ -1068,9 +1131,9 @@ class _InventoryPickerDialogState extends State<_InventoryPickerDialog> {
onPressed: _selected.isEmpty
? null
: () {
final result = widget.items
.where((item) =>
_selected.contains(item.productId))
final result = _selected
.map((id) => _known[id])
.whereType<_PickerItem>()
.toList();
Navigator.pop(context, result);
},