From 59a430de50f9effc25a39b055f23c41b299fe37c Mon Sep 17 00:00:00 2001
From: "usama.jameel" <usama.jameel@utopia.pk>
Date: Wed, 11 Jun 2025 11:17:48 +0500
Subject: [PATCH] fix order table

---
 .../com/utopiaindustries/dao/ctp/PurchaseOrderCTPDao.java   | 2 +-
 .../com/utopiaindustries/service/PurchaseOrderService.java  | 6 ++++--
 src/main/resources/templates/po-status-pdf.html             | 2 +-
 src/main/resources/templates/reporting/po-report.html       | 3 +--
 .../resources/templates/reporting/po-store-items-table.html | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/utopiaindustries/dao/ctp/PurchaseOrderCTPDao.java b/src/main/java/com/utopiaindustries/dao/ctp/PurchaseOrderCTPDao.java
index ddde8e8..77356d7 100644
--- a/src/main/java/com/utopiaindustries/dao/ctp/PurchaseOrderCTPDao.java
+++ b/src/main/java/com/utopiaindustries/dao/ctp/PurchaseOrderCTPDao.java
@@ -23,7 +23,7 @@ public class PurchaseOrderCTPDao {
 
     private final String TABLE_NAME = "cut_to_pack.purchase_order";
     private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME );
-    private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id DESC", TABLE_NAME );
+    private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ", TABLE_NAME );
     private final String SELECT_BY_PO_CODE = String.format( "SELECT * FROM %s WHERE purchase_order_code = :purchase_order_code", TABLE_NAME );
     private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME );
     private final String INSERT_QUERY = String.format(
diff --git a/src/main/java/com/utopiaindustries/service/PurchaseOrderService.java b/src/main/java/com/utopiaindustries/service/PurchaseOrderService.java
index 5f10f8b..6de4da8 100644
--- a/src/main/java/com/utopiaindustries/service/PurchaseOrderService.java
+++ b/src/main/java/com/utopiaindustries/service/PurchaseOrderService.java
@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
 
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
@@ -39,11 +40,12 @@ public class PurchaseOrderService {
      * Print Job card *
      * **/
     public ResponseEntity<InputStreamResource> generatePOPdf(POsDetails pOsDetails, Model model, boolean jobCardDetail, boolean storeDetail ) throws Exception {
+        Map<String,Integer> storeItems = purchaseOrderCTPService.getStoreItemsByPoId(pOsDetails.getPoId());
         model.addAttribute("poDetail",  pOsDetails);
         model.addAttribute( "baseUrl", URLUtils.getCurrentBaseUrl() );
-        if (storeDetail){
+        if (storeDetail && !storeItems.isEmpty()){
             model.addAttribute("showStore", true);
-            model.addAttribute("store",  purchaseOrderCTPService.getStoreItemsByPoId(pOsDetails.getPoId()));
+            model.addAttribute("store", storeItems);
         }else {
             model.addAttribute("showStore", false);
         }
diff --git a/src/main/resources/templates/po-status-pdf.html b/src/main/resources/templates/po-status-pdf.html
index b632eb1..3e28128 100644
--- a/src/main/resources/templates/po-status-pdf.html
+++ b/src/main/resources/templates/po-status-pdf.html
@@ -91,7 +91,7 @@
 
     <table class="bordered" style="width: 50%; margin-top: 20px;" th:if="${showStore}">
         <tr class="tr-header">
-            <td colspan="2" th:text="'Store Items'"></td>
+            <td colspan="2" th:text="'Reject Items In Store'"></td>
         </tr>
         <tbody>
         <tr th:each="heading : ${store.keySet()}"
diff --git a/src/main/resources/templates/reporting/po-report.html b/src/main/resources/templates/reporting/po-report.html
index f923c3c..621e1c4 100644
--- a/src/main/resources/templates/reporting/po-report.html
+++ b/src/main/resources/templates/reporting/po-report.html
@@ -9,8 +9,7 @@
         <aside class="col-sm-2" th:replace="/reporting/po-report-sidebar :: sidebar"></aside>
         <div class="col-lg-10 col-sm-10">
             <h3>All PO's </h3>
-            <table th:if="${ #lists != null && #lists.size(allPOs) !=  0 }" class="table table-striped font-sm"
-                   data-order="[[ 0, &quot;asc&quot; ]]">
+            <table th:if="${ #lists != null && #lists.size(allPOs) !=  0 }" class="table table-striped font-sm" data-account-tables data-order="[[ 0, &quot;asc&quot; ]]">
                 <thead>
                 <tr>
                     <th>PO Number</th>
diff --git a/src/main/resources/templates/reporting/po-store-items-table.html b/src/main/resources/templates/reporting/po-store-items-table.html
index acf3c33..94455b9 100644
--- a/src/main/resources/templates/reporting/po-store-items-table.html
+++ b/src/main/resources/templates/reporting/po-store-items-table.html
@@ -8,7 +8,7 @@
 <div class="container">
     <div class="row">
         <div class="col-sm-8">
-            <table th:if="${#lists != null && #lists.size(storeItems.keySet()) !=  0  }" class="table table-bordered font-sm mb-4" data-account-tables>
+            <table th:if="${#lists != null && #lists.size(storeItems.keySet()) !=  0  }" class="table table-bordered font-sm mb-4" data-account-tables >
                 <thead>
                 <tr>
                     <th th:each="heading : ${storeItems.keySet()}" th:text="${heading}"></th>