diff --git a/client/lib/models/stock_in.dart b/client/lib/models/stock_in.dart index d6e7079..12202a3 100644 --- a/client/lib/models/stock_in.dart +++ b/client/lib/models/stock_in.dart @@ -84,11 +84,11 @@ class StockInOrder { orderNo: json['order_no'] as String, type: json['type'] as String?, warehouseId: (json['warehouse_id'] as num).toInt(), - warehouseName: json['warehouse_name'] as String?, + warehouseName: (json['warehouse'] as Map?)?['name'] as String?, partnerId: json['partner_id'] != null ? (json['partner_id'] as num).toInt() : null, - partnerName: json['partner_name'] as String?, + partnerName: (json['partner'] as Map?)?['name'] as String?, operatorId: json['operator_id'] != null ? (json['operator_id'] as num).toInt() : null, diff --git a/client/lib/models/stock_out.dart b/client/lib/models/stock_out.dart index 333e722..68c9f7a 100644 --- a/client/lib/models/stock_out.dart +++ b/client/lib/models/stock_out.dart @@ -72,11 +72,11 @@ class StockOutOrder { orderNo: json['order_no'] as String, type: json['type'] as String?, warehouseId: (json['warehouse_id'] as num).toInt(), - warehouseName: json['warehouse_name'] as String?, + warehouseName: (json['warehouse'] as Map?)?['name'] as String?, partnerId: json['partner_id'] != null ? (json['partner_id'] as num).toInt() : null, - partnerName: json['partner_name'] as String?, + partnerName: (json['partner'] as Map?)?['name'] as String?, operatorId: json['operator_id'] != null ? (json['operator_id'] as num).toInt() : null,