diff --git a/src/main/java/com/utopiaindustries/service/ReportingService.java b/src/main/java/com/utopiaindustries/service/ReportingService.java index 4177800..e09a9ea 100644 --- a/src/main/java/com/utopiaindustries/service/ReportingService.java +++ b/src/main/java/com/utopiaindustries/service/ReportingService.java @@ -768,6 +768,7 @@ public class ReportingService { List wrappers = jobCardItems.stream().map(item -> { CuttingJobCardItemWrapper wrapper = new CuttingJobCardItemWrapper(); wrapper.setArticleName(jobCard.getArticleName()); + wrapper.setJobCardId(jobCard.getId()); wrapper.setJobCardCode(jobCard.getCode()); wrapper.setSku(item.getSku()); wrapper.setPoName(jobCard.getPurchaseOrderId()); @@ -781,9 +782,6 @@ public class ReportingService { jobCardItemsStitchingDetailsMap.computeIfAbsent(accountId, k -> new ArrayList<>()).addAll(wrappers); } - System.out.println(jobCardItemsStitchingDetailsMap); - System.out.println(totalStitchingBasedOnAccountID); - stitchingDetails.put("totalStitchingBasedOnAccountID", totalStitchingBasedOnAccountID); stitchingDetails.put("jobCardItemsStitchingDetailsMap", jobCardItemsStitchingDetailsMap); stitchingDetails.put("Date Wise Stitching", dateWiseProduction); diff --git a/src/main/resources/templates/reporting/accounts-transaction-table.html b/src/main/resources/templates/reporting/accounts-transaction-table.html index b77f667..7f4eba4 100644 --- a/src/main/resources/templates/reporting/accounts-transaction-table.html +++ b/src/main/resources/templates/reporting/accounts-transaction-table.html @@ -23,7 +23,7 @@
- +
@@ -62,25 +62,51 @@
diff --git a/src/main/resources/templates/reporting/stitching-report.html b/src/main/resources/templates/reporting/stitching-report.html index ee5d0f1..6eb434a 100644 --- a/src/main/resources/templates/reporting/stitching-report.html +++ b/src/main/resources/templates/reporting/stitching-report.html @@ -2,7 +2,7 @@ - +
@@ -28,7 +28,7 @@
-
@@ -56,7 +56,7 @@ title="Transactions"> -
+ @@ -69,17 +69,15 @@ - -
-
ID