Skip to content

add packing list downloads to dispatch reports #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richardiphillips merged 2 commits into from
Apr 16, 2026
Merged

add packing list downloads to dispatch reports #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b1b106
packing lists to eu dispatch
richardiphillips Apr 16, 2026
0b4de12
rsn dispatch
richardiphillips Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/Domain.LinnApps/Reports/DailyEuReportsService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,8 @@ public async Task<ResultsModel> GetDailyEuRsnDispatchReport(DateTime fromDate, D
Align = "right", DecimalPlaces = 2
},
new AxisDetailsModel("serialNumber", "Serial No", GridDisplayType.TextValue, 150),
new AxisDetailsModel("invoiceDate", "Invoice Date", GridDisplayType.TextValue, 150)
new AxisDetailsModel("invoiceDate", "Invoice Date", GridDisplayType.TextValue, 150),
new AxisDetailsModel("packingList", "Packing List", GridDisplayType.TextValue, 150)
};

var reportLayout = new SimpleGridLayout(this.reportingHelper, CalculationValueModelType.Value, null, null);
Expand Down Expand Up @@ -824,6 +825,13 @@ public async Task<ResultsModel> GetDailyEuRsnDispatchReport(DateTime fromDate, D
ColumnId = "invoiceDate",
TextDisplay = line.InvoiceDate.ToString("dd-MMM-yyyy", CultureInfo.InvariantCulture)
});
values.Add(
new CalculationValueModel
{
RowId = rowId,
ColumnId = "packingList",
TextDisplay = $"{line.PackingList}"
});
if (line.UpgradeTotal.HasValue)
{
values.Add(
Expand Down
32 changes: 27 additions & 5 deletions src/Service.Host/client/src/components/DailyEuDispatchReport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ function DailyEuDispatchReport() {
const [fromDate, setFromDate] = useState(new Date());
const [toDate, setToDate] = useState(new Date());
const [exportBookIds, setExportBookIds] = useState([]);
const [consignmentNumbers, setConsignmentNumbers] = useState([]);

const options = () => ({
fromDate: fromDate.toISOString(),
Expand All @@ -33,17 +34,29 @@ function DailyEuDispatchReport() {
useEffect(() => {
if (!result || !result.reportResults || result.reportResults.length === 0) {
setExportBookIds([]);
setConsignmentNumbers([]);
} else {
var resultValues = result.reportResults[0].results
var resultExportBookValues = result.reportResults[0].results
.map(a => a.values)
.map(row => row[2]?.textDisplayValue);

if (!resultValues || resultValues.length === 0) {
if (!resultExportBookValues || resultExportBookValues.length === 0) {
setExportBookIds([]);
return;
}

setExportBookIds([...new Set(resultValues)]);
setExportBookIds([...new Set(resultExportBookValues)]);

var resultConsignmentValues = result.reportResults[0].results
.map(a => a.values)
.map(row => row[19]?.textDisplayValue);

if (!resultConsignmentValues || resultConsignmentValues.length === 0) {
setConsignmentNumbers([]);
return;
}

setConsignmentNumbers([...new Set(resultConsignmentValues)]);
}
}, [result]);

Expand Down Expand Up @@ -107,12 +120,21 @@ function DailyEuDispatchReport() {
href={`${itemTypes.downloadExpbookInvoices.url}?documentType=E&${exportBookIds.map(id => `documentNumber=${id}`).join('&')}`}
fileName="DailyInvoices.pdf"
accept="application/pdf"
tooltipText="Download as PDF"
tooltipText="Download export book invoices as PDF"
disabled={!exportBookIds?.length}
buttonText="Download Invoices"
/>
</Grid>
<Grid size={2} />
<Grid size={2} sx={{ marginTop: 4 }}>
<ExportButton
href={`${itemTypes.localConsignments.url}/multiple-packing-lists/pdf?${consignmentNumbers.map(id => `consignmentNumber=${id}`).join('&')}`}
fileName="PackingLists.pdf"
accept="application/pdf"
tooltipText="Download packing lists as PDF"
disabled={!consignmentNumbers?.length}
buttonText="Packing Lists"
/>
</Grid>
{isLoading && (
<Grid size={12}>
<Loading />
Expand Down
26 changes: 24 additions & 2 deletions src/Service.Host/client/src/components/DailyEuRsnDispatchReport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ function DailyEuRsnDispatchReport() {
const [fromDate, setFromDate] = useState(new Date());
const [toDate, setToDate] = useState(new Date());
const [exportBookIds, setExportBookIds] = useState([]);
const [consignmentNumbers, setConsignmentNumbers] = useState([]);

const options = () => ({
fromDate: fromDate.toISOString(),
Expand All @@ -33,6 +34,7 @@ function DailyEuRsnDispatchReport() {
useEffect(() => {
if (!result || !result.reportResults || result.reportResults.length === 0) {
setExportBookIds([]);
setConsignmentNumbers([]);
} else {
var resultValues = result.reportResults[0].results
.map(a => a.values)
Expand All @@ -44,6 +46,17 @@ function DailyEuRsnDispatchReport() {
}

setExportBookIds([...new Set(resultValues)]);

var resultConsignmentValues = result.reportResults[0].results
.map(a => a.values)
.map(row => row[23]?.textDisplayValue);

if (!resultConsignmentValues || resultConsignmentValues.length === 0) {
setConsignmentNumbers([]);
return;
}

setConsignmentNumbers([...new Set(resultConsignmentValues)]);
}
}, [result]);

Expand Down Expand Up @@ -110,12 +123,21 @@ function DailyEuRsnDispatchReport() {
href={`${itemTypes.downloadExpbookInvoices.url}?documentType=E&${exportBookIds.map(id => `documentNumber=${id}`).join('&')}`}
fileName="DailyInvoices.pdf"
accept="application/pdf"
tooltipText="Download as PDF"
tooltipText="Download export book invoices as PDF"
disabled={!exportBookIds?.length}
buttonText="Download Invoices"
/>
</Grid>
<Grid size={2} />
<Grid size={2} sx={{ marginTop: 4 }}>
<ExportButton
href={`${itemTypes.localConsignments.url}/multiple-packing-lists/pdf?${consignmentNumbers.map(id => `consignmentNumber=${id}`).join('&')}`}
fileName="PackingLists.pdf"
accept="application/pdf"
tooltipText="Download packing lists as PDF"
disabled={!consignmentNumbers?.length}
buttonText="Packing Lists"
/>
</Grid>
{isLoading && (
<Grid size={12}>
<Loading />
Expand Down
Loading