2
0
mirror of https://github.com/inventree/inventree-app.git synced 2025-06-12 18:25:26 +00:00

Sales order allocation (#464)

* New string

* Typo fix

* Add model for SalesOrderShipment

* Add placeholder button to sales order item

* Create a new shipment from the sales order detail view

* Fix API URL

* Add paginated shipment list

* Upate colors

* Add API form for allocation of stock to sales order

* Build out sales order line detail widge

* Use unallocated quantity

* Update release notes

* linting fix
This commit is contained in:
Oliver
2023-11-27 22:51:20 +11:00
committed by GitHub
parent 70d0d4de93
commit 3ea5f8934c
8 changed files with 293 additions and 13 deletions

View File

@ -7,6 +7,7 @@ import "package:inventree/barcode/sales_order.dart";
import "package:inventree/inventree/company.dart";
import "package:inventree/inventree/sales_order.dart";
import "package:inventree/widget/order/so_line_list.dart";
import "package:inventree/widget/order/so_shipment_list.dart";
import "package:inventree/widget/refreshable_state.dart";
import "package:inventree/l10.dart";
@ -62,6 +63,25 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
return actions;
}
// Add a new shipment against this sales order
Future<void> _addShipment(BuildContext context) async {
var fields = InvenTreeSalesOrderShipment().formFields();
fields["order"]?["value"] = widget.order.pk;
fields["order"]?["hidden"] = true;
InvenTreeSalesOrderShipment().createForm(
context,
L10().shipmentAdd,
fields: fields,
onSuccess: (result) async {
refresh(context);
}
);
}
// Add a new line item to this sales order
Future<void> _addLineItem(BuildContext context) async {
var fields = InvenTreeSOLineItem().formFields();
@ -94,6 +114,16 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
}
)
);
actions.add(
SpeedDialChild(
child: FaIcon(FontAwesomeIcons.circlePlus),
label: L10().shipmentAdd,
onTap: () async {
_addShipment(context);
}
)
);
}
return actions;
@ -225,7 +255,7 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
));
}
Color lineColor = widget.order.complete ? COLOR_WARNING : COLOR_SUCCESS;
Color lineColor = widget.order.complete ? COLOR_SUCCESS : COLOR_WARNING;
tiles.add(ListTile(
title: Text(L10().lineItems),
@ -292,8 +322,7 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
return [
Tab(text: L10().details),
Tab(text: L10().lineItems),
// TODO: Add in the "shipped items" tab
// Tab(text: L10().shipped)
Tab(text: L10().shipments),
];
}
@ -302,7 +331,7 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
return [
ListView(children: orderTiles(context)),
PaginatedSOLineList({"order": widget.order.pk.toString()}),
// Center(), // TODO: Delivered stock
PaginatedSOShipmentList({"order": widget.order.pk.toString()}),
];
}

View File

@ -3,21 +3,24 @@
/*
* Widget for displaying detail view of a single SalesOrderLineItem
*/
import "package:flutter/material.dart";
import "package:flutter_speed_dial/flutter_speed_dial.dart";
import "package:font_awesome_flutter/font_awesome_flutter.dart";
import "package:inventree/app_colors.dart";
import "package:inventree/l10.dart";
import "package:inventree/inventree/part.dart";
import "package:inventree/inventree/sales_order.dart";
import "package:inventree/widget/refreshable_state.dart";
import "package:inventree/widget/progress.dart";
import "package:inventree/widget/part/part_detail.dart";
import "package:inventree/helpers.dart";
import "package:inventree/widget/snacks.dart";
import "package:inventree/app_colors.dart";
import "package:inventree/l10.dart";
import "package:inventree/helpers.dart";
import "package:inventree/api_form.dart";
class SoLineDetailWidget extends StatefulWidget {
@ -35,6 +38,8 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
_SOLineDetailWidgetState();
InvenTreeSalesOrder? order;
@override
String getAppBarTitle() => L10().lineItem;
@ -55,6 +60,53 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
return actions;
}
Future<void> _allocateStock(BuildContext context) async {
if (order == null) {
return;
}
Map<String, dynamic> fields = {
"line_item": {
"parent": "items",
"nested": true,
"hidden": true,
"value": widget.item.pk,
},
"stock_item": {
"parent": "items",
"nested": true,
"filters": {
"part": widget.item.partId,
"in_stock": true,
}
},
"quantity": {
"parent": "items",
"nested": true,
"value": widget.item.unallocatedQuantity,
},
"shipment": {
"filters": {
"order": order!.pk.toString(),
}
},
};
launchApiForm(
context,
L10().allocateStock,
order!.allocate_url,
fields,
method: "POST",
icon: FontAwesomeIcons.rightToBracket,
onSuccess: (data) async {
refresh(context);
}
);
}
Future<void> _editLineItem(BuildContext context) async {
var fields = widget.item.formFields();
@ -76,13 +128,35 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
@override
List<SpeedDialChild> actionButtons(BuildContext context) {
// TODO
return [];
List<SpeedDialChild> buttons = [];
if (order != null && order!.isOpen) {
buttons.add(
SpeedDialChild(
child: FaIcon(FontAwesomeIcons.rightToBracket, color: Colors.blue),
label: L10().allocateStock,
onTap: () async {
_allocateStock(context);
}
)
);
}
return buttons;
}
@override
Future<void> request(BuildContext context) async {
await widget.item.reload();
final so = await InvenTreeSalesOrder().get(widget.item.orderId);
if (mounted) {
setState(() {
order = (so is InvenTreeSalesOrder ? so : null);
});
}
}
@override
@ -108,6 +182,30 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
)
);
// Available quantity
tiles.add(
ListTile(
title: Text(L10().availableStock),
leading: FaIcon(FontAwesomeIcons.boxesStacked),
trailing: Text(simpleNumberString(widget.item.availableStock))
)
);
// Allocated quantity
tiles.add(
ListTile(
leading: FaIcon(FontAwesomeIcons.clipboardCheck),
title: Text(L10().allocated),
subtitle: ProgressBar(widget.item.allocatedRatio),
trailing: Text(
widget.item.allocatedString,
style: TextStyle(
color: widget.item.isAllocated ? COLOR_SUCCESS : COLOR_WARNING
)
)
)
);
// Shipped quantity
tiles.add(
ListTile(

View File

@ -63,7 +63,7 @@ class _PaginatedSOLineListState extends PaginatedSearchState<PaginatedSOLineList
title: Text(part.name),
subtitle: Text(part.description),
leading: InvenTreeAPI().getThumbnail(part.thumbnail),
trailing: Text(item.progressString),
trailing: Text(item.progressString, style: TextStyle(color: item.isComplete ? COLOR_SUCCESS : COLOR_WARNING)),
onTap: () async {
showLoadingOverlay(context);
await item.reload();

View File

@ -0,0 +1,55 @@
import "package:flutter/material.dart";
import "package:font_awesome_flutter/font_awesome_flutter.dart";
import "package:inventree/app_colors.dart";
import "package:inventree/inventree/sales_order.dart";
import "package:inventree/widget/paginator.dart";
import "package:inventree/inventree/model.dart";
import "package:inventree/l10.dart";
class PaginatedSOShipmentList extends PaginatedSearchWidget {
const PaginatedSOShipmentList(Map<String, String> filters) : super(filters: filters);
@override
String get searchTitle => L10().shipments;
@override
_PaginatedSOShipmentListState createState() => _PaginatedSOShipmentListState();
}
class _PaginatedSOShipmentListState extends PaginatedSearchState<PaginatedSOShipmentList> {
_PaginatedSOShipmentListState() : super();
@override
String get prefix => "so_shipment_";
@override
Map<String, String> get orderingOptions => {};
@override
Map<String, Map<String, dynamic>> get filterOptions => {};
@override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async {
final page = await InvenTreeSalesOrderShipment().listPaginated(limit, offset, filters: params);
return page;
}
@override
Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreeSalesOrderShipment shipment = model as InvenTreeSalesOrderShipment;
return ListTile(
title: Text(shipment.reference),
subtitle: Text(shipment.tracking_number),
leading: shipment.shipped ? FaIcon(FontAwesomeIcons.calendarCheck, color: COLOR_SUCCESS) : FaIcon(FontAwesomeIcons.calendarXmark, color: COLOR_WARNING),
trailing: shipment.shipped ? Text(shipment.shipment_date ?? "") : null
);
}
}