feat: 财务结清、酒行信息、库存备注编辑、标签溯源、入库必填校验
后端 - 新增 shop handler：GET/PUT /shop/info（管理员权限） - 新增 finance CloseByRef：按单据 ref_type+ref_id 结清账款 - 新增 inventory UpdateRemark：PUT /inventory/:id/remark - 入库/出库审批自动生成财务应付/应收记录（去除金额>0限制） - 种子数据 S001-S003 补充真实门店信息 前端 - 设置页新增「酒行信息」Tab，管理员可编辑门店名称/地址/电话/负责人 - 入库单列表新增结清按钮（含确认弹窗），出库单同步 - 入库表单：规格、系列、生产日期、供应商、商品名称改为提交必填 - 入库/出库列表新增入库时间、出库时间、创建时间列 - 商品标签标题改为读取 shop 表门店名，扫码文案改为「扫码溯源 · TRACE」 - 标签页脚显示门店地址和电话（从 API 读取，不再依赖编译时 dart-define） - 库存备注支持点击编辑，超4字截断显示+Hover展示全文 - ApiClient 新增 patch() 方法（已改用 PUT 规避 CORS） 文档 - 新增 docs/user-manual.md 完整用户操作手册（12章） Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
wangjia
@@ -1,118 +1,72 @@
|
||||
class Inventory {
|
||||
final int warehouseId;
|
||||
final String? warehouseName;
|
||||
final int productId;
|
||||
final String? productName;
|
||||
final String? productCode;
|
||||
final String? productSpec;
|
||||
final String? productUnit;
|
||||
final String? productBrand;
|
||||
final int? minStock;
|
||||
final double quantity;
|
||||
|
||||
const Inventory({
|
||||
required this.warehouseId,
|
||||
this.warehouseName,
|
||||
required this.productId,
|
||||
this.productName,
|
||||
this.productCode,
|
||||
this.productSpec,
|
||||
this.productUnit,
|
||||
this.productBrand,
|
||||
this.minStock,
|
||||
required this.quantity,
|
||||
});
|
||||
|
||||
factory Inventory.fromJson(Map<String, dynamic> json) {
|
||||
final warehouse = json['warehouse'] as Map<String, dynamic>?;
|
||||
final product = json['product'] as Map<String, dynamic>?;
|
||||
return Inventory(
|
||||
warehouseId: (json['warehouse_id'] as num).toInt(),
|
||||
warehouseName: warehouse?['name'] as String?,
|
||||
productId: (json['product_id'] as num).toInt(),
|
||||
productName: product?['name'] as String?,
|
||||
productCode: product?['code'] as String?,
|
||||
productSpec: product?['spec'] as String?,
|
||||
productUnit: product?['unit'] as String?,
|
||||
productBrand: product?['brand'] as String?,
|
||||
minStock: product?['min_stock'] != null
|
||||
? (product!['min_stock'] as num).toInt()
|
||||
: null,
|
||||
quantity: (json['quantity'] as num).toDouble(),
|
||||
);
|
||||
}
|
||||
String? _parseDate(String? s) {
|
||||
if (s == null || s.isEmpty) return null;
|
||||
return s.length >= 10 ? s.substring(0, 10) : s;
|
||||
}
|
||||
|
||||
// 商品追踪：已审核入库单的明细行，含库存状态和买家信息
|
||||
class ProductTrackingRecord {
|
||||
class Inventory {
|
||||
final int id;
|
||||
final int productId;
|
||||
final String? productName;
|
||||
final String? productCode;
|
||||
final String? productSpec;
|
||||
final String? productUnit;
|
||||
final String? batchNo;
|
||||
final int? warehouseId;
|
||||
final int? productId;
|
||||
final int? stockInItemId;
|
||||
final double quantity;
|
||||
final double unitPrice;
|
||||
final String? orderNo;
|
||||
final String? orderDate;
|
||||
final String? warehouseName;
|
||||
final String? supplierName;
|
||||
// 库存状态
|
||||
final double currentQty;
|
||||
final String status; // in_stock | sold_out
|
||||
final String? buyerName;
|
||||
final String? soldAt;
|
||||
final String productCode;
|
||||
final String productName;
|
||||
final String series;
|
||||
final String spec;
|
||||
final String unit;
|
||||
final String warehouseName;
|
||||
final double? unitPrice;
|
||||
final String? productionDate;
|
||||
final String batchNo;
|
||||
final String supplierName;
|
||||
final String remark;
|
||||
final int? minStock;
|
||||
final String brand;
|
||||
final String? createdAt;
|
||||
|
||||
const ProductTrackingRecord({
|
||||
const Inventory({
|
||||
required this.id,
|
||||
required this.productId,
|
||||
this.productName,
|
||||
this.productCode,
|
||||
this.productSpec,
|
||||
this.productUnit,
|
||||
this.batchNo,
|
||||
this.warehouseId,
|
||||
this.productId,
|
||||
this.stockInItemId,
|
||||
required this.quantity,
|
||||
required this.unitPrice,
|
||||
this.orderNo,
|
||||
this.orderDate,
|
||||
this.warehouseName,
|
||||
this.supplierName,
|
||||
required this.currentQty,
|
||||
required this.status,
|
||||
this.buyerName,
|
||||
this.soldAt,
|
||||
this.productCode = '',
|
||||
this.productName = '',
|
||||
this.series = '',
|
||||
this.spec = '',
|
||||
this.unit = '',
|
||||
this.warehouseName = '',
|
||||
this.unitPrice,
|
||||
this.productionDate,
|
||||
this.batchNo = '',
|
||||
this.supplierName = '',
|
||||
this.remark = '',
|
||||
this.minStock,
|
||||
this.brand = '',
|
||||
this.createdAt,
|
||||
});
|
||||
|
||||
bool get isSoldOut => status == 'sold_out';
|
||||
|
||||
factory ProductTrackingRecord.fromJson(Map<String, dynamic> json) {
|
||||
final product = json['product'] as Map<String, dynamic>?;
|
||||
final order = json['order'] as Map<String, dynamic>?;
|
||||
final warehouse = order?['warehouse'] as Map<String, dynamic>?;
|
||||
final partner = order?['partner'] as Map<String, dynamic>?;
|
||||
return ProductTrackingRecord(
|
||||
id: (json['id'] as num).toInt(),
|
||||
productId: (json['product_id'] as num).toInt(),
|
||||
productName: product?['name'] as String?,
|
||||
productCode: product?['code'] as String?,
|
||||
productSpec: product?['spec'] as String?,
|
||||
productUnit: product?['unit'] as String?,
|
||||
batchNo: json['batch_no'] as String?,
|
||||
quantity: (json['quantity'] as num).toDouble(),
|
||||
unitPrice: (json['unit_price'] as num).toDouble(),
|
||||
orderNo: order?['order_no'] as String?,
|
||||
orderDate: order?['order_date'] as String?,
|
||||
warehouseName: warehouse?['name'] as String?,
|
||||
supplierName: partner?['name'] as String?,
|
||||
currentQty: json['current_qty'] != null
|
||||
? (json['current_qty'] as num).toDouble()
|
||||
: 0,
|
||||
status: json['status'] as String? ?? 'in_stock',
|
||||
buyerName: json['buyer_name'] as String?,
|
||||
soldAt: json['sold_at'] as String?,
|
||||
);
|
||||
}
|
||||
factory Inventory.fromJson(Map<String, dynamic> json) => Inventory(
|
||||
id: (json['id'] as num).toInt(),
|
||||
warehouseId: (json['warehouse_id'] as num?)?.toInt(),
|
||||
productId: (json['product_id'] as num?)?.toInt(),
|
||||
stockInItemId: (json['stock_in_item_id'] as num?)?.toInt(),
|
||||
quantity: (json['quantity'] as num).toDouble(),
|
||||
productCode: json['product_code'] as String? ?? '',
|
||||
productName: json['product_name'] as String? ?? '',
|
||||
series: json['series'] as String? ?? '',
|
||||
spec: json['spec'] as String? ?? '',
|
||||
unit: json['unit'] as String? ?? '',
|
||||
warehouseName: json['warehouse_name'] as String? ?? '',
|
||||
unitPrice: (json['unit_price'] as num?)?.toDouble(),
|
||||
productionDate: _parseDate(json['production_date'] as String?),
|
||||
batchNo: json['batch_no'] as String? ?? '',
|
||||
supplierName: json['supplier_name'] as String? ?? '',
|
||||
remark: json['remark'] as String? ?? '',
|
||||
minStock: (json['min_stock'] as num?)?.toInt(),
|
||||
brand: json['brand'] as String? ?? '',
|
||||
createdAt: json['created_at'] as String?,
|
||||
);
|
||||
}
|
||||
|
||||
class InventoryLog {
|
||||
@@ -144,9 +98,11 @@ class InventoryLog {
|
||||
|
||||
factory InventoryLog.fromJson(Map<String, dynamic> json) => InventoryLog(
|
||||
warehouseId: (json['warehouse_id'] as num).toInt(),
|
||||
warehouseName: (json['warehouse'] as Map<String, dynamic>?)?['name'] as String?,
|
||||
warehouseName:
|
||||
(json['warehouse'] as Map<String, dynamic>?)?['name'] as String?,
|
||||
productId: (json['product_id'] as num).toInt(),
|
||||
productName: (json['product'] as Map<String, dynamic>?)?['name'] as String?,
|
||||
productName:
|
||||
(json['product'] as Map<String, dynamic>?)?['name'] as String?,
|
||||
direction: json['direction'] as String,
|
||||
quantity: (json['quantity'] as num).toDouble(),
|
||||
qtyBefore: json['qty_before'] != null
|
||||
@@ -156,9 +112,8 @@ class InventoryLog {
|
||||
? (json['qty_after'] as num).toDouble()
|
||||
: null,
|
||||
refType: json['ref_type'] as String?,
|
||||
refId: json['ref_id'] != null
|
||||
? (json['ref_id'] as num).toInt()
|
||||
: null,
|
||||
refId:
|
||||
json['ref_id'] != null ? (json['ref_id'] as num).toInt() : null,
|
||||
createdAt: json['created_at'] as String?,
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user