From 5bf7d76bc88e949890d69f12810d874c7bbe71f4 Mon Sep 17 00:00:00 2001
From: yoganandhank <yogalinking@gmail.com>
Date: Mon, 12 Oct 2026 12:13:33 +0530
Subject: [PATCH] new changes in adjustemnt project, toner management project,
 rental management project api's and pages

---
 .../controller/AdjustmentController.java      |    2 +
 .../service/AdjustmentService.java            |    8 +-
 .../controller/RentalController.java          |  224 +-
 .../service/RentalService.java                |  374 ++-
 .../controller/TonerController.java           |  172 +
 .../service/TonerService.java                 |  144 +-
 .../gccadjustmentmanagement/dashboard.html    |   11 +
 .../gccadjustmentmanagement/details.html      |   19 +-
 .../gccrentalmanagement/dashboard.html        | 2844 ++++++++++++++---
 .../templates/gcctonermanagement/details.html | 1637 ++++++++++
 .../templates/gcctonermanagement/login.html   |    2 +
 .../templates/gcctonermanagement/upload.html  | 2534 ++++++++++++---
 12 files changed, 6874 insertions(+), 1097 deletions(-)
 create mode 100644 src/main/resources/templates/gcctonermanagement/details.html

diff --git a/src/main/java/com/gcc_manpower/gccadjustmentmanagement/controller/AdjustmentController.java b/src/main/java/com/gcc_manpower/gccadjustmentmanagement/controller/AdjustmentController.java
index 450d72e..1c92390 100644
--- a/src/main/java/com/gcc_manpower/gccadjustmentmanagement/controller/AdjustmentController.java
+++ b/src/main/java/com/gcc_manpower/gccadjustmentmanagement/controller/AdjustmentController.java
@@ -218,6 +218,7 @@ public class AdjustmentController {
             @RequestParam(value = "fund_type_id", required = false) String fundTypeId,
             @RequestParam(value = "bal_amt", required = false) Double balAmt,
             @RequestParam(value = "file_remark", required = false) String fileRemark,
+            @RequestParam(value = "review_remark", required = false) String reviewRemark,
             @RequestParam(value = "file_data_num", required = false) String fileDataNum,
             @RequestParam(value = "pi_amt", required = false) Double piAmt,
             @RequestParam(value = "pi_file_gen_date", required = false) String piFileGenDate,
@@ -308,6 +309,7 @@ public class AdjustmentController {
             data.put("fund_type_id", fundTypeId);
             data.put("bal_amt", balAmt);
             data.put("file_remark", fileRemark);
+            data.put("review_remark", reviewRemark);
             data.put("file_data_num", fileDataNum);
             data.put("pi_amt", piAmt);
             data.put("pi_file_gen_date", piFileGenDate);
diff --git a/src/main/java/com/gcc_manpower/gccadjustmentmanagement/service/AdjustmentService.java b/src/main/java/com/gcc_manpower/gccadjustmentmanagement/service/AdjustmentService.java
index 06eff07..d56600d 100644
--- a/src/main/java/com/gcc_manpower/gccadjustmentmanagement/service/AdjustmentService.java
+++ b/src/main/java/com/gcc_manpower/gccadjustmentmanagement/service/AdjustmentService.java
@@ -219,7 +219,7 @@ public class AdjustmentService {
                     "as_file_gen_date = ?, as_file_path = ?, as_final_file_gen_date = ?, as_final_file_path = ?, " +
                     "bal_amt = ?, dc_file_path = ?, ejv_num = ?, ejv_num_file_gen_date = ?, ejv_num_file_path = ?, " +
                     "fi_amt = ?, fi_file_gen_date = ?, fi_file_path = ?, file_data_num = ?, file_path = ?, " +
-                    "file_remark = ?, fin_year = ?, subject = ?, ir_file_path = ?, pi_amt = ?, pi_file_gen_date = ?, " +
+                    "file_remark = ?, review_remark = ?, fin_year = ?, subject = ?, ir_file_path = ?, pi_amt = ?, pi_file_gen_date = ?, " +
                     "pi_file_path = ?, po_file_path = ?, rtgs_file_path = ?, sr_filepath = ?, tc_file_gen_date = ?, " +
                     "tc_file_path = ?, vend_name = ?, adv_type_id = ?, fund_type_id = ?, ac_code = ?, " +
                     "file_available_status = ?, dc_completed_date = ?, rtgs_date = ?, file_status_id = ?, updated_date = ?, updated_by = ? WHERE id = ?";
@@ -240,6 +240,7 @@ public class AdjustmentService {
                         data.get("file_data_num"),
                         data.get("file_path"),
                         data.get("file_remark"),
+                        data.get("review_remark"),
                         data.get("fin_year"),
                         data.get("subject"),
                         data.get("ir_file_path"),
@@ -274,12 +275,12 @@ public class AdjustmentService {
                     "as_file_gen_date, as_file_path, as_final_file_gen_date, as_final_file_path, " +
                     "bal_amt, dc_file_path, ejv_num, ejv_num_file_gen_date, ejv_num_file_path, " +
                     "fi_amt, fi_file_gen_date, fi_file_path, file_data_num, file_path, " +
-                    "file_remark, fin_year, subject, ir_file_path, pi_amt, pi_file_gen_date, " +
+                    "file_remark, review_remark, fin_year, subject, ir_file_path, pi_amt, pi_file_gen_date, " +
                     "pi_file_path, po_file_path, rtgs_file_path, sr_filepath, tc_file_gen_date, " +
                     "tc_file_path, vend_name, adv_type_id, fund_type_id, ac_code, file_available_status, " +
                     "dc_completed_date, rtgs_date, file_status_id, cdate, updated_date, updated_by, is_active, is_delete) VALUES "
                     +
-                    "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, 0)";
+                    "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, 0)";
             try {
                 int rows = jdbcTemplate.update(sql,
                         parseDate(data.get("as_file_gen_date")),
@@ -297,6 +298,7 @@ public class AdjustmentService {
                         data.get("file_data_num"),
                         data.get("file_path"),
                         data.get("file_remark"),
+                        data.get("review_remark"),
                         data.get("fin_year"),
                         data.get("subject"),
                         data.get("ir_file_path"),
diff --git a/src/main/java/com/gcc_manpower/gccrentalmanagement/controller/RentalController.java b/src/main/java/com/gcc_manpower/gccrentalmanagement/controller/RentalController.java
index 190395e..0711c10 100644
--- a/src/main/java/com/gcc_manpower/gccrentalmanagement/controller/RentalController.java
+++ b/src/main/java/com/gcc_manpower/gccrentalmanagement/controller/RentalController.java
@@ -5,6 +5,7 @@ import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -87,7 +88,8 @@ public class RentalController {
         Map<String, Object> response = new HashMap<>();
 
         try {
-            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(usrName, usrPass);
+            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(usrName,
+                    usrPass);
             Authentication authentication = authenticationManager.authenticate(authenticationToken);
 
             SecurityContextHolder.getContext().setAuthentication(authentication);
@@ -146,6 +148,12 @@ public class RentalController {
         return rentalService.getActiveZones();
     }
 
+    @GetMapping("/api/categories")
+    @ResponseBody
+    public List<Map<String, Object>> getCategories(HttpSession session) {
+        return rentalService.getActiveCategories();
+    }
+
     @GetMapping("/api/vendors")
     @ResponseBody
     public List<Map<String, Object>> getVendors(HttpSession session) {
@@ -178,12 +186,9 @@ public class RentalController {
             @RequestParam("periodFromDate") String periodFromDate,
             @RequestParam("periodToDate") String periodToDate,
             @RequestParam("vendorName") String vendorName,
-            @RequestParam(value = "systemsQty", defaultValue = "0") Integer systemsQty,
-            @RequestParam(value = "systemsModel", defaultValue = "") String systemsModel,
-            @RequestParam(value = "printersQty", defaultValue = "0") Integer printersQty,
-            @RequestParam(value = "printersModel", defaultValue = "") String printersModel,
-            @RequestParam(value = "laptopsQty", defaultValue = "0") Integer laptopsQty,
-            @RequestParam(value = "laptopsModel", defaultValue = "") String laptopsModel,
+            @RequestParam(value = "cid", required = false) List<String> cids,
+            @RequestParam(value = "categoryQty", required = false) List<String> categoryQtys,
+            @RequestParam(value = "categoryModelName", required = false) List<String> categoryModelNames,
             @RequestParam(value = "woCopyFile", required = false) MultipartFile woCopyFile,
             @RequestParam(value = "remarks", defaultValue = "") String remarks,
             HttpSession session) {
@@ -196,23 +201,81 @@ public class RentalController {
             return response;
         }
 
+        if (cids == null || cids.isEmpty()) {
+            response.put("success", false);
+            response.put("error", "Please add at least one Asset Category.");
+            return response;
+        }
+
+        List<Map<String, Object>> categoryItems = new ArrayList<>();
+        for (int i = 0; i < cids.size(); i++) {
+            String cidStr = cids.get(i);
+            String qtyStr = (categoryQtys != null && i < categoryQtys.size()) ? categoryQtys.get(i) : "0";
+            String model = (categoryModelNames != null && i < categoryModelNames.size()) ? categoryModelNames.get(i)
+                    : "";
+
+            Integer cid = null;
+            try {
+                if (cidStr != null && !cidStr.trim().isEmpty()) {
+                    cid = Integer.parseInt(cidStr.trim());
+                }
+            } catch (Exception ignored) {
+            }
+
+            Integer qty = null;
+            try {
+                if (qtyStr != null && !qtyStr.trim().isEmpty()) {
+                    qty = Integer.parseInt(qtyStr.trim());
+                }
+            } catch (Exception ignored) {
+            }
+
+            if (cid == null || cid <= 0) {
+                response.put("success", false);
+                response.put("error", "Please select a valid Asset Category for all items.");
+                return response;
+            }
+
+            if (qty == null || qty <= 0) {
+                response.put("success", false);
+                response.put("error", "Category Quantity must be greater than 0 for all items.");
+                return response;
+            }
+
+            if (model == null || model.trim().isEmpty()) {
+                response.put("success", false);
+                response.put("error", "Asset Model Name / Specifications is mandatory for all items.");
+                return response;
+            }
+
+            Map<String, Object> item = new HashMap<>();
+            item.put("cid", cid);
+            item.put("categoryQty", qty);
+            item.put("categoryModelName", model.trim());
+            categoryItems.add(item);
+        }
+
+        if (woCopyFile == null || woCopyFile.isEmpty()) {
+            response.put("success", false);
+            response.put("error", "Upload Work Order Copy (PDF / Doc) is mandatory.");
+            return response;
+        }
+
         try {
             File uploadDir = new File(rentalUploadPathConfig).getAbsoluteFile();
-            if (!uploadDir.exists()) uploadDir.mkdirs();
+            if (!uploadDir.exists())
+                uploadDir.mkdirs();
 
-            String woCopyPath = null;
-            if (woCopyFile != null && !woCopyFile.isEmpty()) {
-                woCopyPath = saveUploadedFile(woCopyFile, "wo", uploadDir);
-            }
+            String woCopyPath = saveUploadedFile(woCopyFile, "wo", uploadDir);
 
-            boolean saved = rentalService.saveWorkOrder(
+            boolean saved = rentalService.saveWorkOrders(
                     woFileNo, fileSubject, periodFromDate, periodToDate, vendorName,
-                    systemsQty, systemsModel, printersQty, printersModel,
-                    laptopsQty, laptopsModel, woCopyPath, remarks, username);
+                    categoryItems, woCopyPath, remarks, username);
 
             if (saved) {
                 response.put("success", true);
-                response.put("message", "Work order registered successfully.");
+                response.put("message",
+                        "Work order registered successfully with " + categoryItems.size() + " category item(s).");
             } else {
                 response.put("success", false);
                 response.put("error", "Failed to save work order to database.");
@@ -241,9 +304,9 @@ public class RentalController {
             @RequestParam("tapalDate") String tapalDate,
             @RequestParam("deptId") Integer deptId,
             @RequestParam(value = "zoneId", required = false) Integer zoneId,
-            @RequestParam(value = "reqSystemsQty", defaultValue = "0") Integer reqSystemsQty,
-            @RequestParam(value = "reqPrintersQty", defaultValue = "0") Integer reqPrintersQty,
-            @RequestParam(value = "reqLaptopsQty", defaultValue = "0") Integer reqLaptopsQty,
+            @RequestParam(value = "cid", required = false) List<Integer> cids,
+            @RequestParam(value = "categoryQty", required = false) List<Integer> categoryQtys,
+            @RequestParam(value = "categoryModelName", required = false) List<String> categoryModelNames,
             @RequestParam("requiredFromDate") String requiredFromDate,
             @RequestParam("requiredToDate") String requiredToDate,
             @RequestParam(value = "mailCopyFile", required = false) MultipartFile mailCopyFile,
@@ -261,24 +324,65 @@ public class RentalController {
             return response;
         }
 
+        if (cids == null || cids.isEmpty()) {
+            response.put("success", false);
+            response.put("error", "Please add at least one requested asset category.");
+            return response;
+        }
+
+        List<Map<String, Object>> categoryItems = new ArrayList<>();
+        for (int i = 0; i < cids.size(); i++) {
+            Integer cid = cids.get(i);
+            Integer qty = (categoryQtys != null && i < categoryQtys.size()) ? categoryQtys.get(i) : 1;
+            String model = (categoryModelNames != null && i < categoryModelNames.size()) ? categoryModelNames.get(i) : "";
+
+            if (cid == null || cid <= 0) {
+                response.put("success", false);
+                response.put("error", "Please select a valid Requested Asset Category for all items.");
+                return response;
+            }
+
+            if (qty == null || qty <= 0) {
+                response.put("success", false);
+                response.put("error", "Requested Category Quantity must be greater than 0 for all items.");
+                return response;
+            }
+
+            if (model == null || model.trim().isEmpty()) {
+                response.put("success", false);
+                response.put("error", "Requested Model Name / Specifications is mandatory for all items.");
+                return response;
+            }
+
+            Map<String, Object> item = new HashMap<>();
+            item.put("cid", cid);
+            item.put("categoryQty", qty);
+            item.put("categoryModelName", model.trim());
+            categoryItems.add(item);
+        }
+
+        if (mailCopyFile == null || mailCopyFile.isEmpty()) {
+            response.put("success", false);
+            response.put("error", "Please upload the Mail Copy (PDF / Scan).");
+            return response;
+        }
+
         try {
             File uploadDir = new File(rentalUploadPathConfig).getAbsoluteFile();
-            if (!uploadDir.exists()) uploadDir.mkdirs();
+            if (!uploadDir.exists())
+                uploadDir.mkdirs();
 
-            String mailCopyPath = null;
-            if (mailCopyFile != null && !mailCopyFile.isEmpty()) {
-                mailCopyPath = saveUploadedFile(mailCopyFile, "request_mail", uploadDir);
-            }
+            String mailCopyPath = saveUploadedFile(mailCopyFile, "request_mail", uploadDir);
 
-            boolean saved = rentalService.saveUserRequest(
+            boolean saved = rentalService.saveUserRequests(
                     tapalNo, tapalDate, deptId, zoneId,
-                    reqSystemsQty, reqPrintersQty, reqLaptopsQty,
+                    categoryItems,
                     requiredFromDate, requiredToDate, mailCopyPath, reqStatusId,
                     requestingOfficer, contactNo, purpose, username);
 
             if (saved) {
                 response.put("success", true);
-                response.put("message", "Department request registered successfully.");
+                response.put("message", "Department request registered successfully with " + categoryItems.size() + " category item(s).");
             } else {
                 response.put("success", false);
                 response.put("error", "Failed to save department request.");
@@ -310,6 +414,8 @@ public class RentalController {
             @RequestParam(value = "inSystemsQty", defaultValue = "0") Integer inSystemsQty,
             @RequestParam(value = "inPrintersQty", defaultValue = "0") Integer inPrintersQty,
             @RequestParam(value = "inLaptopsQty", defaultValue = "0") Integer inLaptopsQty,
+            @RequestParam(value = "inUpsQty", defaultValue = "0") Integer inUpsQty,
+            @RequestParam(value = "inDongleQty", defaultValue = "0") Integer inDongleQty,
             @RequestParam(value = "dcFile", required = false) MultipartFile dcFile,
             @RequestParam(value = "vehicleNo", defaultValue = "") String vehicleNo,
             @RequestParam(value = "receivedBy", defaultValue = "") String receivedBy,
@@ -326,7 +432,8 @@ public class RentalController {
 
         try {
             File uploadDir = new File(rentalUploadPathConfig).getAbsoluteFile();
-            if (!uploadDir.exists()) uploadDir.mkdirs();
+            if (!uploadDir.exists())
+                uploadDir.mkdirs();
 
             String dcFilePath = null;
             if (dcFile != null && !dcFile.isEmpty()) {
@@ -335,7 +442,7 @@ public class RentalController {
 
             boolean saved = rentalService.saveInwardChallan(
                     woId, dcNo, dcDate, vendorName,
-                    inSystemsQty, inPrintersQty, inLaptopsQty,
+                    inSystemsQty, inPrintersQty, inLaptopsQty, inUpsQty, inDongleQty,
                     dcFilePath, vehicleNo, receivedBy, remarks, username);
 
             if (saved) {
@@ -369,6 +476,10 @@ public class RentalController {
             @RequestParam(value = "inwardDcId", required = false) Integer inwardDcId,
             @RequestParam(value = "woId", required = false) Integer woId,
             @RequestParam("issuedDate") String issuedDate,
+            @RequestParam(value = "cid", required = false) List<String> cids,
+            @RequestParam(value = "categoryModelName", required = false) List<String> categoryModelNames,
+            @RequestParam(value = "requestedQty", required = false) List<String> requestedQtys,
+            @RequestParam(value = "issuedQty", required = false) List<String> issuedQtys,
             @RequestParam(value = "issuedSystemsQty", defaultValue = "0") Integer issuedSystemsQty,
             @RequestParam(value = "issuedPrintersQty", defaultValue = "0") Integer issuedPrintersQty,
             @RequestParam(value = "issuedLaptopsQty", defaultValue = "0") Integer issuedLaptopsQty,
@@ -391,15 +502,57 @@ public class RentalController {
 
         try {
             File uploadDir = new File(rentalUploadPathConfig).getAbsoluteFile();
-            if (!uploadDir.exists()) uploadDir.mkdirs();
+            if (!uploadDir.exists())
+                uploadDir.mkdirs();
 
-            String stockCopyPath = null;
-            if (stockCopyFile != null && !stockCopyFile.isEmpty()) {
-                stockCopyPath = saveUploadedFile(stockCopyFile, "issue_stock", uploadDir);
+            if (stockCopyFile == null || stockCopyFile.isEmpty()) {
+                response.put("success", false);
+                response.put("error", "Upload Stock Issue Copy (Acknowledgment / Handover Slip) is mandatory.");
+                return response;
+            }
+            String stockCopyPath = saveUploadedFile(stockCopyFile, "issue_stock", uploadDir);
+
+            List<Map<String, Object>> itemDetails = new ArrayList<>();
+            if (cids != null && !cids.isEmpty()) {
+                for (int i = 0; i < cids.size(); i++) {
+                    String cidStr = cids.get(i);
+                    Integer cid = null;
+                    try {
+                        if (cidStr != null && !cidStr.trim().isEmpty()) {
+                            cid = Integer.parseInt(cidStr.trim());
+                        }
+                    } catch (Exception ignored) {
+                    }
+
+                    Integer reqQty = 0;
+                    try {
+                        if (requestedQtys != null && i < requestedQtys.size() && requestedQtys.get(i) != null) {
+                            reqQty = Integer.parseInt(requestedQtys.get(i).trim());
+                        }
+                    } catch (Exception ignored) {
+                    }
+
+                    Integer issQty = 0;
+                    try {
+                        if (issuedQtys != null && i < issuedQtys.size() && issuedQtys.get(i) != null) {
+                            issQty = Integer.parseInt(issuedQtys.get(i).trim());
+                        }
+                    } catch (Exception ignored) {
+                    }
+
+                    String model = (categoryModelNames != null && i < categoryModelNames.size()) ? categoryModelNames.get(i) : "";
+
+                    Map<String, Object> item = new HashMap<>();
+                    item.put("cid", cid);
+                    item.put("categoryModelName", model != null ? model.trim() : "");
+                    item.put("requestedQty", reqQty);
+                    item.put("issuedQty", issQty);
+                    itemDetails.add(item);
+                }
             }
 
             boolean saved = rentalService.saveIssuedDetails(
-                    requestId, inwardDcId, woId, issuedDate,
+                    requestId, inwardDcId, woId, itemDetails, issuedDate,
                     issuedSystemsQty, issuedPrintersQty, issuedLaptopsQty,
                     assetSerialDetails, issuedFromDate, issuedToDate, stockCopyPath,
                     custodianOfficer, contactNo, issuedBy, username);
@@ -455,7 +608,8 @@ public class RentalController {
 
         try {
             File uploadDir = new File(rentalUploadPathConfig).getAbsoluteFile();
-            if (!uploadDir.exists()) uploadDir.mkdirs();
+            if (!uploadDir.exists())
+                uploadDir.mkdirs();
 
             String stockCopyPath = null;
             if (stockCopyFile != null && !stockCopyFile.isEmpty()) {
diff --git a/src/main/java/com/gcc_manpower/gccrentalmanagement/service/RentalService.java b/src/main/java/com/gcc_manpower/gccrentalmanagement/service/RentalService.java
index f12289f..4f4a23a 100644
--- a/src/main/java/com/gcc_manpower/gccrentalmanagement/service/RentalService.java
+++ b/src/main/java/com/gcc_manpower/gccrentalmanagement/service/RentalService.java
@@ -27,16 +27,58 @@ public class RentalService {
     @Autowired
     public void setDataSource(@Qualifier("mysqlItcellManagementDataSource") DataSource dataSource) {
         this.jdbcTemplate = new JdbcTemplate(dataSource);
-    }
 
-    public JdbcTemplate getJdbcTemplate() {
-        return this.jdbcTemplate;
     }
 
     // =========================================================================
-    // 1. MASTER LOOKUPS (Departments, Zones, Vendors, Master Statuses)
+    // 1. MASTER LOOKUPS (Categories, Departments, Zones, Vendors, Master Statuses)
     // =========================================================================
 
+    public List<Map<String, Object>> getActiveCategories() {
+        String sql = "SELECT id, category_type, category_type AS category_name, order_by, is_active "
+                + "FROM rental_category_master "
+                + "WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) "
+                + "ORDER BY COALESCE(order_by, id) ASC, id ASC";
+        try {
+            return jdbcTemplate.queryForList(sql);
+        } catch (Exception e1) {
+            try {
+                return jdbcTemplate.queryForList(
+                        "SELECT id, category_type, category_type AS category_name FROM rental_category_master WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) ORDER BY id ASC");
+            } catch (Exception e2) {
+                try {
+                    return jdbcTemplate
+                            .queryForList(
+                                    "SELECT id, category_type, category_type AS category_name FROM rental_category_master ORDER BY id ASC");
+                } catch (Exception e3) {
+                    try {
+                        List<Map<String, Object>> rows = jdbcTemplate
+                                .queryForList("SELECT * FROM rental_category_master");
+                        List<Map<String, Object>> result = new ArrayList<>();
+                        for (Map<String, Object> r : rows) {
+                            Map<String, Object> map = new HashMap<>();
+                            map.put("id", r.get("id"));
+                            Object catType = r.get("category_type") != null ? r.get("category_type")
+                                    : (r.get("category_name") != null ? r.get("category_name")
+                                            : (r.get("name") != null ? r.get("name")
+                                                    : (r.get("category") != null ? r.get("category")
+                                                            : (r.get("cat_name") != null ? r.get("cat_name")
+                                                                    : "Category " + r.get("id")))));
+                            String catStr = catType != null ? catType.toString() : "Category " + r.get("id");
+                            map.put("category_type", catStr);
+                            map.put("category_name", catStr);
+                            result.add(map);
+                        }
+                        return result;
+                    } catch (Exception e4) {
+                        e4.printStackTrace();
+                        return new ArrayList<>();
+                    }
+                }
+            }
+        }
+    }
+
     public List<Map<String, Object>> getActiveDepartments() {
         String sql = "SELECT id, dept_name FROM toner_department_list WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) ORDER BY dept_name ASC";
         try {
@@ -110,43 +152,98 @@ public class RentalService {
     // =========================================================================
 
     @Transactional
-    public boolean saveWorkOrder(String woFileNo, String fileSubject, String fromDate, String toDate,
-            String vendorName, Integer systemsQty, String systemsModel,
-            Integer printersQty, String printersModel, Integer laptopsQty,
-            String laptopsModel, String woCopyPath, String remarks, String updatedBy) {
+    public boolean saveWorkOrders(String woFileNo, String fileSubject, String fromDate, String toDate,
+            String vendorName, List<Map<String, Object>> categoryItems,
+            String woCopyPath, String remarks, String updatedBy) {
         String sql = "INSERT INTO rental_workorder_register " +
                 "(wo_file_no, file_subject, period_from_date, period_to_date, vendor_name, " +
-                "systems_qty, systems_model_name, printers_qty, printers_model_name, " +
-                "laptops_qty, laptops_model_name, wo_copy_file, status, remarks, created_by, is_active, is_delete) " +
-                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'Active', ?, ?, 1, 0)";
+                "cid, category_qty, category_model_name, wo_copy_file, status, remarks, created_by, is_active, is_delete) "
+                +
+                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 'Active', ?, ?, 1, 0)";
         try {
-            int rows = jdbcTemplate.update(sql,
-                    woFileNo != null ? woFileNo.trim() : null,
-                    fileSubject != null ? fileSubject.trim() : null,
-                    fromDate, toDate,
-                    vendorName != null ? vendorName.trim() : null,
-                    systemsQty != null ? systemsQty : 0,
-                    systemsModel != null ? systemsModel.trim() : "",
-                    printersQty != null ? printersQty : 0,
-                    printersModel != null ? printersModel.trim() : "",
-                    laptopsQty != null ? laptopsQty : 0,
-                    laptopsModel != null ? laptopsModel.trim() : "",
-                    woCopyPath, remarks, updatedBy);
-            return rows > 0;
+            if (categoryItems == null || categoryItems.isEmpty()) {
+                return false;
+            }
+            for (Map<String, Object> item : categoryItems) {
+                Integer cid = item.get("cid") != null ? Integer.valueOf(item.get("cid").toString()) : null;
+                Integer qty = item.get("categoryQty") != null ? Integer.valueOf(item.get("categoryQty").toString()) : 0;
+                String model = item.get("categoryModelName") != null ? item.get("categoryModelName").toString() : "";
+                jdbcTemplate.update(sql,
+                        woFileNo != null ? woFileNo.trim() : null,
+                        fileSubject != null ? fileSubject.trim() : null,
+                        fromDate, toDate,
+                        vendorName != null ? vendorName.trim() : null,
+                        cid,
+                        qty,
+                        model != null ? model.trim() : "",
+                        woCopyPath, remarks, updatedBy);
+            }
+            return true;
         } catch (Exception e) {
+            String msg = e.getMessage() != null ? e.getMessage().toLowerCase() : "";
+            if (msg.contains("idx_wo_file_no") || msg.contains("duplicate entry") || msg.contains("constraint")) {
+                try {
+                    for (Map<String, Object> item : categoryItems) {
+                        Integer cid = item.get("cid") != null ? Integer.valueOf(item.get("cid").toString()) : null;
+                        Integer qty = item.get("categoryQty") != null
+                                ? Integer.valueOf(item.get("categoryQty").toString())
+                                : 0;
+                        String model = item.get("categoryModelName") != null ? item.get("categoryModelName").toString()
+                                : "";
+                        jdbcTemplate.update(sql,
+                                woFileNo != null ? woFileNo.trim() : null,
+                                fileSubject != null ? fileSubject.trim() : null,
+                                fromDate, toDate,
+                                vendorName != null ? vendorName.trim() : null,
+                                cid,
+                                qty,
+                                model != null ? model.trim() : "",
+                                woCopyPath, remarks, updatedBy);
+                    }
+                    return true;
+                } catch (Exception retryEx) {
+                    retryEx.printStackTrace();
+                }
+            }
             e.printStackTrace();
             return false;
         }
     }
 
+    @Transactional
+    public boolean saveWorkOrder(String woFileNo, String fileSubject, String fromDate, String toDate,
+            String vendorName, Integer cid, Integer categoryQty, String categoryModelName,
+            String woCopyPath, String remarks, String updatedBy) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
+        map.put("cid", cid);
+        map.put("categoryQty", categoryQty);
+        map.put("categoryModelName", categoryModelName);
+        list.add(map);
+        return saveWorkOrders(woFileNo, fileSubject, fromDate, toDate, vendorName, list, woCopyPath, remarks,
+                updatedBy);
+    }
+
     public List<Map<String, Object>> getAllWorkOrders() {
-        String sql = "SELECT id, wo_file_no, file_subject, period_from_date, period_to_date, vendor_name, " +
-                "systems_qty, systems_model_name, printers_qty, printers_model_name, " +
-                "laptops_qty, laptops_model_name, (systems_qty + printers_qty + laptops_qty) AS total_units, " +
-                "wo_copy_file, status, remarks, created_by, created_at " +
-                "FROM rental_workorder_register " +
-                "WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) " +
-                "ORDER BY id DESC";
+        String sql = "SELECT w.id, w.wo_file_no, w.file_subject, w.period_from_date, w.period_to_date, w.vendor_name, "
+                +
+                "w.cid, COALESCE(c.category_type, 'General') AS category_name, c.category_type, " +
+                "w.category_qty, w.category_model_name, " +
+                "COALESCE(w.category_qty, 0) AS total_units, " +
+                "COALESCE(dc.inwarded_qty, 0) AS total_inwarded_qty, " +
+                "w.wo_copy_file, w.status, w.remarks, w.created_by, w.created_at " +
+                "FROM rental_workorder_register w " +
+                "LEFT JOIN rental_category_master c ON w.cid = c.id " +
+                "LEFT JOIN (" +
+                "    SELECT wo_id, " +
+                "           SUM(COALESCE(inward_systems_qty, 0) + COALESCE(inward_printers_qty, 0) + COALESCE(inward_laptops_qty, 0) + COALESCE(inward_ups_qty, 0) + COALESCE(inward_dongle_qty, 0)) AS inwarded_qty "
+                +
+                "    FROM rental_inward_delivery_challan " +
+                "    WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) " +
+                "    GROUP BY wo_id" +
+                ") dc ON w.id = dc.wo_id " +
+                "WHERE (w.is_active IS NULL OR w.is_active = 1) AND (w.is_delete IS NULL OR w.is_delete = 0) " +
+                "ORDER BY w.id DESC";
         try {
             return jdbcTemplate.queryForList(sql);
         } catch (Exception e) {
@@ -155,7 +252,24 @@ public class RentalService {
     }
 
     public Map<String, Object> getWorkOrderById(int id) {
-        String sql = "SELECT * FROM rental_workorder_register WHERE id = ?";
+        String sql = "SELECT w.id, w.wo_file_no, w.file_subject, w.period_from_date, w.period_to_date, w.vendor_name, "
+                +
+                "w.cid, COALESCE(c.category_type, 'General') AS category_name, c.category_type, " +
+                "w.category_qty, w.category_model_name, " +
+                "COALESCE(w.category_qty, 0) AS total_units, " +
+                "COALESCE(dc.inwarded_qty, 0) AS total_inwarded_qty, " +
+                "w.wo_copy_file, w.status, w.remarks, w.created_by, w.created_at " +
+                "FROM rental_workorder_register w " +
+                "LEFT JOIN rental_category_master c ON w.cid = c.id " +
+                "LEFT JOIN (" +
+                "    SELECT wo_id, " +
+                "           SUM(COALESCE(inward_systems_qty, 0) + COALESCE(inward_printers_qty, 0) + COALESCE(inward_laptops_qty, 0) + COALESCE(inward_ups_qty, 0) + COALESCE(inward_dongle_qty, 0)) AS inwarded_qty "
+                +
+                "    FROM rental_inward_delivery_challan " +
+                "    WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) " +
+                "    GROUP BY wo_id" +
+                ") dc ON w.id = dc.wo_id " +
+                "WHERE w.id = ?";
         try {
             return jdbcTemplate.queryForMap(sql, id);
         } catch (Exception e) {
@@ -168,8 +282,8 @@ public class RentalService {
     // =========================================================================
 
     @Transactional
-    public boolean saveUserRequest(String tapalNo, String tapalDate, Integer deptId, Integer zoneId,
-            Integer reqSystemsQty, Integer reqPrintersQty, Integer reqLaptopsQty,
+    public boolean saveUserRequests(String tapalNo, String tapalDate, Integer deptId, Integer zoneId,
+            List<Map<String, Object>> categoryItems,
             String fromDate, String toDate, String mailCopyPath, Integer statusId,
             String requestingOfficer, String contactNo, String purpose, String updatedBy) {
 
@@ -178,42 +292,96 @@ public class RentalService {
 
         String sql = "INSERT INTO rental_user_request " +
                 "(tapal_no, tapal_date, department_id, zone_id, " +
-                "req_systems_qty, req_printers_qty, req_laptops_qty, " +
                 "required_from_date, required_to_date, calculated_days, " +
+                "cid, category_qty, category_model_name, " +
                 "mail_copy_file, req_status_id, requesting_officer, contact_no, purpose, " +
                 "created_by, is_active, is_delete) " +
                 "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, 0)";
         try {
-            int rows = jdbcTemplate.update(sql,
-                    tapalNo != null ? tapalNo.trim() : null,
-                    tapalDate,
-                    deptId, zoneId,
-                    reqSystemsQty != null ? reqSystemsQty : 0,
-                    reqPrintersQty != null ? reqPrintersQty : 0,
-                    reqLaptopsQty != null ? reqLaptopsQty : 0,
-                    fromDate, toDate, calculatedDays,
-                    mailCopyPath, finalStatusId,
-                    requestingOfficer != null ? requestingOfficer.trim() : null,
-                    contactNo != null ? contactNo.trim() : null,
-                    purpose, updatedBy);
-            return rows > 0;
+            for (Map<String, Object> item : categoryItems) {
+                Integer cid = item.get("cid") != null ? Integer.valueOf(item.get("cid").toString()) : null;
+                Integer qty = item.get("categoryQty") != null ? Integer.valueOf(item.get("categoryQty").toString()) : 0;
+                String model = item.get("categoryModelName") != null ? item.get("categoryModelName").toString() : "";
+
+                jdbcTemplate.update(sql,
+                        tapalNo != null ? tapalNo.trim() : null,
+                        tapalDate,
+                        deptId, zoneId,
+                        fromDate, toDate, calculatedDays,
+                        cid,
+                        qty,
+                        model != null ? model.trim() : "",
+                        mailCopyPath, finalStatusId,
+                        requestingOfficer != null ? requestingOfficer.trim() : null,
+                        contactNo != null ? contactNo.trim() : null,
+                        purpose, updatedBy);
+            }
+            return true;
         } catch (Exception e) {
+            String msg = e.getMessage() != null ? e.getMessage().toLowerCase() : "";
+            if (msg.contains("idx_tapal_no") || msg.contains("duplicate entry") || msg.contains("constraint")) {
+                try {
+                    for (Map<String, Object> item : categoryItems) {
+                        Integer cid = item.get("cid") != null ? Integer.valueOf(item.get("cid").toString()) : null;
+                        Integer qty = item.get("categoryQty") != null
+                                ? Integer.valueOf(item.get("categoryQty").toString())
+                                : 0;
+                        String model = item.get("categoryModelName") != null ? item.get("categoryModelName").toString()
+                                : "";
+
+                        jdbcTemplate.update(sql,
+                                tapalNo != null ? tapalNo.trim() : null,
+                                tapalDate,
+                                deptId, zoneId,
+                                fromDate, toDate, calculatedDays,
+                                cid,
+                                qty,
+                                model != null ? model.trim() : "",
+                                mailCopyPath, finalStatusId,
+                                requestingOfficer != null ? requestingOfficer.trim() : null,
+                                contactNo != null ? contactNo.trim() : null,
+                                purpose, updatedBy);
+                    }
+                    return true;
+                } catch (Exception retryEx) {
+                    retryEx.printStackTrace();
+                }
+            }
             e.printStackTrace();
             return false;
         }
     }
 
+    @Transactional
+    public boolean saveUserRequest(String tapalNo, String tapalDate, Integer deptId, Integer zoneId,
+            Integer cid, Integer categoryQty, String categoryModelName,
+            String fromDate, String toDate, String mailCopyPath, Integer statusId,
+            String requestingOfficer, String contactNo, String purpose, String updatedBy) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
+        map.put("cid", cid);
+        map.put("categoryQty", categoryQty);
+        map.put("categoryModelName", categoryModelName);
+        list.add(map);
+        return saveUserRequests(tapalNo, tapalDate, deptId, zoneId, list, fromDate, toDate, mailCopyPath, statusId,
+                requestingOfficer, contactNo, purpose, updatedBy);
+    }
+
     public List<Map<String, Object>> getAllUserRequests() {
         String sql = "SELECT r.id, r.tapal_no, r.tapal_date, r.department_id, d.dept_name, " +
-                "r.zone_id, z.zone_name, r.req_systems_qty, r.req_printers_qty, r.req_laptops_qty, " +
-                "(r.req_systems_qty + r.req_printers_qty + r.req_laptops_qty) AS total_req_qty, " +
-                "r.required_from_date, r.required_to_date, r.calculated_days, r.mail_copy_file, " +
+                "r.zone_id, z.zone_name, " +
+                "r.required_from_date, r.required_to_date, r.calculated_days, " +
+                "r.cid, COALESCE(c.category_type, 'General') AS category_name, c.category_type, " +
+                "r.category_qty, r.category_model_name, " +
+                "COALESCE(r.category_qty, 0) AS total_req_qty, " +
+                "r.mail_copy_file, " +
                 "r.req_status_id, COALESCE(s.status_name, 'Pending') AS status_name, " +
                 "COALESCE(s.badge_color, 'warning') AS badge_color, " +
                 "r.requesting_officer, r.contact_no, r.purpose, r.created_by, r.created_at " +
                 "FROM rental_user_request r " +
                 "LEFT JOIN toner_department_list d ON r.department_id = d.id " +
                 "LEFT JOIN toner_zone_list z ON r.zone_id = z.id " +
+                "LEFT JOIN rental_category_master c ON r.cid = c.id " +
                 "LEFT JOIN rental_master_status_list s ON r.req_status_id = s.id " +
                 "WHERE (r.is_active IS NULL OR r.is_active = 1) AND (r.is_delete IS NULL OR r.is_delete = 0) " +
                 "ORDER BY r.id DESC";
@@ -241,13 +409,14 @@ public class RentalService {
     @Transactional
     public boolean saveInwardChallan(Integer woId, String dcNo, String dcDate, String vendorName,
             Integer inSystemsQty, Integer inPrintersQty, Integer inLaptopsQty,
+            Integer inUpsQty, Integer inDongleQty,
             String dcFilePath, String vehicleNo, String receivedBy,
             String remarks, String updatedBy) {
         String sql = "INSERT INTO rental_inward_delivery_challan " +
                 "(wo_id, dc_no, dc_date, vendor_name, " +
-                "inward_systems_qty, inward_printers_qty, inward_laptops_qty, " +
+                "inward_systems_qty, inward_printers_qty, inward_laptops_qty, inward_ups_qty, inward_dongle_qty, " +
                 "dc_file_path, vehicle_no, received_by, remarks, created_by, is_active, is_delete) " +
-                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, 0)";
+                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, 0)";
         try {
             int rows = jdbcTemplate.update(sql,
                     woId,
@@ -257,6 +426,8 @@ public class RentalService {
                     inSystemsQty != null ? inSystemsQty : 0,
                     inPrintersQty != null ? inPrintersQty : 0,
                     inLaptopsQty != null ? inLaptopsQty : 0,
+                    inUpsQty != null ? inUpsQty : 0,
+                    inDongleQty != null ? inDongleQty : 0,
                     dcFilePath,
                     vehicleNo != null ? vehicleNo.trim() : null,
                     receivedBy != null ? receivedBy.trim() : null,
@@ -268,11 +439,23 @@ public class RentalService {
         }
     }
 
+    public boolean saveInwardChallan(Integer woId, String dcNo, String dcDate, String vendorName,
+            Integer inSystemsQty, Integer inPrintersQty, Integer inLaptopsQty,
+            String dcFilePath, String vehicleNo, String receivedBy,
+            String remarks, String updatedBy) {
+        return saveInwardChallan(woId, dcNo, dcDate, vendorName, inSystemsQty, inPrintersQty, inLaptopsQty, 0, 0,
+                dcFilePath, vehicleNo, receivedBy, remarks, updatedBy);
+    }
+
     public List<Map<String, Object>> getAllInwardChallans() {
         String sql = "SELECT c.id, c.wo_id, w.wo_file_no, w.file_subject, c.dc_no, c.dc_date, " +
                 "COALESCE(c.vendor_name, w.vendor_name) AS vendor_name, " +
-                "c.inward_systems_qty, c.inward_printers_qty, c.inward_laptops_qty, " +
-                "(c.inward_systems_qty + c.inward_printers_qty + c.inward_laptops_qty) AS total_inward_qty, " +
+                "COALESCE(c.inward_systems_qty, 0) AS inward_systems_qty, " +
+                "COALESCE(c.inward_printers_qty, 0) AS inward_printers_qty, " +
+                "COALESCE(c.inward_laptops_qty, 0) AS inward_laptops_qty, " +
+                "COALESCE(c.inward_ups_qty, 0) AS inward_ups_qty, " +
+                "COALESCE(c.inward_dongle_qty, 0) AS inward_dongle_qty, " +
+                "(COALESCE(c.inward_systems_qty, 0) + COALESCE(c.inward_printers_qty, 0) + COALESCE(c.inward_laptops_qty, 0) + COALESCE(c.inward_ups_qty, 0) + COALESCE(c.inward_dongle_qty, 0)) AS total_inward_qty, " +
                 "c.dc_file_path, c.vehicle_no, c.received_by, c.remarks, c.created_by, c.created_at " +
                 "FROM rental_inward_delivery_challan c " +
                 "LEFT JOIN rental_workorder_register w ON c.wo_id = w.id " +
@@ -291,6 +474,7 @@ public class RentalService {
 
     @Transactional
     public boolean saveIssuedDetails(Integer requestId, Integer inwardDcId, Integer woId,
+            List<Map<String, Object>> itemDetails,
             String issuedDate, Integer issuedSystemsQty, Integer issuedPrintersQty,
             Integer issuedLaptopsQty, String assetSerialDetails,
             String issuedFromDate, String issuedToDate, String stockCopyPath,
@@ -299,28 +483,58 @@ public class RentalService {
         int periodDays = calculateDaysBetween(issuedFromDate, issuedToDate);
 
         String sql = "INSERT INTO rental_issued_details " +
-                "(request_id, inward_dc_id, wo_id, issued_date, " +
-                "issued_systems_qty, issued_printers_qty, issued_laptops_qty, " +
+                "(request_id, inward_dc_id, wo_id, cid, category_model_name, requested_qty, issued_qty, " +
+                "issued_date, issued_systems_qty, issued_printers_qty, issued_laptops_qty, " +
                 "asset_serial_details, issued_from_date, issued_to_date, issued_period_days, " +
                 "stock_copy_path, custodian_officer, contact_no, issued_by, status, " +
                 "created_by, is_active, is_delete) " +
-                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'Issued', ?, 1, 0)";
+                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'Issued', ?, 1, 0)";
         try {
-            int rows = jdbcTemplate.update(sql,
-                    requestId, inwardDcId, woId, issuedDate,
-                    issuedSystemsQty != null ? issuedSystemsQty : 0,
-                    issuedPrintersQty != null ? issuedPrintersQty : 0,
-                    issuedLaptopsQty != null ? issuedLaptopsQty : 0,
-                    assetSerialDetails, issuedFromDate, issuedToDate, periodDays,
-                    stockCopyPath,
-                    custodianOfficer != null ? custodianOfficer.trim() : null,
-                    contactNo != null ? contactNo.trim() : null,
-                    issuedBy != null ? issuedBy.trim() : null,
-                    updatedBy);
+            int rows = 0;
+            if (itemDetails != null && !itemDetails.isEmpty()) {
+                for (Map<String, Object> it : itemDetails) {
+                    Integer cid = it.get("cid") != null && !it.get("cid").toString().trim().isEmpty()
+                            ? Integer.valueOf(it.get("cid").toString().trim()) : null;
+                    String model = it.get("categoryModelName") != null ? it.get("categoryModelName").toString().trim() : "";
+                    Integer reqQty = it.get("requestedQty") != null ? Integer.valueOf(it.get("requestedQty").toString()) : 0;
+                    Integer issQty = it.get("issuedQty") != null ? Integer.valueOf(it.get("issuedQty").toString()) : 0;
+
+                    rows += jdbcTemplate.update(sql,
+                            requestId, inwardDcId, woId, cid, model, reqQty, issQty,
+                            issuedDate,
+                            issQty, 0, 0,
+                            assetSerialDetails, issuedFromDate, issuedToDate, periodDays,
+                            stockCopyPath,
+                            custodianOfficer != null ? custodianOfficer.trim() : null,
+                            contactNo != null ? contactNo.trim() : null,
+                            issuedBy != null ? issuedBy.trim() : null,
+                            updatedBy);
+                }
+            } else {
+                rows = jdbcTemplate.update(sql,
+                        requestId, inwardDcId, woId, null, "", 0,
+                        (issuedSystemsQty != null ? issuedSystemsQty : 0) + (issuedPrintersQty != null ? issuedPrintersQty : 0) + (issuedLaptopsQty != null ? issuedLaptopsQty : 0),
+                        issuedDate,
+                        issuedSystemsQty != null ? issuedSystemsQty : 0,
+                        issuedPrintersQty != null ? issuedPrintersQty : 0,
+                        issuedLaptopsQty != null ? issuedLaptopsQty : 0,
+                        assetSerialDetails, issuedFromDate, issuedToDate, periodDays,
+                        stockCopyPath,
+                        custodianOfficer != null ? custodianOfficer.trim() : null,
+                        contactNo != null ? contactNo.trim() : null,
+                        issuedBy != null ? issuedBy.trim() : null,
+                        updatedBy);
+            }
 
             if (rows > 0 && requestId != null) {
-                // Automatically update request status to 'Issued' (status_id = 3)
-                jdbcTemplate.update("UPDATE rental_user_request SET req_status_id = 3 WHERE id = ?", requestId);
+                // Automatically update request status to 'Issued' (status_id = 3) for all items under this tapal_no
+                try {
+                    jdbcTemplate.update(
+                            "UPDATE rental_user_request SET req_status_id = 3 WHERE tapal_no = (SELECT tapal_no FROM (SELECT tapal_no FROM rental_user_request WHERE id = ?) t) OR id = ?",
+                            requestId, requestId);
+                } catch (Exception eStatus) {
+                    jdbcTemplate.update("UPDATE rental_user_request SET req_status_id = 3 WHERE id = ?", requestId);
+                }
             }
             return rows > 0;
         } catch (Exception e) {
@@ -329,11 +543,26 @@ public class RentalService {
         }
     }
 
+    @Transactional
+    public boolean saveIssuedDetails(Integer requestId, Integer inwardDcId, Integer woId,
+            String issuedDate, Integer issuedSystemsQty, Integer issuedPrintersQty,
+            Integer issuedLaptopsQty, String assetSerialDetails,
+            String issuedFromDate, String issuedToDate, String stockCopyPath,
+            String custodianOfficer, String contactNo, String issuedBy, String updatedBy) {
+        return saveIssuedDetails(requestId, inwardDcId, woId, null, issuedDate, issuedSystemsQty, issuedPrintersQty,
+                issuedLaptopsQty, assetSerialDetails, issuedFromDate, issuedToDate, stockCopyPath,
+                custodianOfficer, contactNo, issuedBy, updatedBy);
+    }
+
     public List<Map<String, Object>> getAllIssuedDetails() {
         String sql = "SELECT i.id, i.request_id, r.tapal_no, d.dept_name, z.zone_name, " +
                 "i.inward_dc_id, dc.dc_no, i.wo_id, w.wo_file_no, i.issued_date, " +
+                "i.cid, COALESCE(cat.category_type, 'General') AS category_name, " +
+                "COALESCE(i.category_model_name, r.category_model_name, '-') AS category_model_name, " +
+                "COALESCE(i.requested_qty, r.category_qty, 0) AS requested_qty, " +
+                "COALESCE(NULLIF(i.issued_qty, 0), (i.issued_systems_qty + i.issued_printers_qty + i.issued_laptops_qty)) AS issued_qty, " +
                 "i.issued_systems_qty, i.issued_printers_qty, i.issued_laptops_qty, " +
-                "(i.issued_systems_qty + i.issued_printers_qty + i.issued_laptops_qty) AS total_issued_qty, " +
+                "COALESCE(NULLIF(i.issued_qty, 0), (i.issued_systems_qty + i.issued_printers_qty + i.issued_laptops_qty)) AS total_issued_qty, " +
                 "i.asset_serial_details, i.issued_from_date, i.issued_to_date, i.issued_period_days, " +
                 "i.stock_copy_path, i.custodian_officer, i.contact_no, i.issued_by, i.status, " +
                 "i.created_by, i.created_at, " +
@@ -342,6 +571,7 @@ public class RentalService {
                 "LEFT JOIN rental_user_request r ON i.request_id = r.id " +
                 "LEFT JOIN toner_department_list d ON r.department_id = d.id " +
                 "LEFT JOIN toner_zone_list z ON r.zone_id = z.id " +
+                "LEFT JOIN rental_category_master cat ON (i.cid = cat.id OR (i.cid IS NULL AND r.cid = cat.id)) " +
                 "LEFT JOIN rental_inward_delivery_challan dc ON i.inward_dc_id = dc.id " +
                 "LEFT JOIN rental_workorder_register w ON i.wo_id = w.id " +
                 "LEFT JOIN (SELECT issue_id, SUM(returned_systems_qty + returned_printers_qty + returned_laptops_qty) AS total_returned_qty "
diff --git a/src/main/java/com/gcc_manpower/gcctonermanagement/controller/TonerController.java b/src/main/java/com/gcc_manpower/gcctonermanagement/controller/TonerController.java
index e43c098..57bdc38 100644
--- a/src/main/java/com/gcc_manpower/gcctonermanagement/controller/TonerController.java
+++ b/src/main/java/com/gcc_manpower/gcctonermanagement/controller/TonerController.java
@@ -69,6 +69,24 @@ public class TonerController {
         return "gcctonermanagement/upload";
     }
 
+    @GetMapping("/details")
+    public String viewDetails(Model model, HttpSession session) {
+        String username = (String) session.getAttribute("toner_usrName");
+        if (username == null) {
+            return "redirect:/gcctonermanagement/login";
+        }
+
+        String usrRole = (String) session.getAttribute("toner_usrRole");
+        boolean isAdmin = "ADMIN".equalsIgnoreCase(usrRole);
+
+        model.addAttribute("isLoggedIn", true);
+        model.addAttribute("isAdmin", isAdmin);
+        model.addAttribute("usrName", username);
+        model.addAttribute("curPage", "gcctonermanagement");
+
+        return "gcctonermanagement/details";
+    }
+
     @GetMapping("/login")
     public String login(HttpSession session) {
         return "gcctonermanagement/login";
@@ -102,6 +120,8 @@ public class TonerController {
             session.setMaxInactiveInterval(1800); // 30 minutes session timeout
             response.put("result", true);
             response.put("usrName", usrName);
+            response.put("usrRole", role);
+            response.put("isAdmin", "ADMIN".equalsIgnoreCase(role));
         } catch (AuthenticationException e) {
             response.put("result", false);
             response.put("error", e.getMessage() != null ? e.getMessage() : "Invalid username or password!");
@@ -190,6 +210,18 @@ public class TonerController {
         if (updatedBy == null)
             updatedBy = username;
 
+        if (dcNo == null || dcNo.trim().isEmpty()) {
+            response.put("success", false);
+            response.put("error", "Delivery Challan (DC) Number is required.");
+            return response;
+        }
+
+        if (dcDate == null || dcDate.trim().isEmpty()) {
+            response.put("success", false);
+            response.put("error", "Delivery Challan (DC) Date is required.");
+            return response;
+        }
+
         if (dcFile == null || dcFile.isEmpty()) {
             response.put("success", false);
             response.put("error", "Delivery Challan (DC) PDF file is required.");
@@ -240,6 +272,146 @@ public class TonerController {
         return response;
     }
 
+    @PostMapping("/api/inward/update-dc")
+    @ResponseBody
+    public Map<String, Object> updateInwardDc(
+            @RequestParam("ids") String idsStr,
+            @RequestParam("dcNo") String dcNo,
+            @RequestParam("dcDate") String dcDate,
+            @RequestParam(value = "dcFile", required = false) MultipartFile dcFile,
+            HttpSession session) {
+
+        Map<String, Object> response = new HashMap<>();
+        String username = (String) session.getAttribute("toner_usrName");
+        if (username == null) {
+            response.put("success", false);
+            response.put("error", "Unauthorized access. Please log in.");
+            return response;
+        }
+
+        String updatedBy = appUserService.getUserIdByName(username);
+        if (updatedBy == null)
+            updatedBy = username;
+
+        if (idsStr == null || idsStr.trim().isEmpty()) {
+            response.put("success", false);
+            response.put("error", "Record IDs are required.");
+            return response;
+        }
+
+        if (dcNo == null || dcNo.trim().isEmpty()) {
+            response.put("success", false);
+            response.put("error", "Delivery Challan (DC) Number is required.");
+            return response;
+        }
+
+        if (dcDate == null || dcDate.trim().isEmpty()) {
+            response.put("success", false);
+            response.put("error", "Delivery Challan (DC) Date is required.");
+            return response;
+        }
+
+        if (dcFile != null && !dcFile.isEmpty() && !isPdfFile(dcFile)) {
+            response.put("success", false);
+            response.put("error", "Delivery Challan file must be a PDF.");
+            return response;
+        }
+
+        try {
+            List<Integer> ids = java.util.Arrays.stream(idsStr.split(","))
+                    .map(String::trim)
+                    .filter(s -> !s.isEmpty())
+                    .map(Integer::parseInt)
+                    .collect(java.util.stream.Collectors.toList());
+
+            if (ids.isEmpty()) {
+                response.put("success", false);
+                response.put("error", "No valid record IDs provided.");
+                return response;
+            }
+
+            File uploadDir = new File(tonerUploadPathConfig).getAbsoluteFile();
+            if (!uploadDir.exists()) {
+                uploadDir.mkdirs();
+            }
+
+            String dcPath = null;
+            if (dcFile != null && !dcFile.isEmpty()) {
+                dcPath = saveUploadedFile(dcFile, "dc", uploadDir);
+            }
+
+            boolean updated = tonerService.updateInwardDc(ids, dcNo.trim(), dcDate.trim(), dcPath, updatedBy);
+            if (updated) {
+                response.put("success", true);
+                response.put("message", "Delivery Challan details updated successfully.");
+            } else {
+                if (dcPath != null) {
+                    deleteFileIfExists(dcPath, uploadDir);
+                }
+                response.put("success", false);
+                response.put("error", "Failed to update Delivery Challan details in the database.");
+            }
+        } catch (Exception e) {
+            response.put("success", false);
+            response.put("error", "An error occurred: " + e.getMessage());
+            e.printStackTrace();
+        }
+        return response;
+    }
+
+    @PostMapping("/api/inward/delete-dc")
+    @ResponseBody
+    public Map<String, Object> deleteInwardDc(
+            @RequestParam("ids") String idsStr,
+            HttpSession session) {
+
+        Map<String, Object> response = new HashMap<>();
+        String username = (String) session.getAttribute("toner_usrName");
+        if (username == null) {
+            response.put("success", false);
+            response.put("error", "Unauthorized access. Please log in.");
+            return response;
+        }
+
+        String updatedBy = appUserService.getUserIdByName(username);
+        if (updatedBy == null)
+            updatedBy = username;
+
+        if (idsStr == null || idsStr.trim().isEmpty()) {
+            response.put("success", false);
+            response.put("error", "Record IDs are required.");
+            return response;
+        }
+
+        try {
+            List<Integer> ids = java.util.Arrays.stream(idsStr.split(","))
+                    .map(String::trim)
+                    .filter(s -> !s.isEmpty())
+                    .map(Integer::parseInt)
+                    .collect(java.util.stream.Collectors.toList());
+
+            if (ids.isEmpty()) {
+                response.put("success", false);
+                response.put("error", "No valid record IDs provided.");
+                return response;
+            }
+
+            boolean deleted = tonerService.deleteInwardDc(ids, updatedBy);
+            if (deleted) {
+                response.put("success", true);
+                response.put("message", "Delivery Challan and inward stock entry deleted successfully.");
+            } else {
+                response.put("success", false);
+                response.put("error", "Failed to delete Delivery Challan details from database.");
+            }
+        } catch (Exception e) {
+            response.put("success", false);
+            response.put("error", "An error occurred: " + e.getMessage());
+            e.printStackTrace();
+        }
+        return response;
+    }
+
     @PostMapping("/api/request")
     @ResponseBody
     public Map<String, Object> uploadRequest(
diff --git a/src/main/java/com/gcc_manpower/gcctonermanagement/service/TonerService.java b/src/main/java/com/gcc_manpower/gcctonermanagement/service/TonerService.java
index 21d3028..176425c 100644
--- a/src/main/java/com/gcc_manpower/gcctonermanagement/service/TonerService.java
+++ b/src/main/java/com/gcc_manpower/gcctonermanagement/service/TonerService.java
@@ -66,10 +66,16 @@ public class TonerService {
         Map<String, String> map = new HashMap<>();
         try {
             List<Map<String, Object>> list = jdbcTemplate.queryForList(
-                    "SELECT id, part_code FROM toner_model_list WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0)");
+                    "SELECT id, model_name, part_code FROM toner_model_list WHERE (is_delete IS NULL OR is_delete = 0)");
             for (Map<String, Object> row : list) {
-                if (row.get("id") != null && row.get("part_code") != null) {
-                    map.put(String.valueOf(row.get("id")).trim(), String.valueOf(row.get("part_code")).trim());
+                String code = row.get("part_code") != null ? String.valueOf(row.get("part_code")).trim() : "";
+                if (!code.isEmpty() && !"null".equalsIgnoreCase(code) && !"n/a".equalsIgnoreCase(code)) {
+                    if (row.get("id") != null) {
+                        map.put(String.valueOf(row.get("id")).trim(), code);
+                    }
+                    if (row.get("model_name") != null) {
+                        map.put(String.valueOf(row.get("model_name")).trim().toLowerCase(), code);
+                    }
                 }
             }
         } catch (Exception ignored) {
@@ -179,6 +185,25 @@ public class TonerService {
         return map;
     }
 
+    private Map<String, Integer> getTotalWorkorderRegisteredMap() {
+        Map<String, Integer> map = new HashMap<>();
+        try {
+            List<Map<String, Object>> list = jdbcTemplate.queryForList(
+                    "SELECT pid, tid, SUM(CAST(qty_registered AS SIGNED)) AS total_qty FROM toner_workorder_printermodel_qty WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) GROUP BY pid, tid");
+            for (Map<String, Object> row : list) {
+                if (row.get("pid") != null && row.get("tid") != null) {
+                    String pid = String.valueOf(row.get("pid")).trim();
+                    String tid = String.valueOf(row.get("tid")).trim();
+                    Integer qty = parseIntegerSafely(row.get("total_qty"));
+                    map.put(pid + "_" + tid, qty != null ? qty : 0);
+                    map.put(tid, map.getOrDefault(tid, 0) + (qty != null ? qty : 0));
+                }
+            }
+        } catch (Exception ignored) {
+        }
+        return map;
+    }
+
     private Map<String, Integer> getInwardStockMap() {
         Map<String, Integer> map = new HashMap<>();
         try {
@@ -620,6 +645,55 @@ public class TonerService {
         return saveInwardRegister(refNo, companyName, items, dcUpload, null, null, username);
     }
 
+    @Transactional
+    public boolean updateInwardDc(List<Integer> ids, String dcNo, String dcDate, String newDcUpload, String updatedBy) {
+        if (ids == null || ids.isEmpty()) {
+            return false;
+        }
+        Timestamp now = new Timestamp(System.currentTimeMillis());
+        String inSql = ids.stream().map(i -> "?").collect(java.util.stream.Collectors.joining(","));
+        String finalDcNo = (dcNo != null && !dcNo.trim().isEmpty()) ? dcNo.trim() : null;
+        String finalDcDate = (dcDate != null && !dcDate.trim().isEmpty()) ? dcDate.trim() : null;
+
+        if (newDcUpload != null && !newDcUpload.trim().isEmpty()) {
+            String sql = "UPDATE toner_stock_register_details SET dc_no = ?, dc_date = ?, dc_upload = ?, updated_date = ?, updated_by = ? WHERE id IN (" + inSql + ")";
+            List<Object> params = new ArrayList<>();
+            params.add(finalDcNo);
+            params.add(finalDcDate);
+            params.add(newDcUpload.trim());
+            params.add(now);
+            params.add(updatedBy);
+            params.addAll(ids);
+            jdbcTemplate.update(sql, params.toArray());
+        } else {
+            String sql = "UPDATE toner_stock_register_details SET dc_no = ?, dc_date = ?, updated_date = ?, updated_by = ? WHERE id IN (" + inSql + ")";
+            List<Object> params = new ArrayList<>();
+            params.add(finalDcNo);
+            params.add(finalDcDate);
+            params.add(now);
+            params.add(updatedBy);
+            params.addAll(ids);
+            jdbcTemplate.update(sql, params.toArray());
+        }
+        return true;
+    }
+
+    @Transactional
+    public boolean deleteInwardDc(List<Integer> ids, String updatedBy) {
+        if (ids == null || ids.isEmpty()) {
+            return false;
+        }
+        Timestamp now = new Timestamp(System.currentTimeMillis());
+        String inSql = ids.stream().map(i -> "?").collect(java.util.stream.Collectors.joining(","));
+        String sql = "UPDATE toner_stock_register_details SET is_active = 0, is_delete = 1, updated_date = ?, updated_by = ? WHERE id IN (" + inSql + ")";
+        List<Object> params = new ArrayList<>();
+        params.add(now);
+        params.add(updatedBy);
+        params.addAll(ids);
+        jdbcTemplate.update(sql, params.toArray());
+        return true;
+    }
+
     public List<Map<String, Object>> getInwardHistory() {
         try {
             String sql = "SELECT * FROM toner_stock_register_details WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) ORDER BY id DESC";
@@ -630,6 +704,7 @@ public class TonerService {
 
             Map<String, String> printerMap = getPrinterMap();
             Map<String, String> tonerMap = getTonerMap();
+            Map<String, String> partCodeMap = getTonerPartCodeMap();
             Map<String, String> userMap = getUserMap();
             Map<String, String> vendorMap = getVendorMap();
             Map<String, String> fileNumberMap = getWorkorderFileNumberMap();
@@ -651,9 +726,16 @@ public class TonerService {
                 String companyName = raw.get("company_name") != null ? String.valueOf(raw.get("company_name")).trim()
                         : "";
 
+                String tonerModelName = tonerMap.getOrDefault(tid, tid);
+                String partCode = partCodeMap.get(tid);
+                if (partCode == null || partCode.isEmpty()) {
+                    partCode = partCodeMap.get(tonerModelName != null ? tonerModelName.trim().toLowerCase() : "");
+                }
+
                 Map<String, Object> row = new HashMap<>(raw);
                 row.put("printer_name", printerMap.getOrDefault(pid, pid));
-                row.put("model_name", tonerMap.getOrDefault(tid, tid));
+                row.put("model_name", tonerModelName);
+                row.put("part_code", partCode != null && !partCode.isEmpty() ? partCode : "-");
                 row.put("order_by", userMap.getOrDefault(updatedBy, updatedBy));
                 row.put("file_number", fileNumberMap.getOrDefault(refNo, ""));
                 row.put("vendor_name", vendorMap.getOrDefault(companyName, companyName));
@@ -837,6 +919,7 @@ public class TonerService {
 
             Map<String, String> printerMap = getPrinterMap();
             Map<String, String> tonerMap = getTonerMap();
+            Map<String, String> partCodeMap = getTonerPartCodeMap();
             Map<String, String> deptMap = getDepartmentMap();
             Map<String, String> zoneMap = getZoneMap();
             Map<String, String> userMap = getUserMap();
@@ -853,8 +936,15 @@ public class TonerService {
                 String requestDate = raw.get("request_date") != null ? String.valueOf(raw.get("request_date")).trim()
                         : "";
 
+                String tonerModelName = tonerMap.getOrDefault(tid, tid);
+                String partCode = partCodeMap.get(tid);
+                if (partCode == null || partCode.isEmpty()) {
+                    partCode = partCodeMap.get(tonerModelName != null ? tonerModelName.trim().toLowerCase() : "");
+                }
+
                 row.put("printer_name", printerMap.getOrDefault(pid, pid));
-                row.put("model_name", tonerMap.getOrDefault(tid, tid));
+                row.put("model_name", tonerModelName);
+                row.put("part_code", partCode != null && !partCode.isEmpty() ? partCode : "-");
                 row.put("dept_name", deptMap.getOrDefault(deptId, deptId));
                 row.put("zone_name", zoneMap.getOrDefault(zoneId, zoneId));
                 row.put("updated_by", userMap.getOrDefault(updatedBy, updatedBy));
@@ -906,6 +996,7 @@ public class TonerService {
             Map<String, String> deptMap = getDepartmentMap();
             Map<String, String> zoneMap = getZoneMap();
             Map<String, Integer> availStockMap = getAvailableStockMap();
+            Map<String, Integer> totalWoMap = getTotalWorkorderRegisteredMap();
 
             List<Map<String, Object>> result = new ArrayList<>();
             for (Map<String, Object> raw : list) {
@@ -921,6 +1012,7 @@ public class TonerService {
                 String pid = raw.get("pid") != null ? String.valueOf(raw.get("pid")).trim() : "";
                 String tid = raw.get("tid") != null ? String.valueOf(raw.get("tid")).trim() : "";
                 int availStock = availStockMap.getOrDefault(pid + "_" + tid, 0);
+                int woQty = totalWoMap.getOrDefault(pid + "_" + tid, totalWoMap.getOrDefault(tid, 0));
 
                 Map<String, Object> row = new HashMap<>(raw);
                 String deptId = raw.get("dept_id") != null ? String.valueOf(raw.get("dept_id")).trim() : "";
@@ -932,6 +1024,8 @@ public class TonerService {
                 row.put("dept_name", deptMap.getOrDefault(deptId, deptId));
                 row.put("zone_name", zoneMap.getOrDefault(zoneId, zoneId));
                 row.put("available_stock", availStock);
+                row.put("qty_workorder_registered", woQty);
+                row.put("workorder_qty", woQty);
 
                 result.add(row);
             }
@@ -1256,6 +1350,7 @@ public class TonerService {
 
             Map<String, String> printerMap = getPrinterMap();
             Map<String, String> tonerMap = getTonerMap();
+            Map<String, String> partCodeMap = getTonerPartCodeMap();
             Map<String, String> vendorMap = getVendorMap();
             Map<String, String> fileNumberMap = getWorkorderFileNumberMap();
             Map<String, Integer> inStockMap = getInwardStockMap();
@@ -1275,8 +1370,15 @@ public class TonerService {
                 String pid = raw.get("pid") != null ? String.valueOf(raw.get("pid")).trim() : "";
                 String tid = raw.get("tid") != null ? String.valueOf(raw.get("tid")).trim() : "";
 
+                String tonerModelName = tonerMap.getOrDefault(tid, tid);
+                String partCode = partCodeMap.get(tid);
+                if (partCode == null || partCode.isEmpty()) {
+                    partCode = partCodeMap.get(tonerModelName != null ? tonerModelName.trim().toLowerCase() : "");
+                }
+
                 row.put("printer_name", printerMap.getOrDefault(pid, pid));
-                row.put("model_name", tonerMap.getOrDefault(tid, tid));
+                row.put("model_name", tonerModelName);
+                row.put("part_code", partCode != null && !partCode.isEmpty() ? partCode : "-");
                 row.put("vendor_name", vendorMap.getOrDefault(vendorId, vendorId));
                 row.put("vendor_id", vendorId);
                 row.put("file_number", fileNumberMap.getOrDefault(cleanRef, ""));
@@ -1300,6 +1402,7 @@ public class TonerService {
 
             Map<String, String> printerMap = getPrinterMap();
             Map<String, String> tonerMap = getTonerMap();
+            Map<String, String> partCodeMap = getTonerPartCodeMap();
             Map<String, String> userMap = getUserMap();
             Map<String, String> vendorMap = getVendorMap();
             Map<String, String> fileNumberMap = getWorkorderFileNumberMap();
@@ -1339,8 +1442,15 @@ public class TonerService {
                     row.put("file_number", fileNumberMap.getOrDefault(refNo, ""));
                 }
 
+                String tonerModelName = tonerMap.getOrDefault(tid, tid);
+                String partCode = partCodeMap.get(tid);
+                if (partCode == null || partCode.isEmpty()) {
+                    partCode = partCodeMap.get(tonerModelName != null ? tonerModelName.trim().toLowerCase() : "");
+                }
+
                 row.put("printer_name", printerMap.getOrDefault(pid, pid));
-                row.put("model_name", tonerMap.getOrDefault(tid, tid));
+                row.put("model_name", tonerModelName);
+                row.put("part_code", partCode != null && !partCode.isEmpty() ? partCode : "-");
                 row.put("updated_by", userMap.getOrDefault(updatedBy, updatedBy));
                 row.put("vendor_name", vendorMap.getOrDefault(vendorStr, vendorStr));
                 row.put("total_qty_registered", raw.get("qty_registered"));
@@ -1436,6 +1546,7 @@ public class TonerService {
 
             Map<String, String> printerMap = getPrinterMap();
             Map<String, String> tonerMap = getTonerMap();
+            Map<String, String> partCodeMap = getTonerPartCodeMap();
             Map<String, String> userMap = getUserMap();
             Map<String, Integer> inByReqMap = getInwardStockByRequestMap();
 
@@ -1449,8 +1560,15 @@ public class TonerService {
                 String updatedBy = raw.get("updated_by") != null ? String.valueOf(raw.get("updated_by")).trim() : "";
                 String mrId = raw.get("id") != null ? String.valueOf(raw.get("id")).trim() : "";
 
+                String tonerModelName = tonerMap.getOrDefault(tid, tid);
+                String partCode = partCodeMap.get(tid);
+                if (partCode == null || partCode.isEmpty()) {
+                    partCode = partCodeMap.get(tonerModelName != null ? tonerModelName.trim().toLowerCase() : "");
+                }
+
                 row.put("printer_name", printerMap.getOrDefault(pid, pid));
-                row.put("model_name", tonerMap.getOrDefault(tid, tid));
+                row.put("model_name", tonerModelName);
+                row.put("part_code", partCode != null && !partCode.isEmpty() ? partCode : "-");
                 row.put("updated_by", userMap.getOrDefault(updatedBy, updatedBy));
                 row.put("qty_requested", raw.get("qty_registered"));
                 row.put("qty_inward_received",
@@ -1474,6 +1592,7 @@ public class TonerService {
 
             Map<String, String> printerMap = getPrinterMap();
             Map<String, String> tonerMap = getTonerMap();
+            Map<String, String> partCodeMap = getTonerPartCodeMap();
             Map<String, String> userMap = getUserMap();
             Map<String, Integer> woRegisteredQtyMap = getWorkorderRegisteredQtyMap();
 
@@ -1486,8 +1605,15 @@ public class TonerService {
                 String updatedBy = raw.get("updated_by") != null ? String.valueOf(raw.get("updated_by")).trim() : "";
                 String refNo = raw.get("ref_no") != null ? String.valueOf(raw.get("ref_no")).trim() : "";
 
+                String tonerModelName = tonerMap.getOrDefault(tid, tid);
+                String partCode = partCodeMap.get(tid);
+                if (partCode == null || partCode.isEmpty()) {
+                    partCode = partCodeMap.get(tonerModelName != null ? tonerModelName.trim().toLowerCase() : "");
+                }
+
                 row.put("printer_name", printerMap.getOrDefault(pid, pid));
-                row.put("model_name", tonerMap.getOrDefault(tid, tid));
+                row.put("model_name", tonerModelName);
+                row.put("part_code", partCode != null && !partCode.isEmpty() ? partCode : "-");
                 row.put("order_by", userMap.getOrDefault(updatedBy, updatedBy));
                 row.put("qty_requested", raw.get("qty_registered"));
 
diff --git a/src/main/resources/templates/gccadjustmentmanagement/dashboard.html b/src/main/resources/templates/gccadjustmentmanagement/dashboard.html
index a4a8fc0..19e32d3 100644
--- a/src/main/resources/templates/gccadjustmentmanagement/dashboard.html
+++ b/src/main/resources/templates/gccadjustmentmanagement/dashboard.html
@@ -1979,6 +1979,13 @@
                                 <textarea id="form-file-remark" name="file_remark" class="form-control-custom"
                                     style="height: 100px; padding: 12px;" placeholder="Remarks :*" required></textarea>
                             </div>
+
+                            <!-- Review Remarks -->
+                            <div class="col-12">
+                                <label for="form-review-remark" class="form-label">Review Remarks :</label>
+                                <textarea id="form-review-remark" name="review_remark" class="form-control-custom"
+                                    style="height: 90px; padding: 12px;" placeholder="Review Remarks :"></textarea>
+                            </div>
                         </div>
 
                         <div class="d-flex justify-content-center gap-3 mt-5">
@@ -4295,6 +4302,9 @@
                     <div class="col-12 mt-2">
                         <strong>File Remarks:</strong> <span class="text-muted">${escapeHtml(r.file_remark || 'No remarks provided.')}</span>
                     </div>
+                    <div class="col-12 mt-2">
+                        <strong>Review Remarks:</strong> <span class="text-muted">${escapeHtml(r.review_remark || 'No review remarks provided.')}</span>
+                    </div>
                 </div>
                 <hr>
                 <h6 class="fw-bold mb-3"><i class="fa-solid fa-list-check text-success"></i> Document Checklist Lifecycle</h6>
@@ -4370,6 +4380,7 @@
             document.getElementById('form-file-available-status').value = r.file_available_status || '';
             document.getElementById('form-bal-amt').value = r.bal_amt || '';
             document.getElementById('form-file-remark').value = r.file_remark || '';
+            document.getElementById('form-review-remark').value = r.review_remark || '';
             document.getElementById('form-file-data-num').value = r.file_data_num || '';
             document.getElementById('form-pi-amt').value = r.pi_amt || '';
             document.getElementById('form-pi-gen-date').value = r.pi_file_gen_date || '';
diff --git a/src/main/resources/templates/gccadjustmentmanagement/details.html b/src/main/resources/templates/gccadjustmentmanagement/details.html
index de8e78e..d70e098 100644
--- a/src/main/resources/templates/gccadjustmentmanagement/details.html
+++ b/src/main/resources/templates/gccadjustmentmanagement/details.html
@@ -525,6 +525,7 @@
                             <th class="text-center">Days Flow</th>
                             <!-- <th class="text-center">Documents</th> -->
                             <th>Remarks</th>
+                            <th>Review Remarks</th>
                             <th class="text-center">Updated Date</th>
                             <th class="text-center">Updated By</th>
                             <th class="text-center">Actions</th>
@@ -908,6 +909,13 @@
                                 <textarea id="form-file-remark" name="file_remark" class="form-control-custom"
                                     style="height: 100px; padding: 12px;" placeholder="Remarks :*" required></textarea>
                             </div>
+
+                            <!-- Review Remarks -->
+                            <div class="col-12">
+                                <label for="form-review-remark" class="form-label">Review Remarks :</label>
+                                <textarea id="form-review-remark" name="review_remark" class="form-control-custom"
+                                    style="height: 90px; padding: 12px;" placeholder="Review Remarks :"></textarea>
+                            </div>
                         </div>
 
                         <div class="d-flex justify-content-center gap-3 mt-5">
@@ -1459,6 +1467,7 @@
             document.getElementById('form-file-status').value = r.file_status_id || '';
             document.getElementById('form-bal-amt').value = r.bal_amt || '';
             document.getElementById('form-file-remark').value = r.file_remark || '';
+            document.getElementById('form-review-remark').value = r.review_remark || '';
             document.getElementById('form-file-data-num').value = r.file_data_num || '';
             document.getElementById('form-pi-amt').value = r.pi_amt || '';
             document.getElementById('form-pi-gen-date').value = r.pi_file_gen_date || '';
@@ -1769,7 +1778,7 @@
                 finalRecords = finalRecords.filter(r => {
                     const fileNum = String(r.file_num || r.file_data_num || '').toLowerCase();
                     const advType = String(r.adv_type || '').toLowerCase();
-                    const remarks = String(r.file_remark || r.remarks || '').toLowerCase();
+                    const remarks = String(r.file_remark || r.review_remark || r.remarks || '').toLowerCase();
                     const fileStatus = String(r.file_status || '').toLowerCase();
                     return fileNum.includes(query) || advType.includes(query) || remarks.includes(query) || fileStatus.includes(query);
                 });
@@ -2093,6 +2102,7 @@
                         <td class="text-center">${daysFlowHtml}</td>
                        
                         <td class="text-wrap" style="max-width: 250px;">${r.file_remark || '-'}</td>
+                        <td class="text-wrap" style="max-width: 250px;">${r.review_remark || '-'}</td>
                         <td class="text-center font-monospace">${formatDate(r.updated_date || r.cdate)}</td>
                         <td class="text-center">${r.updated_by_name || r.updated_by || '-'}</td>
                         
@@ -2359,10 +2369,14 @@
                         </div>
                     </div>
                     <div class="row mt-3 border-top pt-3">
-                        <div class="col-12">
+                        <div class="col-md-6">
                             <p class="mb-1"><strong>Remarks:</strong></p>
                             <p class="bg-light p-2 rounded text-secondary" style="white-space: pre-wrap;">${fileObj.file_remark || '-'}</p>
                         </div>
+                        <div class="col-md-6">
+                            <p class="mb-1"><strong>Review Remarks:</strong></p>
+                            <p class="bg-light p-2 rounded text-secondary" style="white-space: pre-wrap;">${fileObj.review_remark || '-'}</p>
+                        </div>
                     </div>
                 `;
             }
@@ -2428,6 +2442,7 @@
                     'TC Date': formatDateForExcel(r.tc_file_gen_date),
                     'Status': isAdjusted(r) ? 'Adjusted' : 'Pending',
                     'Remarks': r.file_remark || '',
+                    'Review Remarks': r.review_remark || '',
                     'Last Updated Date': formatDateForExcel(r.updated_date),
                     'PI File Path': r.pi_file_path || '',
                     'AS File Path': r.as_file_path || '',
diff --git a/src/main/resources/templates/gccrentalmanagement/dashboard.html b/src/main/resources/templates/gccrentalmanagement/dashboard.html
index 605b81f..106789e 100644
--- a/src/main/resources/templates/gccrentalmanagement/dashboard.html
+++ b/src/main/resources/templates/gccrentalmanagement/dashboard.html
@@ -226,13 +226,13 @@
 
         .nav-tab-item:hover {
             color: var(--brand-accent);
-            background: #f8fafc;
+            background: #e9ecef;
         }
 
         .nav-tab-item.active {
             color: var(--brand-primary);
             border-bottom-color: var(--brand-accent);
-            background: #f0f9ff;
+            background: #a8bdcc;
         }
 
         .nav-tab-item .badge-count {
@@ -535,6 +535,7 @@
             border-collapse: collapse;
             margin-bottom: 0;
             font-size: 0.84rem;
+            border: 1px solid #e2e8f0;
         }
 
         .custom-table thead th {
@@ -546,11 +547,16 @@
             letter-spacing: 0.5px;
             padding: 13px 15px;
             border-bottom: 1.5px solid var(--border-color);
+            border-right: 1px solid #e2e8f0;
             white-space: nowrap;
         }
 
+        .custom-table thead th:last-child {
+            border-right: none;
+        }
+
         .custom-table tbody tr {
-            border-bottom: 1px solid #f1f5f9;
+            border-bottom: 1px solid #e2e8f0;
             transition: background 0.2s;
         }
 
@@ -562,6 +568,11 @@
             padding: 12px 15px;
             vertical-align: middle;
             color: #1e293b;
+            border-right: 1px solid #e2e8f0;
+        }
+
+        .custom-table tbody td:last-child {
+            border-right: none;
         }
 
         /* Status & Alert Badges */
@@ -618,6 +629,58 @@
             color: #334155;
         }
 
+        /* Pagination Controls Styling */
+        .pagination {
+            display: flex;
+            align-items: center;
+            gap: 4px;
+            list-style: none;
+            padding: 0;
+            margin: 0;
+        }
+
+        .pagination .page-item {
+            margin: 0;
+        }
+
+        .pagination .page-item .page-link {
+            border-radius: 8px;
+            border: 1px solid #e2e8f0;
+            color: var(--brand-primary);
+            font-weight: 600;
+            font-size: 0.82rem;
+            padding: 5px 12px;
+            transition: all 0.2s ease;
+            background: #ffffff;
+            cursor: pointer;
+            text-decoration: none;
+            display: inline-flex;
+            align-items: center;
+            gap: 4px;
+            user-select: none;
+        }
+
+        .pagination .page-item .page-link:hover {
+            background: var(--brand-accent-light);
+            border-color: var(--brand-accent);
+            color: var(--brand-primary);
+        }
+
+        .pagination .page-item.active .page-link {
+            background: var(--brand-primary);
+            border-color: var(--brand-primary);
+            color: #ffffff;
+            box-shadow: 0 2px 6px rgba(13, 75, 104, 0.25);
+        }
+
+        .pagination .page-item.disabled .page-link {
+            background: #f8fafc;
+            border-color: #e2e8f0;
+            color: #94a3b8;
+            cursor: not-allowed;
+            pointer-events: none;
+        }
+
         /* Overdue Alert Banner */
         .overdue-alert-banner {
             background: linear-gradient(135deg, #fff1f2, #ffe4e6);
@@ -841,7 +904,7 @@
         <div class="system-pill">
             <i class="fa-solid fa-boxes-packing"></i>
             <span style="font-size: 1.05rem; font-weight: 800; color: #ffffff;">Rental Asset & Material Management
-                Hub</span>
+                System</span>
         </div>
 
         <div class="user-controls">
@@ -869,16 +932,17 @@
                 <span>1. Work Orders (WO)</span>
                 <span class="badge-count bg-light text-dark" id="woCountBadge">0</span>
             </li>
-            <li class="nav-tab-item" onclick="switchRentalTab('userRequestsTab')">
-                <i class="fa-solid fa-clipboard-list"></i>
-                <span>2. User Requests</span>
-                <span class="badge-count bg-info text-white" id="reqCountBadge">0</span>
-            </li>
             <li class="nav-tab-item" onclick="switchRentalTab('challansTab')">
                 <i class="fa-solid fa-truck-ramp-box"></i>
-                <span>3. Inward DC Stock</span>
+                <span>2. Inward DC Stock</span>
                 <span class="badge-count bg-secondary text-white" id="dcCountBadge">0</span>
             </li>
+            <li class="nav-tab-item" onclick="switchRentalTab('userRequestsTab')">
+                <i class="fa-solid fa-clipboard-list"></i>
+                <span>3. User Requests</span>
+                <span class="badge-count bg-info text-white" id="reqCountBadge">0</span>
+            </li>
+
             <li class="nav-tab-item" onclick="switchRentalTab('issuedTab')">
                 <i class="fa-solid fa-hand-holding-box"></i>
                 <span>4. Issued Details</span>
@@ -1010,6 +1074,11 @@
                     </div>
                 </div>
                 <div class="action-btn-group">
+                    <div class="search-input-wrap">
+                        <i class="fa-solid fa-magnifying-glass"></i>
+                        <input type="text" onkeyup="handleRentalTableSearch('radar', this.value)"
+                            placeholder="Search Dept, Custodian, Contact...">
+                    </div>
                     <button class="btn-custom btn-custom-outline"
                         onclick="exportTableToExcel('radarOverdueTable', 'GCC_Overdue_Rental_Assets')">
                         <i class="fa-solid fa-file-excel text-success"></i> Export Radar
@@ -1025,6 +1094,7 @@
                     <table class="custom-table" id="radarOverdueTable">
                         <thead>
                             <tr>
+                                <th style="width: 50px;">S.No</th>
                                 <th>Department & Location</th>
                                 <th>Custodian / Officer</th>
                                 <th>Issued Items (Sys / Prt / Ltp)</th>
@@ -1039,6 +1109,16 @@
                         </tbody>
                     </table>
                 </div>
+                <!-- Radar Pagination Controls -->
+                <div class="d-flex justify-content-between align-items-center flex-wrap gap-2 p-3 border-top bg-white"
+                    id="radar-pagination-wrapper">
+                    <div class="text-secondary fw-semibold" id="radar-pagination-info" style="font-size: 0.85rem;">
+                        Showing 0 to 0 of 0 entries
+                    </div>
+                    <ul class="pagination pagination-sm m-0" id="radar-pagination-nav">
+                        <!-- Dynamic pagination items -->
+                    </ul>
+                </div>
             </div>
         </section>
 
@@ -1059,8 +1139,8 @@
                 <div class="action-btn-group">
                     <div class="search-input-wrap">
                         <i class="fa-solid fa-magnifying-glass"></i>
-                        <input type="text" onkeyup="filterGenericTable('woTable', this.value)"
-                            placeholder="Search WO No, Subject, Vendor...">
+                        <input type="text" onkeyup="handleRentalTableSearch('wo', this.value)"
+                            placeholder="Search WO No, Subject, Vendor, Model...">
                     </div>
                     <button class="btn-custom btn-custom-primary" onclick="openNewWOModal()">
                         <i class="fa-solid fa-plus"></i> Create Work Order File
@@ -1077,14 +1157,13 @@
                     <table class="custom-table" id="woTable">
                         <thead>
                             <tr>
+                                <th style="width: 50px;">S.No</th>
                                 <th>WO File No</th>
                                 <th>File Subject</th>
                                 <th>Contract Period</th>
                                 <th>Vendor Name</th>
-                                <th>Systems (Qty & Model)</th>
-                                <th>Printers (Qty & Model)</th>
-                                <th>Laptops (Qty & Model)</th>
-                                <th>Total Units</th>
+                                <th>Asset Category</th>
+                                <th>Total Quantity</th>
                                 <th>WO Copy</th>
                                 <th>Status</th>
                             </tr>
@@ -1094,6 +1173,16 @@
                         </tbody>
                     </table>
                 </div>
+                <!-- Work Order Pagination Controls -->
+                <div class="d-flex justify-content-between align-items-center flex-wrap gap-2 p-3 border-top bg-white"
+                    id="wo-pagination-wrapper">
+                    <div class="text-secondary fw-semibold" id="wo-pagination-info" style="font-size: 0.85rem;">
+                        Showing 0 to 0 of 0 entries
+                    </div>
+                    <ul class="pagination pagination-sm m-0" id="wo-pagination-nav">
+                        <!-- Dynamic pagination items -->
+                    </ul>
+                </div>
             </div>
         </section>
 
@@ -1106,7 +1195,7 @@
                 <div class="section-title">
                     <i class="fa-solid fa-clipboard-list text-info fs-5"></i>
                     <div>
-                        <h3>2. Department User Request Creation</h3>
+                        <h3>3. Department User Request Creation</h3>
                         <span>Tapal No & Date, Department & Zone Dropdowns, Requested Qty (Systems, Printers, Laptops),
                             Required Period (Days Calculated), Mail Copy Upload & Dynamic Status</span>
                     </div>
@@ -1114,8 +1203,8 @@
                 <div class="action-btn-group">
                     <div class="search-input-wrap">
                         <i class="fa-solid fa-magnifying-glass"></i>
-                        <input type="text" onkeyup="filterGenericTable('reqTable', this.value)"
-                            placeholder="Search Tapal No, Dept, Zone...">
+                        <input type="text" onkeyup="handleRentalTableSearch('req', this.value)"
+                            placeholder="Search Tapal No, Dept, Zone, Officer...">
                     </div>
                     <button class="btn-custom btn-custom-primary" onclick="openNewRequestModal()">
                         <i class="fa-solid fa-plus-circle"></i> Create Request
@@ -1132,17 +1221,19 @@
                     <table class="custom-table" id="reqTable">
                         <thead>
                             <tr>
-                                <th>Tapal No & Date</th>
-                                <th>Department & Zone</th>
+                                <th style="width: 50px;" class="text-center">S.No</th>
+                                <th>Tapal No</th>
+                                <th>Tapal Date</th>
+                                <th>Department</th>
+                                <th>Zone</th>
                                 <th>Requesting Officer</th>
-                                <th>Systems Qty</th>
-                                <th>Printers Qty</th>
-                                <th>Laptops Qty</th>
+                                <th>Asset Category</th>
+                                <th class="text-center">Total Quantity</th>
                                 <th>Required Period</th>
-                                <th>Duration (Days)</th>
-                                <th>Mail Copy</th>
+                                <th class="text-center">Duration (Days)</th>
+                                <th>Created Date</th>
+                                <th class="text-center">Mail Copy</th>
                                 <th>Status</th>
-                                <th>Action</th>
                             </tr>
                         </thead>
                         <tbody id="reqTableBody">
@@ -1150,6 +1241,16 @@
                         </tbody>
                     </table>
                 </div>
+                <!-- User Requests Pagination Controls -->
+                <div class="d-flex justify-content-between align-items-center flex-wrap gap-2 p-3 border-top bg-white"
+                    id="req-pagination-wrapper">
+                    <div class="text-secondary fw-semibold" id="req-pagination-info" style="font-size: 0.85rem;">
+                        Showing 0 to 0 of 0 entries
+                    </div>
+                    <ul class="pagination pagination-sm m-0" id="req-pagination-nav">
+                        <!-- Dynamic pagination items -->
+                    </ul>
+                </div>
             </div>
         </section>
 
@@ -1162,7 +1263,7 @@
                 <div class="section-title">
                     <i class="fa-solid fa-truck-ramp-box text-warning fs-5"></i>
                     <div>
-                        <h3>3. Delivery Challan (DC) Upload for Inward Stock</h3>
+                        <h3>2. Delivery Challan (DC) Upload for Inward Stock</h3>
                         <span>Inward stock entry against registered Work Order, DC No, DC Date, Inward Qty (Systems,
                             Printers, Laptops) & DC File Upload</span>
                     </div>
@@ -1170,7 +1271,7 @@
                 <div class="action-btn-group">
                     <div class="search-input-wrap">
                         <i class="fa-solid fa-magnifying-glass"></i>
-                        <input type="text" onkeyup="filterGenericTable('dcTable', this.value)"
+                        <input type="text" onkeyup="handleRentalTableSearch('dc', this.value)"
                             placeholder="Search DC No, WO File No, Vendor...">
                     </div>
                     <button class="btn-custom btn-custom-primary" onclick="openNewDCModal()">
@@ -1188,15 +1289,18 @@
                     <table class="custom-table" id="dcTable">
                         <thead>
                             <tr>
-                                <th>DC No & Date</th>
-                                <th>Work Order Ref</th>
+                                <th style="width: 50px;" class="text-center">S.No</th>
+                                <th>Work Order File No</th>
                                 <th>Vendor Name</th>
-                                <th>Inward Systems</th>
-                                <th>Inward Printers</th>
-                                <th>Inward Laptops</th>
-                                <th>Total Stock</th>
-                                <th>Vehicle / Driver</th>
-                                <th>DC File Copy</th>
+                                <th>DC Number(s)</th>
+                                <th class="text-center">Inward Systems</th>
+                                <th class="text-center">Inward Printers</th>
+                                <th class="text-center">Inward Laptops</th>
+                                <th class="text-center">Inward UPS</th>
+                                <th class="text-center">Inward Dongle</th>
+                                <th class="text-center">Total Stock</th>
+                                <th class="text-center">DC File Copy</th>
+                                <th>DC Date</th>
                                 <th>Received By</th>
                             </tr>
                         </thead>
@@ -1205,6 +1309,16 @@
                         </tbody>
                     </table>
                 </div>
+                <!-- Inward DC Pagination Controls -->
+                <div class="d-flex justify-content-between align-items-center flex-wrap gap-2 p-3 border-top bg-white"
+                    id="dc-pagination-wrapper">
+                    <div class="text-secondary fw-semibold" id="dc-pagination-info" style="font-size: 0.85rem;">
+                        Showing 0 to 0 of 0 entries
+                    </div>
+                    <ul class="pagination pagination-sm m-0" id="dc-pagination-nav">
+                        <!-- Dynamic pagination items -->
+                    </ul>
+                </div>
             </div>
         </section>
 
@@ -1225,7 +1339,7 @@
                 <div class="action-btn-group">
                     <div class="search-input-wrap">
                         <i class="fa-solid fa-magnifying-glass"></i>
-                        <input type="text" onkeyup="filterGenericTable('issuedTable', this.value)"
+                        <input type="text" onkeyup="handleRentalTableSearch('issued', this.value)"
                             placeholder="Search Department, Officer, Tapal...">
                     </div>
                     <button class="btn-custom btn-custom-primary" onclick="openIssueAssetModal()">
@@ -1243,14 +1357,15 @@
                     <table class="custom-table" id="issuedTable">
                         <thead>
                             <tr>
+                                <th style="width: 50px;">S.No</th>
                                 <th>Tapal Ref / Dept</th>
                                 <th>Custodian Officer & Phone</th>
                                 <th>Issued Date</th>
-                                <th>Issued Systems</th>
-                                <th>Issued Printers</th>
-                                <th>Issued Laptops</th>
+                                <th>Asset Category</th>
+                                <th>Model / Specifications</th>
+                                <th class="text-center">Issued Qty</th>
                                 <th>Issued Period</th>
-                                <th>Days</th>
+                                <th class="text-center">Days</th>
                                 <th>Stock Copy</th>
                                 <th>Status</th>
                                 <th>Action</th>
@@ -1261,6 +1376,16 @@
                         </tbody>
                     </table>
                 </div>
+                <!-- Issued Assets Pagination Controls -->
+                <div class="d-flex justify-content-between align-items-center flex-wrap gap-2 p-3 border-top bg-white"
+                    id="issued-pagination-wrapper">
+                    <div class="text-secondary fw-semibold" id="issued-pagination-info" style="font-size: 0.85rem;">
+                        Showing 0 to 0 of 0 entries
+                    </div>
+                    <ul class="pagination pagination-sm m-0" id="issued-pagination-nav">
+                        <!-- Dynamic pagination items -->
+                    </ul>
+                </div>
             </div>
         </section>
 
@@ -1281,8 +1406,8 @@
                 <div class="action-btn-group">
                     <div class="search-input-wrap">
                         <i class="fa-solid fa-magnifying-glass"></i>
-                        <input type="text" onkeyup="filterGenericTable('returnsTable', this.value)"
-                            placeholder="Search Return ID, Dept, Officer...">
+                        <input type="text" onkeyup="handleRentalTableSearch('returns', this.value)"
+                            placeholder="Search Dept, Officer, Return Date...">
                     </div>
                     <button class="btn-custom btn-custom-success" onclick="openReturnAssetModal()">
                         <i class="fa-solid fa-check-double"></i> Process Return Intake
@@ -1299,6 +1424,7 @@
                     <table class="custom-table" id="returnsTable">
                         <thead>
                             <tr>
+                                <th style="width: 50px;">S.No</th>
                                 <th>Department & Location</th>
                                 <th>Custodian Officer</th>
                                 <th>Return Date</th>
@@ -1317,6 +1443,16 @@
                         </tbody>
                     </table>
                 </div>
+                <!-- Returns Pagination Controls -->
+                <div class="d-flex justify-content-between align-items-center flex-wrap gap-2 p-3 border-top bg-white"
+                    id="returns-pagination-wrapper">
+                    <div class="text-secondary fw-semibold" id="returns-pagination-info" style="font-size: 0.85rem;">
+                        Showing 0 to 0 of 0 entries
+                    </div>
+                    <ul class="pagination pagination-sm m-0" id="returns-pagination-nav">
+                        <!-- Dynamic pagination items -->
+                    </ul>
+                </div>
             </div>
         </section>
 
@@ -1335,6 +1471,11 @@
                     </div>
                 </div>
                 <div class="action-btn-group">
+                    <div class="search-input-wrap">
+                        <i class="fa-solid fa-magnifying-glass"></i>
+                        <input type="text" onkeyup="handleRentalTableSearch('reminders', this.value)"
+                            placeholder="Search Dept, Zone, Officer...">
+                    </div>
                     <button class="btn-custom btn-custom-danger" onclick="openBulkReminderModal()">
                         <i class="fa-solid fa-paper-plane"></i> Send Bulk Overdue Notices
                     </button>
@@ -1350,6 +1491,7 @@
                     <table class="custom-table" id="remindersTable">
                         <thead>
                             <tr>
+                                <th style="width: 50px;">S.No</th>
                                 <th>Department & Zone</th>
                                 <th>Custodian Officer & Phone</th>
                                 <th>Issued Items</th>
@@ -1364,6 +1506,16 @@
                         </tbody>
                     </table>
                 </div>
+                <!-- Reminders Pagination Controls -->
+                <div class="d-flex justify-content-between align-items-center flex-wrap gap-2 p-3 border-top bg-white"
+                    id="reminders-pagination-wrapper">
+                    <div class="text-secondary fw-semibold" id="reminders-pagination-info" style="font-size: 0.85rem;">
+                        Showing 0 to 0 of 0 entries
+                    </div>
+                    <ul class="pagination pagination-sm m-0" id="reminders-pagination-nav">
+                        <!-- Dynamic pagination items -->
+                    </ul>
+                </div>
             </div>
         </section>
 
@@ -1382,6 +1534,11 @@
                     </div>
                 </div>
                 <div class="action-btn-group">
+                    <div class="search-input-wrap">
+                        <i class="fa-solid fa-magnifying-glass"></i>
+                        <input type="text" onkeyup="handleRentalTableSearch('master', this.value)"
+                            placeholder="Search Ref, Dept, Custodian...">
+                    </div>
                     <button class="btn-custom btn-custom-success"
                         onclick="exportTableToExcel('masterReportTable', 'GCC_Rental_Master_Ledger_Complete')">
                         <i class="fa-solid fa-download"></i> Download Master Excel
@@ -1397,6 +1554,7 @@
                     <table class="custom-table" id="masterReportTable">
                         <thead>
                             <tr>
+                                <th style="width: 50px;">S.No</th>
                                 <th>Ref / Dept</th>
                                 <th>Custodian Officer</th>
                                 <th>Issued Date</th>
@@ -1413,6 +1571,16 @@
                         </tbody>
                     </table>
                 </div>
+                <!-- Master Report Pagination Controls -->
+                <div class="d-flex justify-content-between align-items-center flex-wrap gap-2 p-3 border-top bg-white"
+                    id="master-pagination-wrapper">
+                    <div class="text-secondary fw-semibold" id="master-pagination-info" style="font-size: 0.85rem;">
+                        Showing 0 to 0 of 0 entries
+                    </div>
+                    <ul class="pagination pagination-sm m-0" id="master-pagination-nav">
+                        <!-- Dynamic pagination items -->
+                    </ul>
+                </div>
             </div>
         </section>
 
@@ -1463,47 +1631,24 @@
                                     onchange="calculateWODuration()">
                             </div>
 
-                            <!-- Item Quantities and Model Names -->
-                            <div class="col-12">
-                                <h6 class="fw-bold text-primary border-bottom pb-2 mt-2"><i
-                                        class="fa-solid fa-boxes-stacked me-1"></i> Quantities & Model Names</h6>
-                            </div>
-                            <div class="col-md-4">
-                                <label class="form-label">Systems (Desktop) Qty</label>
-                                <input type="number" class="form-control" id="woSystemsQtyInput" min="0" value="0"
-                                    placeholder="Qty">
-                            </div>
-                            <div class="col-md-8">
-                                <label class="form-label">Systems Model Name</label>
-                                <input type="text" class="form-control" id="woSystemsModelInput"
-                                    placeholder="e.g. Dell OptiPlex 3080 Core i5 / 16GB / 512GB SSD">
-                            </div>
-
-                            <div class="col-md-4">
-                                <label class="form-label">Printers Qty</label>
-                                <input type="number" class="form-control" id="woPrintersQtyInput" min="0" value="0"
-                                    placeholder="Qty">
+                            <!-- Asset Category, Quantity and Model Name -->
+                            <div
+                                class="col-12 d-flex justify-content-between align-items-center mt-2 border-bottom pb-2">
+                                <h6 class="fw-bold text-primary mb-0"><i class="fa-solid fa-boxes-stacked me-1"></i>
+                                    Asset Categories, Quantities & Model Specifications</h6>
+                                <button type="button" class="btn btn-sm btn-outline-primary"
+                                    onclick="addWOCategoryRow()">
+                                    <i class="fa-solid fa-plus-circle me-1"></i> Add Another Asset Category
+                                </button>
                             </div>
-                            <div class="col-md-8">
-                                <label class="form-label">Printers Model Name</label>
-                                <input type="text" class="form-control" id="woPrintersModelInput"
-                                    placeholder="e.g. HP LaserJet Pro MFP 4104dw Heavy Duty">
-                            </div>
-
-                            <div class="col-md-4">
-                                <label class="form-label">Laptops Qty</label>
-                                <input type="number" class="form-control" id="woLaptopsQtyInput" min="0" value="0"
-                                    placeholder="Qty">
-                            </div>
-                            <div class="col-md-8">
-                                <label class="form-label">Laptops Model Name</label>
-                                <input type="text" class="form-control" id="woLaptopsModelInput"
-                                    placeholder="e.g. Dell Latitude 5440 Core i7 / 16GB RAM">
+                            <div class="col-12" id="woCategoryRowsContainer">
+                                <!-- Populated dynamically -->
                             </div>
 
                             <div class="col-md-6">
-                                <label class="form-label">Upload Work Order Copy (PDF / Doc)</label>
-                                <input type="file" class="form-control" id="woCopyFileInput"
+                                <label class="form-label">Upload Work Order Copy (PDF / Doc) <span
+                                        class="text-danger">*</span></label>
+                                <input type="file" class="form-control" id="woCopyFileInput" required
                                     accept=".pdf,.doc,.docx,.jpg,.png">
                             </div>
                             <div class="col-md-6">
@@ -1534,6 +1679,69 @@
     </div>
 
 
+    <!-- MODAL 1B: VIEW WORK ORDER CATEGORIES BREAKDOWN -->
+    <div class="modal fade" id="woCategoriesModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header bg-primary text-white">
+                    <h5 class="modal-title text-white"><i class="fa-solid fa-boxes-stacked me-2"></i> Work Order Asset
+                        Categories & Specifications</h5>
+                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                </div>
+                <div class="modal-body p-4">
+                    <div class="bg-light p-3 rounded-3 border mb-3">
+                        <div class="row g-2">
+                            <div class="col-md-6">
+                                <small class="text-muted d-block" style="font-size:0.8rem;">Work Order File
+                                    Number</small>
+                                <strong class="fs-6 text-dark" id="modalWOCatFileNo">-</strong>
+                            </div>
+                            <div class="col-md-6">
+                                <small class="text-muted d-block" style="font-size:0.8rem;">Vendor Name</small>
+                                <strong class="fs-6 text-dark" id="modalWOCatVendor">-</strong>
+                            </div>
+                            <div class="col-12 mt-2">
+                                <small class="text-muted d-block" style="font-size:0.8rem;">File Subject</small>
+                                <span class="text-secondary fw-semibold" id="modalWOCatSubject">-</span>
+                            </div>
+                            <div class="col-md-6 mt-2">
+                                <small class="text-muted d-block" style="font-size:0.8rem;">Contract Period</small>
+                                <span class="text-dark fw-semibold" id="modalWOCatPeriod">-</span>
+                            </div>
+                            <div class="col-md-6 mt-2">
+                                <small class="text-muted d-block" style="font-size:0.8rem;">Total Units
+                                    Contracted</small>
+                                <span class="badge bg-primary fs-6" id="modalWOCatTotalQty">0 Units</span>
+                            </div>
+                        </div>
+                    </div>
+
+                    <h6 class="fw-bold text-primary mb-2"><i class="fa-solid fa-list-check me-1"></i> Asset Categories
+                        Entered for this Work Order</h6>
+                    <div class="table-responsive border rounded-3">
+                        <table class="table table-hover align-middle mb-0">
+                            <thead class="table-light">
+                                <tr>
+                                    <th style="width: 60px;">#</th>
+                                    <th>Asset Category</th>
+                                    <th class="text-center" style="width: 130px;">Quantity</th>
+                                    <th>Model Name / Specifications</th>
+                                </tr>
+                            </thead>
+                            <tbody id="modalWOCategoriesTableBody">
+                                <!-- Populated dynamically -->
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
     <!-- MODAL 2: CREATE REQUEST (Tapal No, Date, Dept/Zone Dropdown, Systems/Prt/Ltp Qty, Period From/To + Calculated Days, Mail Copy Upload, Dynamic Status) -->
     <div class="modal fade" id="newRequestModal" tabindex="-1" aria-hidden="true">
         <div class="modal-dialog modal-lg">
@@ -1570,17 +1778,18 @@
                                 </select>
                             </div>
 
-                            <div class="col-md-4">
-                                <label class="form-label">Requested Systems Qty</label>
-                                <input type="number" class="form-control" id="reqSystemsQtyInput" min="0" value="0">
-                            </div>
-                            <div class="col-md-4">
-                                <label class="form-label">Requested Printers Qty</label>
-                                <input type="number" class="form-control" id="reqPrintersQtyInput" min="0" value="0">
+                            <!-- Asset Category, Quantity and Model Name -->
+                            <div
+                                class="col-12 d-flex justify-content-between align-items-center mt-3 border-bottom pb-2">
+                                <h6 class="fw-bold text-primary mb-0"><i class="fa-solid fa-boxes-stacked me-1"></i>
+                                    Requested Asset Categories, Quantities & Model Specifications</h6>
+                                <button type="button" class="btn btn-sm btn-outline-primary"
+                                    onclick="addReqCategoryRow()">
+                                    <i class="fa-solid fa-plus-circle me-1"></i> Add Another Asset Category
+                                </button>
                             </div>
-                            <div class="col-md-4">
-                                <label class="form-label">Requested Laptops Qty</label>
-                                <input type="number" class="form-control" id="reqLaptopsQtyInput" min="0" value="0">
+                            <div class="col-12" id="reqCategoryRowsContainer">
+                                <!-- Populated dynamically -->
                             </div>
 
                             <div class="col-md-6">
@@ -1604,8 +1813,8 @@
                             </div>
 
                             <div class="col-md-6">
-                                <label class="form-label">Upload Mail Copy (PDF / Scan)</label>
-                                <input type="file" class="form-control" id="reqMailCopyFileInput"
+                                <label class="form-label">Upload Mail Copy (PDF / Scan) *</label>
+                                <input type="file" class="form-control" id="reqMailCopyFileInput" required
                                     accept=".pdf,.doc,.docx,.jpg,.png">
                             </div>
                             <div class="col-md-6">
@@ -1615,16 +1824,6 @@
                                 </select>
                             </div>
 
-                            <div class="col-md-6">
-                                <label class="form-label">Requesting Officer Name & Designation</label>
-                                <input type="text" class="form-control" id="reqOfficerInput"
-                                    placeholder="e.g. Dr. K. Ramanathan, AEE">
-                            </div>
-                            <div class="col-md-6">
-                                <label class="form-label">Contact Mobile / Email</label>
-                                <input type="text" class="form-control" id="reqContactInput"
-                                    placeholder="e.g. 98401XXXXX">
-                            </div>
                             <div class="col-12">
                                 <label class="form-label">Purpose / Event Description</label>
                                 <textarea class="form-control" id="reqPurposeInput" rows="2"
@@ -1643,6 +1842,73 @@
     </div>
 
 
+    <!-- MODAL 2B: VIEW DEPARTMENT REQUEST CATEGORIES BREAKDOWN -->
+    <div class="modal fade" id="reqCategoriesModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header bg-info text-white">
+                    <h5 class="modal-title text-white"><i class="fa-solid fa-boxes-stacked me-2"></i> Department
+                        Requested Asset Categories & Specifications</h5>
+                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                </div>
+                <div class="modal-body p-4">
+                    <div class="bg-light p-3 rounded-3 border mb-3">
+                        <div class="row g-2">
+                            <div class="col-md-6">
+                                <small class="text-muted d-block" style="font-size:0.8rem;">Tapal Number</small>
+                                <strong class="fs-6 text-dark" id="modalReqCatTapalNo">-</strong>
+                            </div>
+                            <div class="col-md-6">
+                                <small class="text-muted d-block" style="font-size:0.8rem;">Department & Zone</small>
+                                <strong class="fs-6 text-dark" id="modalReqCatDeptZone">-</strong>
+                            </div>
+                            <div class="col-md-6 mt-2">
+                                <small class="text-muted d-block" style="font-size:0.8rem;">Requesting Officer</small>
+                                <span class="text-secondary fw-semibold" id="modalReqCatOfficer">-</span>
+                            </div>
+                            <div class="col-md-6 mt-2">
+                                <small class="text-muted d-block" style="font-size:0.8rem;">Required Period &
+                                    Duration</small>
+                                <span class="text-dark fw-semibold" id="modalReqCatPeriod">-</span>
+                            </div>
+                            <div class="col-md-6 mt-2">
+                                <small class="text-muted d-block" style="font-size:0.8rem;">Total Quantity
+                                    Requested</small>
+                                <span class="badge bg-info fs-6" id="modalReqCatTotalQty">0 Units</span>
+                            </div>
+                            <div class="col-md-6 mt-2">
+                                <small class="text-muted d-block" style="font-size:0.8rem;">Status</small>
+                                <span class="badge bg-warning text-dark" id="modalReqCatStatus">-</span>
+                            </div>
+                        </div>
+                    </div>
+
+                    <h6 class="fw-bold text-primary mb-2"><i class="fa-solid fa-list-check me-1"></i> Asset Categories
+                        Requested in this Tapal</h6>
+                    <div class="table-responsive border rounded-3">
+                        <table class="table table-hover align-middle mb-0">
+                            <thead class="table-light">
+                                <tr>
+                                    <th style="width: 60px;">#</th>
+                                    <th>Asset Category</th>
+                                    <th class="text-center" style="width: 130px;">Quantity</th>
+                                    <th>Model Name / Specifications</th>
+                                </tr>
+                            </thead>
+                            <tbody id="modalReqCategoriesTableBody">
+                                <!-- Populated dynamically -->
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
     <!-- MODAL 3: INWARD DELIVERY CHALLAN (DC) UPLOAD -->
     <div class="modal fade" id="newDCModal" tabindex="-1" aria-hidden="true">
         <div class="modal-dialog modal-lg">
@@ -1658,7 +1924,7 @@
                             <div class="col-md-6">
                                 <label class="form-label">Registered Work Order *</label>
                                 <select class="form-select" id="dcWOSelect" required
-                                    onchange="populateDCVendorFromWO(this.value)">
+                                    onchange="populateDCDetailsFromWO(this.value)">
                                     <option value="">-- Select Work Order --</option>
                                     <!-- Populated from rental_workorder_register -->
                                 </select>
@@ -1674,21 +1940,24 @@
                                     placeholder="e.g. DC-INW-2026-104">
                             </div>
                             <div class="col-md-6">
-                                <label class="form-label">Challan Date *</label>
+                                <label class="form-label">Delivery Challan Date *</label>
                                 <input type="date" class="form-control" id="dcDateInput" required>
                             </div>
 
-                            <div class="col-md-4">
-                                <label class="form-label">Inward Systems Qty</label>
-                                <input type="number" class="form-control" id="dcSystemsQtyInput" min="0" value="0">
-                            </div>
-                            <div class="col-md-4">
-                                <label class="form-label">Inward Printers Qty</label>
-                                <input type="number" class="form-control" id="dcPrintersQtyInput" min="0" value="0">
+                            <!-- Hardware Quota & Inward Counts -->
+                            <div class="col-12">
+                                <h6 class="fw-bold text-primary border-bottom pb-2 mt-2"><i
+                                        class="fa-solid fa-boxes-packing me-1"></i> Registered WO Hardware & Inward
+                                    Stock Received</h6>
                             </div>
-                            <div class="col-md-4">
-                                <label class="form-label">Inward Laptops Qty</label>
-                                <input type="number" class="form-control" id="dcLaptopsQtyInput" min="0" value="0">
+
+                            <div class="col-12" id="dcWOStatusNotice" style="display: none;"></div>
+
+                            <div class="col-12" id="dcCategoryInwardContainer">
+                                <div class="alert alert-light text-center py-3 text-muted border">
+                                    <i class="fa-solid fa-arrow-up me-1"></i> Please select a Registered Work Order
+                                    above to load its asset categories and quota balance.
+                                </div>
                             </div>
 
                             <div class="col-md-6">
@@ -1696,18 +1965,20 @@
                                 <input type="file" class="form-control" id="dcFileInput"
                                     accept=".pdf,.doc,.docx,.jpg,.png" required>
                             </div>
-                            <div class="col-md-6">
-                                <label class="form-label">Vehicle Registration No</label>
+
+                            <!-- <div class="col-md-6">
+                                <label class="form-label">Vehicle No / Carrier</label>
                                 <input type="text" class="form-control" id="dcVehicleInput"
-                                    placeholder="e.g. TN-01-AB-4567">
-                            </div>
+                                    placeholder="e.g. TN 01 AB 1234">
+                            </div> -->
                             <div class="col-md-6">
                                 <label class="form-label">Received By (Store Officer)</label>
                                 <input type="text" class="form-control" id="dcReceivedByInput"
-                                    placeholder="e.g. M. Suresh, IT Central Store Officer">
+                                    placeholder="e.g. IT Store Officer">
                             </div>
+
                             <div class="col-md-6">
-                                <label class="form-label">Remarks / Gate Pass Ref</label>
+                                <label class="form-label">Remarks</label>
                                 <input type="text" class="form-control" id="dcRemarksInput"
                                     placeholder="Verified OK against WO Quota">
                             </div>
@@ -1744,13 +2015,6 @@
                                     <!-- Populated from rental_user_request -->
                                 </select>
                             </div>
-                            <div class="col-md-6">
-                                <label class="form-label">Select Inward Stock DC (Optional)</label>
-                                <select class="form-select" id="issueInwardDCSelect">
-                                    <option value="">-- Choose Inward DC (Optional) --</option>
-                                    <!-- Populated from rental_inward_delivery_challan -->
-                                </select>
-                            </div>
 
                             <div class="col-md-6">
                                 <label class="form-label">Department & Location</label>
@@ -1762,25 +2026,46 @@
                                 <input type="date" class="form-control" id="issueDateInput" required>
                             </div>
 
-                            <div class="col-md-4">
-                                <label class="form-label">Issued Systems Qty</label>
-                                <input type="number" class="form-control" id="issueSystemsQtyInput" min="0" value="0">
-                            </div>
-                            <div class="col-md-4">
-                                <label class="form-label">Issued Printers Qty</label>
-                                <input type="number" class="form-control" id="issuePrintersQtyInput" min="0" value="0">
-                            </div>
-                            <div class="col-md-4">
-                                <label class="form-label">Issued Laptops Qty</label>
-                                <input type="number" class="form-control" id="issueLaptopsQtyInput" min="0" value="0">
-                            </div>
-
+                            <!-- Requested Asset Categories & Models with Input Issued Qty Table -->
                             <div class="col-12">
-                                <label class="form-label">Asset Tag / Serial Numbers (Comma Separated)</label>
-                                <input type="text" class="form-control" id="issueSerialDetailsInput"
-                                    placeholder="e.g. GCC-RN-LTP-088, GCC-RN-LTP-089, HP-PRT-012">
+                                <div class="card border rounded-3 p-3 bg-light shadow-sm">
+                                    <div class="d-flex justify-content-between align-items-center mb-2">
+                                        <h6 class="fw-bold text-primary mb-0">
+                                            <i class="fa-solid fa-boxes-stacked me-1"></i> Requested Asset Categories &
+                                            Quantities to Issue
+                                        </h6>
+                                        <span class="badge bg-primary px-2 py-1" id="issueTotalUnitsBadge">Total Items:
+                                            0</span>
+                                    </div>
+                                    <div class="table-responsive">
+                                        <table
+                                            class="table table-sm table-bordered table-hover align-middle mb-0 bg-white"
+                                            id="issueItemsTable">
+                                            <thead class="table-light">
+                                                <tr>
+                                                    <th style="width: 50px;" class="text-center">S.No</th>
+                                                    <th>Asset Category</th>
+                                                    <th>Model Name / Specifications</th>
+                                                    <th style="width: 130px;" class="text-center text-secondary">
+                                                        Requested Qty</th>
+                                                    <th style="width: 140px;" class="text-center text-primary">Issued
+                                                        Qty *</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody id="issueItemsTableBody">
+                                                <tr>
+                                                    <td colspan="5" class="text-center text-muted py-3">
+                                                        <i class="fa-solid fa-hand-pointer me-1"></i> Please select a
+                                                        User Request above to view requested asset categories & models.
+                                                    </td>
+                                                </tr>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
                             </div>
 
+
                             <div class="col-md-6">
                                 <label class="form-label">Issued Period - From Date *</label>
                                 <input type="date" class="form-control" id="issueFromDateInput" required
@@ -1803,10 +2088,9 @@
                             </div>
 
                             <div class="col-md-6">
-                                <label class="form-label">Upload Stock Issue Copy (Acknowledgment / Handover
-                                    Slip)</label>
+                                <label class="form-label">Upload Stock Issue Copy (Acknowledgment / Handover Slip) *</label>
                                 <input type="file" class="form-control" id="issueStockCopyFileInput"
-                                    accept=".pdf,.doc,.docx,.jpg,.png">
+                                    accept=".pdf,.doc,.docx,.jpg,.png" required>
                             </div>
                             <div class="col-md-6">
                                 <label class="form-label">Custodian Officer Name</label>
@@ -2090,14 +2374,45 @@
             return [year, month.padStart(2, '0'), day.padStart(2, '0')].join('-');
         };
 
+        const formatDateDMY = (dateStr) => {
+            if (!dateStr || dateStr === 'null' || dateStr === 'undefined') return '-';
+            try {
+                const s = String(dateStr).trim();
+                if (/^\d{2}-\d{2}-\d{4}$/.test(s)) return s;
+                if (/^\d{4}-\d{2}-\d{2}/.test(s)) {
+                    const parts = s.substring(0, 10).split('-');
+                    return `${parts[2]}-${parts[1]}-${parts[0]}`;
+                }
+                const d = new Date(s);
+                if (isNaN(d.getTime())) return s;
+                const dd = String(d.getDate()).padStart(2, '0');
+                const mm = String(d.getMonth() + 1).padStart(2, '0');
+                const yyyy = d.getFullYear();
+                return `${dd}-${mm}-${yyyy}`;
+            } catch (e) {
+                return dateStr;
+            }
+        };
+
         const addDays = (date, days) => {
             const result = new Date(date);
             result.setDate(result.getDate() + days);
             return result;
         };
 
+        function escapeHtml(text) {
+            if (text === null || text === undefined) return '';
+            return String(text)
+                .replace(/&/g, '&amp;')
+                .replace(/</g, '&lt;')
+                .replace(/>/g, '&gt;')
+                .replace(/"/g, '&quot;')
+                .replace(/'/g, '&#39;');
+        }
+
         // Global State & Master Data Cache
         let masterData = {
+            categories: [],
             departments: [],
             zones: [],
             vendors: [],
@@ -2135,7 +2450,8 @@
 
         async function loadMasterData() {
             try {
-                const [deptRes, zoneRes, vendorRes, reqStatRes, retStatRes] = await Promise.all([
+                const [catRes, deptRes, zoneRes, vendorRes, reqStatRes, retStatRes] = await Promise.all([
+                    fetch(contextPath + 'gccrentalmanagement/api/categories'),
                     fetch(contextPath + 'gccrentalmanagement/api/departments'),
                     fetch(contextPath + 'gccrentalmanagement/api/zones'),
                     fetch(contextPath + 'gccrentalmanagement/api/vendors'),
@@ -2143,6 +2459,7 @@
                     fetch(contextPath + 'gccrentalmanagement/api/statuses?type=RETURN')
                 ]);
 
+                masterData.categories = await catRes.json();
                 masterData.departments = await deptRes.json();
                 masterData.zones = await zoneRes.json();
                 masterData.vendors = await vendorRes.json();
@@ -2156,65 +2473,105 @@
         }
 
         function populateMasterDropdowns() {
+            // Categories for User Request Modal
+            const reqCatSelect = document.getElementById('reqCategorySelect');
+            if (reqCatSelect) {
+                reqCatSelect.innerHTML = '<option value="">-- Select Category --</option>';
+                masterData.categories.forEach(c => {
+                    const catId = c.id != null ? c.id : c.cid;
+                    const catName = c.category_type || c.category_name || c.name || ('Category #' + catId);
+                    const opt = document.createElement('option');
+                    opt.value = catId;
+                    opt.textContent = catName;
+                    reqCatSelect.appendChild(opt);
+                });
+            }
+
+            // Refresh options in any open/existing WO category dropdowns
+            const woSelects = document.querySelectorAll('.wo-cat-select');
+            woSelects.forEach(select => {
+                const curVal = select.value;
+                select.innerHTML = '<option value="">-- Select Category --</option>';
+                masterData.categories.forEach(c => {
+                    const catId = c.id != null ? c.id : c.cid;
+                    const catName = c.category_type || c.category_name || c.name || ('Category #' + catId);
+                    const opt = document.createElement('option');
+                    opt.value = catId;
+                    opt.textContent = catName;
+                    if (catId == curVal) opt.selected = true;
+                    select.appendChild(opt);
+                });
+            });
+
             // Departments
             const deptSelect = document.getElementById('reqDeptInput');
-            deptSelect.innerHTML = '<option value="">-- Select Department --</option>';
-            masterData.departments.forEach(d => {
-                const opt = document.createElement('option');
-                opt.value = d.id;
-                opt.textContent = d.dept_name;
-                deptSelect.appendChild(opt);
-            });
+            if (deptSelect) {
+                deptSelect.innerHTML = '<option value="">-- Select Department --</option>';
+                masterData.departments.forEach(d => {
+                    const opt = document.createElement('option');
+                    opt.value = d.id;
+                    opt.textContent = d.dept_name;
+                    deptSelect.appendChild(opt);
+                });
+            }
 
             // Zones
             const zoneSelect = document.getElementById('reqZoneInput');
-            zoneSelect.innerHTML = '<option value="">-- Select Zone (Optional) --</option>';
-            masterData.zones.forEach(z => {
-                const opt = document.createElement('option');
-                opt.value = z.id;
-                opt.textContent = z.zone_name;
-                zoneSelect.appendChild(opt);
-            });
+            if (zoneSelect) {
+                zoneSelect.innerHTML = '<option value="">-- Select Zone (Optional) --</option>';
+                masterData.zones.forEach(z => {
+                    const opt = document.createElement('option');
+                    opt.value = z.id;
+                    opt.textContent = z.zone_name;
+                    zoneSelect.appendChild(opt);
+                });
+            }
 
             // Vendors
             const vendorSelect = document.getElementById('woVendorInput');
-            vendorSelect.innerHTML = '<option value="">-- Select Vendor --</option>';
-            if (masterData.vendors.length === 0) {
-                // Default options if table empty
-                ['M/s InfoTech Rentals Pvt Ltd', 'M/s Chennai IT Solutions', 'M/s Prime Digital Systems'].forEach(v => {
-                    const opt = document.createElement('option');
-                    opt.value = v;
-                    opt.textContent = v;
-                    vendorSelect.appendChild(opt);
-                });
-            } else {
-                masterData.vendors.forEach(v => {
-                    const opt = document.createElement('option');
-                    opt.value = v.vendor_name;
-                    opt.textContent = v.vendor_name;
-                    vendorSelect.appendChild(opt);
-                });
+            if (vendorSelect) {
+                vendorSelect.innerHTML = '<option value="">-- Select Vendor --</option>';
+                if (masterData.vendors.length === 0) {
+                    // Default options if table empty
+                    ['M/s InfoTech Rentals Pvt Ltd', 'M/s Chennai IT Solutions', 'M/s Prime Digital Systems'].forEach(v => {
+                        const opt = document.createElement('option');
+                        opt.value = v;
+                        opt.textContent = v;
+                        vendorSelect.appendChild(opt);
+                    });
+                } else {
+                    masterData.vendors.forEach(v => {
+                        const opt = document.createElement('option');
+                        opt.value = v.vendor_name;
+                        opt.textContent = v.vendor_name;
+                        vendorSelect.appendChild(opt);
+                    });
+                }
             }
 
             // Request Statuses
             const reqStatSelect = document.getElementById('reqStatusInput');
-            reqStatSelect.innerHTML = '';
-            masterData.requestStatuses.forEach(s => {
-                const opt = document.createElement('option');
-                opt.value = s.id;
-                opt.textContent = s.status_name;
-                reqStatSelect.appendChild(opt);
-            });
+            if (reqStatSelect) {
+                reqStatSelect.innerHTML = '';
+                masterData.requestStatuses.forEach(s => {
+                    const opt = document.createElement('option');
+                    opt.value = s.id;
+                    opt.textContent = s.status_name;
+                    reqStatSelect.appendChild(opt);
+                });
+            }
 
             // Return Statuses
             const retStatSelect = document.getElementById('returnStatusInput');
-            retStatSelect.innerHTML = '';
-            masterData.returnStatuses.forEach(s => {
-                const opt = document.createElement('option');
-                opt.value = s.id;
-                opt.textContent = s.status_name;
-                retStatSelect.appendChild(opt);
-            });
+            if (retStatSelect) {
+                retStatSelect.innerHTML = '';
+                masterData.returnStatuses.forEach(s => {
+                    const opt = document.createElement('option');
+                    opt.value = s.id;
+                    opt.textContent = s.status_name;
+                    retStatSelect.appendChild(opt);
+                });
+            }
         }
 
         async function loadAllRentalData() {
@@ -2243,7 +2600,95 @@
             }
         }
 
+        // ==========================================
+        // PAGINATION & TABLE STATE
+        // ==========================================
+        const rentalPagination = {
+            radar: { page: 1, pageSize: 10, search: '' },
+            wo: { page: 1, pageSize: 10, search: '' },
+            req: { page: 1, pageSize: 10, search: '' },
+            dc: { page: 1, pageSize: 10, search: '' },
+            issued: { page: 1, pageSize: 10, search: '' },
+            returns: { page: 1, pageSize: 10, search: '' },
+            reminders: { page: 1, pageSize: 10, search: '' },
+            master: { page: 1, pageSize: 10, search: '' }
+        };
+
+        function handleRentalTableSearch(tableKey, query) {
+            if (!rentalPagination[tableKey]) return;
+            rentalPagination[tableKey].search = (query || '').toLowerCase().trim();
+            rentalPagination[tableKey].page = 1;
+            switch (tableKey) {
+                case 'radar': renderRadarTable(); break;
+                case 'wo': renderWOTable(); break;
+                case 'req': renderRequestsTable(); break;
+                case 'dc': renderChallansTable(); break;
+                case 'issued': renderIssuedTable(); break;
+                case 'returns': renderReturnsTable(); break;
+                case 'reminders': renderRemindersTable(); break;
+                case 'master': renderMasterReportTable(); break;
+            }
+        }
+
+        function renderRentalPaginationNav(infoId, navId, currentPage, pageSize, totalPages, filteredLength, callbackFn) {
+            const infoEl = document.getElementById(infoId);
+            const navEl = document.getElementById(navId);
+            if (!infoEl || !navEl) return;
+
+            if (filteredLength === 0) {
+                infoEl.textContent = 'Showing 0 to 0 of 0 entries';
+                navEl.innerHTML = '';
+                return;
+            }
+
+            const startIdx = (currentPage - 1) * pageSize + 1;
+            const endIdx = Math.min(currentPage * pageSize, filteredLength);
+            infoEl.textContent = `Showing ${startIdx} to ${endIdx} of ${filteredLength} entries`;
+
+            navEl.innerHTML = '';
+            if (totalPages <= 1) return;
+
+            // Previous
+            const prevLi = document.createElement('li');
+            prevLi.className = `page-item ${currentPage === 1 ? 'disabled' : ''}`;
+            prevLi.innerHTML = `<a class="page-link" href="javascript:void(0)"><i class="fa-solid fa-chevron-left"></i> Prev</a>`;
+            prevLi.onclick = (e) => {
+                e.preventDefault();
+                if (currentPage > 1) callbackFn(currentPage - 1);
+            };
+            navEl.appendChild(prevLi);
+
+            // Numbered items
+            let startPage = Math.max(1, currentPage - 2);
+            let endPage = Math.min(totalPages, startPage + 4);
+            if (endPage - startPage < 4) {
+                startPage = Math.max(1, endPage - 4);
+            }
+
+            for (let i = startPage; i <= endPage; i++) {
+                const li = document.createElement('li');
+                li.className = `page-item ${i === currentPage ? 'active' : ''}`;
+                li.innerHTML = `<a class="page-link" href="javascript:void(0)">${i}</a>`;
+                li.onclick = (e) => {
+                    e.preventDefault();
+                    callbackFn(i);
+                };
+                navEl.appendChild(li);
+            }
+
+            // Next
+            const nextLi = document.createElement('li');
+            nextLi.className = `page-item ${currentPage === totalPages ? 'disabled' : ''}`;
+            nextLi.innerHTML = `<a class="page-link" href="javascript:void(0)">Next <i class="fa-solid fa-chevron-right"></i></a>`;
+            nextLi.onclick = (e) => {
+                e.preventDefault();
+                if (currentPage < totalPages) callbackFn(currentPage + 1);
+            };
+            navEl.appendChild(nextLi);
+        }
+
         function renderAllTables() {
+            renderRadarTable();
             renderWOTable();
             renderRequestsTable();
             renderChallansTable();
@@ -2254,12 +2699,64 @@
             populateCrossModuleDropdowns();
         }
 
-        // ==========================================
-        // UI SWITCHER & TOAST
-        // ==========================================
-        function switchRentalTab(tabId) {
-            document.querySelectorAll('.nav-tab-item').forEach(el => el.classList.remove('active'));
-            document.querySelectorAll('.tab-panel-section').forEach(el => el.classList.remove('active-panel'));
+        function renderRadarTable() {
+            const radarTbody = document.getElementById('radarOverdueTableBody');
+            if (!radarTbody) return;
+            radarTbody.innerHTML = '';
+
+            const overdueItems = (rentalData.reminders || []).filter(r => r.calculated_status === 'OVERDUE');
+            const q = rentalPagination.radar.search || '';
+            const filtered = overdueItems.filter(item => {
+                if (!q) return true;
+                return (item.dept_name || '').toLowerCase().includes(q) ||
+                    (item.zone_name || '').toLowerCase().includes(q) ||
+                    (item.custodian_officer || '').toLowerCase().includes(q) ||
+                    (item.contact_no || '').toLowerCase().includes(q);
+            });
+
+            const pageSize = rentalPagination.radar.pageSize;
+            const totalPages = Math.ceil(filtered.length / pageSize) || 1;
+            rentalPagination.radar.page = Math.min(Math.max(1, rentalPagination.radar.page), totalPages);
+            const currentPage = rentalPagination.radar.page;
+
+            renderRentalPaginationNav('radar-pagination-info', 'radar-pagination-nav', currentPage, pageSize, totalPages, filtered.length, (p) => {
+                rentalPagination.radar.page = p;
+                renderRadarTable();
+            });
+
+            if (filtered.length === 0) {
+                radarTbody.innerHTML = '<tr><td colspan="8" class="text-center py-4 text-success fw-bold"><i class="fa-solid fa-circle-check fs-4 d-block mb-2"></i> All rental items are on schedule! No overdue returns.</td></tr>';
+                return;
+            }
+
+            const pageData = filtered.slice((currentPage - 1) * pageSize, currentPage * pageSize);
+            pageData.forEach((item, idx) => {
+                const sNo = (currentPage - 1) * pageSize + idx + 1;
+                const tr = document.createElement('tr');
+                tr.innerHTML = `
+                    <td>${sNo}</td>
+                    <td><strong>${item.dept_name || '-'}</strong><br><small class="text-muted">${item.zone_name || ''}</small></td>
+                    <td>${item.custodian_officer || '-'}<br><small class="text-muted">${item.contact_no || ''}</small></td>
+                    <td>Sys: ${item.issued_systems_qty || 0} | Prt: ${item.issued_printers_qty || 0} | Ltp: ${item.issued_laptops_qty || 0}</td>
+                    <td>${item.issued_date || '-'}</td>
+                    <td class="text-danger fw-bold">${item.issued_to_date || '-'}</td>
+                    <td><span class="badge-status status-overdue">${item.overdue_days || 0} Days Overdue</span></td>
+                    <td>
+                        <button class="btn btn-sm btn-outline-danger" onclick="openSingleReminderModal(${item.id})">
+                            <i class="fa-solid fa-paper-plane me-1"></i> Send Notice
+                        </button>
+                    </td>
+                `;
+                radarTbody.appendChild(tr);
+            });
+        }
+
+        // ==========================================
+        // UI SWITCHER & TOAST
+        // ==========================================
+        function switchRentalTab(tabId) {
+            document.querySelectorAll('.nav-tab-item').forEach(el => el.classList.remove('active'));
+            document.querySelectorAll('.tab-panel-section').forEach(el => el.classList.remove('active-panel'));
 
             const targetPanel = document.getElementById(tabId);
             if (targetPanel) targetPanel.classList.add('active-panel');
@@ -2284,71 +2781,369 @@
         // ==========================================
         // 1. WORK ORDER RENDERING & ACTIONS
         // ==========================================
+        function getGroupedWorkOrders() {
+            const rawList = rentalData.workOrders || [];
+            const groups = new Map();
+
+            rawList.forEach(item => {
+                const key = (item.wo_file_no || '').trim() || ('ID_' + item.id);
+                if (!groups.has(key)) {
+                    groups.set(key, {
+                        id: item.id,
+                        wo_file_no: item.wo_file_no,
+                        file_subject: item.file_subject,
+                        period_from_date: item.period_from_date,
+                        period_to_date: item.period_to_date,
+                        vendor_name: item.vendor_name,
+                        wo_copy_file: item.wo_copy_file,
+                        status: item.status,
+                        remarks: item.remarks,
+                        created_by: item.created_by,
+                        created_at: item.created_at,
+                        items: [],
+                        total_units: 0,
+                        total_inwarded_qty: 0,
+                        allIds: []
+                    });
+                }
+                const grp = groups.get(key);
+                const qty = parseInt(item.category_qty) || parseInt(item.total_units) || 0;
+                grp.total_units += qty;
+                grp.total_inwarded_qty += (parseInt(item.total_inwarded_qty) || 0);
+                grp.allIds.push(item.id);
+                grp.items.push({
+                    id: item.id,
+                    cid: item.cid,
+                    category_name: item.category_name || item.category_type || 'General',
+                    category_qty: qty,
+                    category_model_name: item.category_model_name || '-'
+                });
+            });
+
+            return Array.from(groups.values());
+        }
+
+        function getWOInwardStats(wo) {
+            const totalOrdered = wo.total_units != null ? parseInt(wo.total_units) : (parseInt(wo.category_qty) || 0);
+
+            let inTotal = 0;
+            if (wo.wo_file_no) {
+                const woChallans = (rentalData.challans || []).filter(c =>
+                    (c.wo_file_no && c.wo_file_no.trim().toLowerCase() === (wo.wo_file_no || '').trim().toLowerCase()) ||
+                    (wo.allIds && wo.allIds.includes(parseInt(c.wo_id))) ||
+                    c.wo_id == wo.id
+                );
+                inTotal = woChallans.reduce((s, c) => s + (parseInt(c.total_inward_qty) || (parseInt(c.inward_systems_qty) || 0) + (parseInt(c.inward_printers_qty) || 0) + (parseInt(c.inward_laptops_qty) || 0) + (parseInt(c.inward_ups_qty) || 0) + (parseInt(c.inward_dongle_qty) || 0)), 0);
+            }
+            if (inTotal === 0 && wo.total_inwarded_qty != null && Number(wo.total_inwarded_qty) > 0) {
+                inTotal = Number(wo.total_inwarded_qty);
+            }
+
+            const totalBal = Math.max(0, totalOrdered - inTotal);
+            const isFullyCompleted = totalOrdered > 0 && totalBal === 0;
+
+            return {
+                totalOrdered,
+                totalInwarded: inTotal,
+                totalBal,
+                isFullyCompleted
+            };
+        }
+
+        function getItemInwardStats(wo, item) {
+            if (!wo || !item) return { quota: 0, received: 0, pending: 0 };
+
+            const woChallans = (rentalData.challans || []).filter(c =>
+                (c.wo_file_no && wo.wo_file_no && c.wo_file_no.trim().toLowerCase() === wo.wo_file_no.trim().toLowerCase()) ||
+                (wo.allIds && wo.allIds.includes(parseInt(c.wo_id))) ||
+                c.wo_id == wo.id
+            );
+
+            const catName = ((item.category_name || item.category_type || '') + '').toLowerCase().trim();
+            let alreadyRecv = 0;
+
+            if (catName.includes('printer')) {
+                alreadyRecv = woChallans.reduce((sum, c) => sum + (parseInt(c.inward_printers_qty) || 0), 0);
+            } else if (catName.includes('laptop') || catName.includes('notebook')) {
+                alreadyRecv = woChallans.reduce((sum, c) => sum + (parseInt(c.inward_laptops_qty) || 0), 0);
+            } else if (catName.includes('ups')) {
+                alreadyRecv = woChallans.reduce((sum, c) => sum + (parseInt(c.inward_ups_qty) || 0), 0);
+            } else if (catName.includes('dongle')) {
+                alreadyRecv = woChallans.reduce((sum, c) => sum + (parseInt(c.inward_dongle_qty) || 0), 0);
+            } else if (catName.includes('system') || catName.includes('desktop') || catName.includes('computer') || catName.includes('pc') || catName.includes('cpu')) {
+                alreadyRecv = woChallans.reduce((sum, c) => sum + (parseInt(c.inward_systems_qty) || 0), 0);
+            } else {
+                if (wo.items && wo.items.length === 1) {
+                    alreadyRecv = woChallans.reduce((sum, c) => sum + (parseInt(c.total_inward_qty) || ((parseInt(c.inward_systems_qty) || 0) + (parseInt(c.inward_printers_qty) || 0) + (parseInt(c.inward_laptops_qty) || 0) + (parseInt(c.inward_ups_qty) || 0) + (parseInt(c.inward_dongle_qty) || 0))), 0);
+                } else {
+                    alreadyRecv = 0;
+                }
+            }
+
+            const quota = parseInt(item.category_qty) || 0;
+            const recv = Math.min(quota, alreadyRecv);
+            const pending = Math.max(0, quota - recv);
+
+            return {
+                quota,
+                received: recv,
+                pending: pending
+            };
+        }
+
         function renderWOTable() {
             const tbody = document.getElementById('woTableBody');
+            if (!tbody) return;
             tbody.innerHTML = '';
 
-            if (rentalData.workOrders.length === 0) {
-                tbody.innerHTML = '<tr><td colspan="10" class="text-center py-4 text-muted">No Work Orders registered yet. Click "Create Work Order File" to add.</td></tr>';
+            const groupedData = getGroupedWorkOrders();
+            const q = rentalPagination.wo.search || '';
+            const filtered = groupedData.filter(wo => {
+                if (!q) return true;
+                const matchItems = (wo.items || []).some(it =>
+                    (it.category_name || '').toLowerCase().includes(q) ||
+                    (it.category_model_name || '').toLowerCase().includes(q)
+                );
+                return (wo.wo_file_no || '').toLowerCase().includes(q) ||
+                    (wo.file_subject || '').toLowerCase().includes(q) ||
+                    (wo.vendor_name || '').toLowerCase().includes(q) ||
+                    matchItems;
+            });
+
+            const pageSize = rentalPagination.wo.pageSize;
+            const totalPages = Math.ceil(filtered.length / pageSize) || 1;
+            rentalPagination.wo.page = Math.min(Math.max(1, rentalPagination.wo.page), totalPages);
+            const currentPage = rentalPagination.wo.page;
+
+            renderRentalPaginationNav('wo-pagination-info', 'wo-pagination-nav', currentPage, pageSize, totalPages, filtered.length, (p) => {
+                rentalPagination.wo.page = p;
+                renderWOTable();
+            });
+
+            if (filtered.length === 0) {
+                tbody.innerHTML = '<tr><td colspan="9" class="text-center py-4 text-muted">No Work Orders found. Click "Create Work Order File" to add.</td></tr>';
                 return;
             }
 
-            rentalData.workOrders.forEach(wo => {
+            const pageData = filtered.slice((currentPage - 1) * pageSize, currentPage * pageSize);
+            pageData.forEach((wo, idx) => {
+                const sNo = (currentPage - 1) * pageSize + idx + 1;
+                const stats = getWOInwardStats(wo);
+                let inwardBadge = '';
+                if (stats.isFullyCompleted) {
+                    inwardBadge = `<span class="badge-status status-active" title="All Stock Received"><i class="fa-solid fa-circle-check"></i> Stock Full (${stats.totalInwarded}/${stats.totalOrdered})</span>`;
+                } else if (stats.totalInwarded > 0) {
+                    inwardBadge = `<span class="badge-status status-due-soon" title="Partial Inward Stock Received"><i class="fa-solid fa-boxes-packing"></i> Partial (${stats.totalInwarded}/${stats.totalOrdered})</span>`;
+                } else {
+                    inwardBadge = `<span class="badge-status status-overdue" title="No Stock Inwarded Yet"><i class="fa-solid fa-clock"></i> Pending (0/${stats.totalOrdered})</span>`;
+                }
+
+                // Render Asset Category Column (clean View button)
+                let categoryBtnText = wo.items.length === 1
+                    ? `<i class="fa-solid fa-eye me-1"></i> ${wo.items[0].category_name}`
+                    : `<i class="fa-solid fa-layer-group me-1"></i> View (${wo.items.length} Categories)`;
+
+                let categoryHtml = `
+                    <button type="button" class="btn btn-sm btn-outline-primary fw-semibold px-2 py-1 shadow-sm" 
+                        onclick="showWOCategoriesModal('${encodeURIComponent(wo.wo_file_no)}')" 
+                        title="Click to view categories & models breakdown">
+                        ${categoryBtnText}
+                    </button>
+                `;
+
+                // Render Total Quantity Column (only total quantity)
+                let qtyModelHtml = `
+                    <span class="item-breakdown-tag fs-6 fw-bold text-dark">
+                        ${wo.total_units}
+                    </span>
+                `;
+
                 const tr = document.createElement('tr');
                 tr.innerHTML = `
+                    <td>${sNo}</td>
                     <td><strong>${wo.wo_file_no || '-'}</strong></td>
                     <td>${wo.file_subject || '-'}</td>
                     <td>${wo.period_from_date || '-'} to ${wo.period_to_date || '-'}</td>
                     <td><strong>${wo.vendor_name || '-'}</strong></td>
-                    <td><span class="item-breakdown-tag">Qty: ${wo.systems_qty || 0}</span><br><small class="text-muted">${wo.systems_model_name || '-'}</small></td>
-                    <td><span class="item-breakdown-tag">Qty: ${wo.printers_qty || 0}</span><br><small class="text-muted">${wo.printers_model_name || '-'}</small></td>
-                    <td><span class="item-breakdown-tag">Qty: ${wo.laptops_qty || 0}</span><br><small class="text-muted">${wo.laptops_model_name || '-'}</small></td>
-                    <td class="text-center fw-bold text-primary">${wo.total_units || (wo.systems_qty + wo.printers_qty + wo.laptops_qty)}</td>
+                    <td>${categoryHtml}</td>
+                    <td>${qtyModelHtml}</td>
                     <td>
                         ${wo.wo_copy_file ? `<a href="${contextPath}gccrentalmanagementfiles/${wo.wo_copy_file}" target="_blank" class="btn btn-sm btn-outline-primary"><i class="fa-solid fa-file-pdf"></i> View</a>` : '<span class="text-muted">-</span>'}
                     </td>
-                    <td><span class="badge-status status-active">${wo.status || 'Active'}</span></td>
+                    <td>${inwardBadge}</td>
                 `;
                 tbody.appendChild(tr);
             });
         }
 
-        function openNewWOModal() {
-            document.getElementById('woFromDateInput').value = formatDate(TODAY);
-            document.getElementById('woToDateInput').value = formatDate(addDays(TODAY, 180));
+        function showWOCategoriesModal(encodedFileNo) {
+            const fileNo = decodeURIComponent(encodedFileNo || '');
+            const groupedList = getGroupedWorkOrders();
+            const wo = groupedList.find(w => (w.wo_file_no || '').trim() === fileNo.trim());
+            if (!wo) return;
+
+            document.getElementById('modalWOCatFileNo').textContent = wo.wo_file_no || '-';
+            document.getElementById('modalWOCatVendor').textContent = wo.vendor_name || '-';
+            document.getElementById('modalWOCatSubject').textContent = wo.file_subject || '-';
+            document.getElementById('modalWOCatPeriod').textContent = `${wo.period_from_date || '-'} to ${wo.period_to_date || '-'}`;
+            document.getElementById('modalWOCatTotalQty').textContent = `${wo.total_units || 0} Units (${wo.items.length} Categories)`;
+
+            const tbody = document.getElementById('modalWOCategoriesTableBody');
+            if (tbody) {
+                tbody.innerHTML = '';
+                wo.items.forEach((it, idx) => {
+                    const tr = document.createElement('tr');
+                    tr.innerHTML = `
+                        <td class="fw-bold">${idx + 1}</td>
+                        <td><span class="badge bg-primary-subtle text-primary border border-primary-subtle fw-semibold px-2 py-1"><i class="fa-solid fa-tag me-1"></i>${it.category_name}</span></td>
+                        <td class="text-center fw-bold fs-6 text-primary">${it.category_qty}</td>
+                        <td><i class="fa-solid fa-cube text-secondary me-1"></i><strong>${it.category_model_name}</strong></td>
+                    `;
+                    tbody.appendChild(tr);
+                });
+            }
+
+            showModal('woCategoriesModal');
+        }
+
+        async function openNewWOModal() {
+            document.getElementById('newWOForm')?.reset();
+            const fromDate = document.getElementById('woFromDateInput');
+            if (fromDate) fromDate.value = formatDate(TODAY);
+            const toDate = document.getElementById('woToDateInput');
+            if (toDate) toDate.value = formatDate(addDays(TODAY, 180));
             calculateWODuration();
+
+            if (!masterData.categories || masterData.categories.length === 0) {
+                try {
+                    const catRes = await fetch(contextPath + 'gccrentalmanagement/api/categories');
+                    masterData.categories = await catRes.json();
+                } catch (e) {
+                    console.error('Failed fetching categories:', e);
+                }
+            }
+
+            // Reset dynamic rows and add initial row
+            const container = document.getElementById('woCategoryRowsContainer');
+            if (container) {
+                container.innerHTML = '';
+                addWOCategoryRow();
+            }
             showModal('newWOModal');
         }
 
+        function addWOCategoryRow(cid = '', qty = 1, model = '') {
+            const container = document.getElementById('woCategoryRowsContainer');
+            if (!container) return;
+
+            let catOptionsHtml = '<option value="">-- Select Category --</option>';
+            if (masterData.categories && masterData.categories.length > 0) {
+                masterData.categories.forEach(c => {
+                    const catId = c.id != null ? c.id : c.cid;
+                    const catName = c.category_type || c.category_name || c.name || ('Category #' + catId);
+                    const selected = (cid && (catId == cid || catName == cid)) ? 'selected' : '';
+                    catOptionsHtml += `<option value="${catId}" ${selected}>${catName}</option>`;
+                });
+            }
+
+            const rowDiv = document.createElement('div');
+            rowDiv.className = 'row g-2 align-items-end mb-2 wo-category-row border p-2 rounded-3 bg-light';
+            rowDiv.innerHTML = `
+                <div class="col-md-4">
+                    <label class="form-label form-label-sm mb-1 fw-bold text-secondary" style="font-size: 0.78rem;">Asset Category * (From Master)</label>
+                    <select class="form-select form-select-sm wo-cat-select" required>
+                        ${catOptionsHtml}
+                    </select>
+                </div>
+                <div class="col-md-2">
+                    <label class="form-label form-label-sm mb-1 fw-bold text-secondary" style="font-size: 0.78rem;">Quantity *</label>
+                    <input type="number" class="form-control form-control-sm wo-cat-qty" min="1" value="${qty || 1}" required placeholder="Qty">
+                </div>
+                <div class="col-md-5">
+                    <label class="form-label form-label-sm mb-1 fw-bold text-secondary" style="font-size: 0.78rem;">Model Name / Specifications *</label>
+                    <input type="text" class="form-control form-control-sm wo-cat-model" value="${model || ''}" required placeholder="e.g. Dell OptiPlex 3080 / Core i5 / 16GB RAM">
+                </div>
+                <div class="col-md-1 d-flex justify-content-center">
+                    <button type="button" class="btn btn-sm btn-outline-danger w-100" onclick="removeWOCategoryRow(this)" title="Remove this item">
+                        <i class="fa-solid fa-trash-can"></i>
+                    </button>
+                </div>
+            `;
+            container.appendChild(rowDiv);
+        }
+
+        function removeWOCategoryRow(btn) {
+            const container = document.getElementById('woCategoryRowsContainer');
+            const rows = container?.querySelectorAll('.wo-category-row');
+            if (rows && rows.length <= 1) {
+                showToast('At least one asset category item is required for the Work Order.', true);
+                return;
+            }
+            btn.closest('.wo-category-row')?.remove();
+        }
+
         function calculateWODuration() {
-            const from = document.getElementById('woFromDateInput').value;
-            const to = document.getElementById('woToDateInput').value;
+            const from = document.getElementById('woFromDateInput')?.value;
+            const to = document.getElementById('woToDateInput')?.value;
             if (from && to) {
                 const diffDays = Math.ceil((new Date(to) - new Date(from)) / (1000 * 60 * 60 * 24));
                 const diffMonths = Math.round(diffDays / 30);
-                document.getElementById('woCalculatedTenure').textContent = `${diffDays} Days (~${diffMonths} Months)`;
+                const tenureEl = document.getElementById('woCalculatedTenure');
+                if (tenureEl) tenureEl.textContent = `${diffDays} Days (~${diffMonths} Months)`;
             }
         }
 
         async function handleSaveWO(event) {
             event.preventDefault();
-            const formData = new FormData();
-            formData.append('woFileNo', document.getElementById('woFileNoInput').value.trim());
-            formData.append('fileSubject', document.getElementById('woSubjectInput').value.trim());
-            formData.append('periodFromDate', document.getElementById('woFromDateInput').value);
-            formData.append('periodToDate', document.getElementById('woToDateInput').value);
-            formData.append('vendorName', document.getElementById('woVendorInput').value);
-            formData.append('systemsQty', document.getElementById('woSystemsQtyInput').value);
-            formData.append('systemsModel', document.getElementById('woSystemsModelInput').value.trim());
-            formData.append('printersQty', document.getElementById('woPrintersQtyInput').value);
-            formData.append('printersModel', document.getElementById('woPrintersModelInput').value.trim());
-            formData.append('laptopsQty', document.getElementById('woLaptopsQtyInput').value);
-            formData.append('laptopsModel', document.getElementById('woLaptopsModelInput').value.trim());
-            formData.append('remarks', document.getElementById('woRemarksInput').value.trim());
+
+            const rows = document.querySelectorAll('.wo-category-row');
+            if (rows.length === 0) {
+                showToast('Please add at least one asset category.', true);
+                return;
+            }
 
             const fileInput = document.getElementById('woCopyFileInput');
-            if (fileInput.files.length > 0) {
-                formData.append('woCopyFile', fileInput.files[0]);
+            if (!fileInput || !fileInput.files || fileInput.files.length === 0) {
+                showToast('Upload Work Order Copy (PDF / Doc) is mandatory.', true);
+                fileInput?.focus();
+                return;
+            }
+
+            const formData = new FormData();
+            formData.append('woFileNo', document.getElementById('woFileNoInput')?.value?.trim() || '');
+            formData.append('fileSubject', document.getElementById('woSubjectInput')?.value?.trim() || '');
+            formData.append('periodFromDate', document.getElementById('woFromDateInput')?.value || '');
+            formData.append('periodToDate', document.getElementById('woToDateInput')?.value || '');
+            formData.append('vendorName', document.getElementById('woVendorInput')?.value?.trim() || '');
+            formData.append('remarks', document.getElementById('woRemarksInput')?.value?.trim() || '');
+            formData.append('woCopyFile', fileInput.files[0]);
+
+            for (let row of rows) {
+                const cid = row.querySelector('.wo-cat-select')?.value;
+                const qty = parseInt(row.querySelector('.wo-cat-qty')?.value) || 0;
+                const model = row.querySelector('.wo-cat-model')?.value?.trim() || '';
+
+                if (!cid) {
+                    showToast('Please select an Asset Category from the master list for all items.', true);
+                    row.querySelector('.wo-cat-select')?.focus();
+                    return;
+                }
+
+                if (qty <= 0) {
+                    showToast('Category Quantity must be greater than 0 for all items.', true);
+                    row.querySelector('.wo-cat-qty')?.focus();
+                    return;
+                }
+
+                if (!model) {
+                    showToast('Model Name / Specifications is mandatory for all items.', true);
+                    row.querySelector('.wo-cat-model')?.focus();
+                    return;
+                }
+
+                formData.append('cid', cid);
+                formData.append('categoryQty', qty);
+                formData.append('categoryModelName', model);
             }
 
             try {
@@ -2361,7 +3156,7 @@
                 if (res.success) {
                     showToast(res.message);
                     hideModal('newWOModal');
-                    document.getElementById('newWOForm').reset();
+                    document.getElementById('newWOForm')?.reset();
                     await loadAllRentalData();
                 } else {
                     showToast(res.error || 'Failed to save Work Order', true);
@@ -2374,77 +3169,317 @@
         // ==========================================
         // 2. USER REQUEST RENDERING & ACTIONS
         // ==========================================
+        function getGroupedRequests() {
+            const rawList = rentalData.requests || [];
+            const groups = new Map();
+
+            rawList.forEach(item => {
+                const key = (item.tapal_no || '').trim() || ('ID_' + item.id);
+                if (!groups.has(key)) {
+                    groups.set(key, {
+                        id: item.id,
+                        tapal_no: item.tapal_no,
+                        tapal_date: item.tapal_date,
+                        department_id: item.department_id,
+                        dept_name: item.dept_name,
+                        zone_id: item.zone_id,
+                        zone_name: item.zone_name,
+                        required_from_date: item.required_from_date,
+                        required_to_date: item.required_to_date,
+                        calculated_days: item.calculated_days,
+                        mail_copy_file: item.mail_copy_file,
+                        req_status_id: item.req_status_id,
+                        status_name: item.status_name,
+                        badge_color: item.badge_color,
+                        requesting_officer: item.requesting_officer,
+                        contact_no: item.contact_no,
+                        purpose: item.purpose,
+                        created_by: item.created_by,
+                        created_at: item.created_at,
+                        items: [],
+                        total_units: 0,
+                        allIds: []
+                    });
+                }
+                const grp = groups.get(key);
+                const qty = parseInt(item.category_qty) || parseInt(item.total_req_qty) || 0;
+                grp.total_units += qty;
+                grp.allIds.push(item.id);
+                grp.items.push({
+                    id: item.id,
+                    cid: item.cid,
+                    category_name: item.category_name || item.category_type || 'General',
+                    category_qty: qty,
+                    category_model_name: item.category_model_name || '-'
+                });
+            });
+
+            return Array.from(groups.values());
+        }
+
         function renderRequestsTable() {
             const tbody = document.getElementById('reqTableBody');
+            if (!tbody) return;
             tbody.innerHTML = '';
 
-            if (rentalData.requests.length === 0) {
-                tbody.innerHTML = '<tr><td colspan="11" class="text-center py-4 text-muted">No Department Requests recorded yet. Click "Create Request" to add.</td></tr>';
+            const groupedData = getGroupedRequests();
+            const q = rentalPagination.req.search || '';
+            const filtered = groupedData.filter(req => {
+                if (!q) return true;
+                const matchItems = (req.items || []).some(it =>
+                    (it.category_name || '').toLowerCase().includes(q) ||
+                    (it.category_model_name || '').toLowerCase().includes(q)
+                );
+                return (req.tapal_no || '').toLowerCase().includes(q) ||
+                    (req.dept_name || '').toLowerCase().includes(q) ||
+                    (req.zone_name || '').toLowerCase().includes(q) ||
+                    (req.requesting_officer || '').toLowerCase().includes(q) ||
+                    (req.contact_no || '').toLowerCase().includes(q) ||
+                    (req.status_name || '').toLowerCase().includes(q) ||
+                    matchItems;
+            });
+
+            const pageSize = rentalPagination.req.pageSize;
+            const totalPages = Math.ceil(filtered.length / pageSize) || 1;
+            rentalPagination.req.page = Math.min(Math.max(1, rentalPagination.req.page), totalPages);
+            const currentPage = rentalPagination.req.page;
+
+            renderRentalPaginationNav('req-pagination-info', 'req-pagination-nav', currentPage, pageSize, totalPages, filtered.length, (p) => {
+                rentalPagination.req.page = p;
+                renderRequestsTable();
+            });
+
+            if (filtered.length === 0) {
+                tbody.innerHTML = '<tr><td colspan="13" class="text-center py-4 text-muted">No Department Requests found. Click "Create Request" to add.</td></tr>';
                 return;
             }
 
-            rentalData.requests.forEach(req => {
+            const pageData = filtered.slice((currentPage - 1) * pageSize, currentPage * pageSize);
+            pageData.forEach((req, idx) => {
+                const sNo = (currentPage - 1) * pageSize + idx + 1;
+
+                // Render Asset Category Column (clean View button)
+                let categoryBtnText = req.items.length === 1
+                    ? `<i class="fa-solid fa-eye me-1"></i> ${escapeHtml(req.items[0].category_name)}`
+                    : `<i class="fa-solid fa-layer-group me-1"></i> View (${req.items.length} Categories)`;
+
+                let categoryHtml = `
+                    <button type="button" class="btn btn-sm btn-outline-info fw-semibold px-2 py-1 shadow-sm" 
+                        onclick="showReqCategoriesModal('${encodeURIComponent(req.tapal_no)}')" 
+                        title="Click to view categories & models breakdown">
+                        ${categoryBtnText}
+                    </button>
+                `;
+
+                // Render Total Quantity Column
+                let qtyModelHtml = `
+                    <span class="item-breakdown-tag fs-6 fw-bold text-dark">
+                        ${req.total_units}
+                    </span>
+                `;
+
                 const tr = document.createElement('tr');
                 tr.innerHTML = `
-                    <td><strong>${req.tapal_no || '-'}</strong><br><small class="text-muted">${req.tapal_date || '-'}</small></td>
-                    <td><strong>${req.dept_name || 'Dept #' + req.department_id}</strong><br><small class="text-muted">${req.zone_name || '-'}</small></td>
-                    <td>${req.requesting_officer || '-'}<br><small class="text-muted">${req.contact_no || ''}</small></td>
-                    <td class="text-center fw-bold">${req.req_systems_qty || 0}</td>
-                    <td class="text-center fw-bold">${req.req_printers_qty || 0}</td>
-                    <td class="text-center fw-bold">${req.req_laptops_qty || 0}</td>
-                    <td>${req.required_from_date || '-'} to ${req.required_to_date || '-'}</td>
-                    <td class="text-center fw-bold text-success">${req.calculated_days || 0} Days</td>
-                    <td>
+                    <td class="text-center font-monospace">${sNo}</td>
+                    <td><strong>${escapeHtml(req.tapal_no || '-')}</strong></td>
+                    <td><small class="text-muted">${formatTimestamp(req.tapal_date) || '-'}</small></td>
+                    <td><strong>${escapeHtml(req.dept_name || (req.department_id ? 'Dept #' + req.department_id : '-'))}</strong></td>
+                    <td><span class="badge bg-light text-dark border font-monospace">${escapeHtml(req.zone_name || '-')}</span></td>
+                    <td>${escapeHtml(req.requesting_officer || '-')}${req.contact_no ? `<br><small class="text-muted">${escapeHtml(req.contact_no)}</small>` : ''}</td>
+                    <td>${categoryHtml}</td>
+                    <td class="text-center">${qtyModelHtml}</td>
+                    <td class="font-monospace text-nowrap">${formatDateDMY(req.required_from_date)} to ${formatDateDMY(req.required_to_date)}</td>
+                    <td class="text-center fw-bold text-success font-monospace">${req.calculated_days || 0} Days</td>
+                    <td class="text-center text-muted"><small>${formatTimestamp(req.created_at) || '-'}</small></td>
+                    <td class="text-center">
                         ${req.mail_copy_file ? `<a href="${contextPath}gccrentalmanagementfiles/${req.mail_copy_file}" target="_blank" class="btn btn-sm btn-outline-info"><i class="fa-solid fa-file-pdf"></i> View</a>` : '<span class="text-muted">-</span>'}
                     </td>
-                    <td><span class="badge-status status-${req.badge_color || 'warning'}">${req.status_name || 'Pending'}</span></td>
-                    <td>
-                        <button class="btn btn-sm btn-outline-primary" onclick="openIssueAssetForRequest(${req.id})" title="Issue Asset">
-                            <i class="fa-solid fa-hand-holding-box me-1"></i> Issue
-                        </button>
-                    </td>
+                    <td><span class="badge-status status-${req.badge_color || 'warning'}">${escapeHtml(req.status_name || 'Pending')}</span></td>
                 `;
                 tbody.appendChild(tr);
             });
         }
 
-        function openNewRequestModal() {
-            document.getElementById('reqTapalDateInput').value = formatDate(TODAY);
-            document.getElementById('reqFromDateInput').value = formatDate(TODAY);
-            document.getElementById('reqToDateInput').value = formatDate(addDays(TODAY, 30));
+        function showReqCategoriesModal(encodedTapalNo) {
+            const tapalNo = decodeURIComponent(encodedTapalNo || '');
+            const groupedList = getGroupedRequests();
+            const req = groupedList.find(r => (r.tapal_no || '').trim() === tapalNo.trim());
+            if (!req) return;
+
+            document.getElementById('modalReqCatTapalNo').textContent = req.tapal_no || '-';
+            document.getElementById('modalReqCatDeptZone').textContent = `${req.dept_name || 'Dept'} (${req.zone_name || 'HQ'})`;
+            document.getElementById('modalReqCatOfficer').textContent = `${req.requesting_officer || '-'} ${req.contact_no ? '(' + req.contact_no + ')' : ''}`;
+            document.getElementById('modalReqCatPeriod').textContent = `${formatDateDMY(req.required_from_date)} to ${formatDateDMY(req.required_to_date)} (${req.calculated_days || 0} Days)`;
+            document.getElementById('modalReqCatTotalQty').textContent = `${req.total_units || 0} Units (${req.items.length} Categories)`;
+            const statusEl = document.getElementById('modalReqCatStatus');
+            if (statusEl) {
+                statusEl.textContent = req.status_name || 'Pending';
+                statusEl.className = `badge bg-${req.badge_color || 'warning'} text-dark`;
+            }
+
+            const tbody = document.getElementById('modalReqCategoriesTableBody');
+            if (tbody) {
+                tbody.innerHTML = '';
+                req.items.forEach((it, idx) => {
+                    const tr = document.createElement('tr');
+                    tr.innerHTML = `
+                        <td class="fw-bold">${idx + 1}</td>
+                        <td><span class="badge bg-info-subtle text-info border border-info-subtle fw-semibold px-2 py-1"><i class="fa-solid fa-tag me-1"></i>${it.category_name}</span></td>
+                        <td class="text-center fw-bold fs-6 text-primary">${it.category_qty}</td>
+                        <td><i class="fa-solid fa-cube text-secondary me-1"></i><strong>${it.category_model_name}</strong></td>
+                    `;
+                    tbody.appendChild(tr);
+                });
+            }
+
+            showModal('reqCategoriesModal');
+        }
+
+        async function openNewRequestModal() {
+            document.getElementById('newRequestForm')?.reset();
+            const tapalDate = document.getElementById('reqTapalDateInput');
+            if (tapalDate) tapalDate.value = formatDate(TODAY);
+            const fromDate = document.getElementById('reqFromDateInput');
+            if (fromDate) fromDate.value = formatDate(TODAY);
+            const toDate = document.getElementById('reqToDateInput');
+            if (toDate) toDate.value = formatDate(addDays(TODAY, 30));
             calculateRequestDuration();
+
+            if (!masterData.categories || masterData.categories.length === 0) {
+                try {
+                    const catRes = await fetch(contextPath + 'gccrentalmanagement/api/categories');
+                    masterData.categories = await catRes.json();
+                    populateMasterDropdowns();
+                } catch (e) {
+                    console.error('Failed fetching categories:', e);
+                }
+            }
+
+            // Reset dynamic rows and add initial row
+            const container = document.getElementById('reqCategoryRowsContainer');
+            if (container) {
+                container.innerHTML = '';
+                addReqCategoryRow();
+            }
+
             showModal('newRequestModal');
         }
 
+        function addReqCategoryRow(cid = '', qty = 1, model = '') {
+            const container = document.getElementById('reqCategoryRowsContainer');
+            if (!container) return;
+
+            let catOptionsHtml = '<option value="">-- Select Category --</option>';
+            if (masterData.categories && masterData.categories.length > 0) {
+                masterData.categories.forEach(c => {
+                    const catId = c.id != null ? c.id : c.cid;
+                    const catName = c.category_type || c.category_name || c.name || ('Category #' + catId);
+                    const selected = (cid && (catId == cid || catName == cid)) ? 'selected' : '';
+                    catOptionsHtml += `<option value="${catId}" ${selected}>${catName}</option>`;
+                });
+            }
+
+            const rowDiv = document.createElement('div');
+            rowDiv.className = 'row g-2 align-items-end mb-2 req-category-row border p-2 rounded-3 bg-light';
+            rowDiv.innerHTML = `
+                <div class="col-md-4">
+                    <label class="form-label form-label-sm mb-1 fw-bold text-secondary" style="font-size: 0.78rem;">Asset Category * (From Master)</label>
+                    <select class="form-select form-select-sm req-cat-select" required>
+                        ${catOptionsHtml}
+                    </select>
+                </div>
+                <div class="col-md-2">
+                    <label class="form-label form-label-sm mb-1 fw-bold text-secondary" style="font-size: 0.78rem;">Quantity *</label>
+                    <input type="number" class="form-control form-control-sm req-cat-qty" min="1" value="${qty || 1}" required placeholder="Qty">
+                </div>
+                <div class="col-md-5">
+                    <label class="form-label form-label-sm mb-1 fw-bold text-secondary" style="font-size: 0.78rem;">Model Name / Specifications *</label>
+                    <input type="text" class="form-control form-control-sm req-cat-model" value="${model || ''}" required placeholder="e.g. HP LaserJet Pro MFP 4104dw Heavy Duty">
+                </div>
+                <div class="col-md-1 d-flex justify-content-center">
+                    <button type="button" class="btn btn-sm btn-outline-danger w-100" onclick="removeReqCategoryRow(this)" title="Remove this item">
+                        <i class="fa-solid fa-trash-can"></i>
+                    </button>
+                </div>
+            `;
+            container.appendChild(rowDiv);
+        }
+
+        function removeReqCategoryRow(btn) {
+            const container = document.getElementById('reqCategoryRowsContainer');
+            const rows = container?.querySelectorAll('.req-category-row');
+            if (rows && rows.length <= 1) {
+                showToast('At least one requested asset category item is required.', true);
+                return;
+            }
+            btn.closest('.req-category-row')?.remove();
+        }
+
         function calculateRequestDuration() {
-            const from = document.getElementById('reqFromDateInput').value;
-            const to = document.getElementById('reqToDateInput').value;
+            const from = document.getElementById('reqFromDateInput')?.value;
+            const to = document.getElementById('reqToDateInput')?.value;
             if (from && to) {
                 const diff = Math.ceil((new Date(to) - new Date(from)) / (1000 * 60 * 60 * 24)) + 1;
-                document.getElementById('reqDurationDaysText').textContent = `${diff} Days`;
+                const durationEl = document.getElementById('reqDurationDaysText');
+                if (durationEl) durationEl.textContent = `${diff} Days`;
             }
         }
 
         async function handleSaveRequest(event) {
             event.preventDefault();
-            const formData = new FormData();
-            formData.append('tapalNo', document.getElementById('reqTapalNoInput').value.trim());
-            formData.append('tapalDate', document.getElementById('reqTapalDateInput').value);
-            formData.append('deptId', document.getElementById('reqDeptInput').value);
-            formData.append('zoneId', document.getElementById('reqZoneInput').value);
-            formData.append('reqSystemsQty', document.getElementById('reqSystemsQtyInput').value);
-            formData.append('reqPrintersQty', document.getElementById('reqPrintersQtyInput').value);
-            formData.append('reqLaptopsQty', document.getElementById('reqLaptopsQtyInput').value);
-            formData.append('requiredFromDate', document.getElementById('reqFromDateInput').value);
-            formData.append('requiredToDate', document.getElementById('reqToDateInput').value);
-            formData.append('reqStatusId', document.getElementById('reqStatusInput').value);
-            formData.append('requestingOfficer', document.getElementById('reqOfficerInput').value.trim());
-            formData.append('contactNo', document.getElementById('reqContactInput').value.trim());
-            formData.append('purpose', document.getElementById('reqPurposeInput').value.trim());
+
+            const rows = document.querySelectorAll('.req-category-row');
+            if (rows.length === 0) {
+                showToast('Please add at least one requested asset category.', true);
+                return;
+            }
 
             const fileInput = document.getElementById('reqMailCopyFileInput');
-            if (fileInput.files.length > 0) {
-                formData.append('mailCopyFile', fileInput.files[0]);
+            if (!fileInput || !fileInput.files || fileInput.files.length === 0) {
+                showToast('Please upload the Mail Copy (PDF / Scan).', true);
+                fileInput?.focus();
+                return;
+            }
+
+            const formData = new FormData();
+            formData.append('tapalNo', document.getElementById('reqTapalNoInput')?.value?.trim() || '');
+            formData.append('tapalDate', document.getElementById('reqTapalDateInput')?.value || '');
+            formData.append('deptId', document.getElementById('reqDeptInput')?.value || '');
+            formData.append('zoneId', document.getElementById('reqZoneInput')?.value || '');
+            formData.append('requiredFromDate', document.getElementById('reqFromDateInput')?.value || '');
+            formData.append('requiredToDate', document.getElementById('reqToDateInput')?.value || '');
+            formData.append('reqStatusId', document.getElementById('reqStatusInput')?.value || '');
+            formData.append('requestingOfficer', document.getElementById('reqOfficerInput')?.value?.trim() || '');
+            formData.append('contactNo', document.getElementById('reqContactInput')?.value?.trim() || '');
+            formData.append('purpose', document.getElementById('reqPurposeInput')?.value?.trim() || '');
+            formData.append('mailCopyFile', fileInput.files[0]);
+
+            for (let row of rows) {
+                const cid = row.querySelector('.req-cat-select')?.value;
+                const qty = parseInt(row.querySelector('.req-cat-qty')?.value) || 0;
+                const model = row.querySelector('.req-cat-model')?.value?.trim() || '';
+
+                if (!cid) {
+                    showToast('Please select an Asset Category from the master list for all items.', true);
+                    row.querySelector('.req-cat-select')?.focus();
+                    return;
+                }
+
+                if (qty <= 0) {
+                    showToast('Category Quantity must be greater than 0 for all items.', true);
+                    row.querySelector('.req-cat-qty')?.focus();
+                    return;
+                }
+
+                if (!model) {
+                    showToast('Model Name / Specifications is mandatory for all items.', true);
+                    row.querySelector('.req-cat-model')?.focus();
+                    return;
+                }
+
+                formData.append('cid', cid);
+                formData.append('categoryQty', qty);
+                formData.append('categoryModelName', model);
             }
 
             try {
@@ -2457,7 +3492,7 @@
                 if (res.success) {
                     showToast(res.message);
                     hideModal('newRequestModal');
-                    document.getElementById('newRequestForm').reset();
+                    document.getElementById('newRequestForm')?.reset();
                     await loadAllRentalData();
                 } else {
                     showToast(res.error || 'Failed to save Request', true);
@@ -2470,66 +3505,535 @@
         // ==========================================
         // 3. INWARD DELIVERY CHALLAN RENDERING & ACTIONS
         // ==========================================
+        function getGroupedChallans() {
+            const rawList = rentalData.challans || [];
+            const groups = new Map();
+
+            rawList.forEach(item => {
+                const matchedWO = (rentalData.workOrders || []).find(w => w.id == item.wo_id || (w.allIds && w.allIds.includes(parseInt(item.wo_id))));
+                const woKey = (item.wo_file_no || matchedWO?.wo_file_no || '').trim() || ('WO_' + item.wo_id);
+
+                if (!groups.has(woKey)) {
+                    groups.set(woKey, {
+                        key: woKey,
+                        wo_id: item.wo_id,
+                        wo_file_no: item.wo_file_no || matchedWO?.wo_file_no || (item.wo_id ? 'WO #' + item.wo_id : '-'),
+                        vendor_name: item.vendor_name || matchedWO?.vendor_name || '-',
+                        file_subject: item.file_subject || matchedWO?.file_subject || '',
+                        inward_systems_qty: 0,
+                        inward_printers_qty: 0,
+                        inward_laptops_qty: 0,
+                        inward_ups_qty: 0,
+                        inward_dongle_qty: 0,
+                        total_inward_qty: 0,
+                        latest_dc_date: item.dc_date,
+                        received_by: item.received_by || '-',
+                        dc_entries: []
+                    });
+                }
+
+                const grp = groups.get(woKey);
+                const sys = parseInt(item.inward_systems_qty) || 0;
+                const prt = parseInt(item.inward_printers_qty) || 0;
+                const ltp = parseInt(item.inward_laptops_qty) || 0;
+                const ups = parseInt(item.inward_ups_qty) || 0;
+                const dng = parseInt(item.inward_dongle_qty) || 0;
+                const tot = item.total_inward_qty != null ? parseInt(item.total_inward_qty) : (sys + prt + ltp + ups + dng);
+
+                grp.inward_systems_qty += sys;
+                grp.inward_printers_qty += prt;
+                grp.inward_laptops_qty += ltp;
+                grp.inward_ups_qty += ups;
+                grp.inward_dongle_qty += dng;
+                grp.total_inward_qty += tot;
+
+                if (item.dc_date && (!grp.latest_dc_date || new Date(item.dc_date) > new Date(grp.latest_dc_date))) {
+                    grp.latest_dc_date = item.dc_date;
+                }
+                if (item.received_by && grp.received_by === '-') {
+                    grp.received_by = item.received_by;
+                }
+
+                grp.dc_entries.push({
+                    id: item.id,
+                    dc_no: item.dc_no,
+                    dc_date: item.dc_date,
+                    dc_file_path: item.dc_file_path,
+                    inward_systems_qty: sys,
+                    inward_printers_qty: prt,
+                    inward_laptops_qty: ltp,
+                    inward_ups_qty: ups,
+                    inward_dongle_qty: dng,
+                    total_inward_qty: tot,
+                    received_by: item.received_by || '-',
+                    remarks: item.remarks || '',
+                    created_at: item.created_at
+                });
+            });
+
+            return Array.from(groups.values());
+        }
+
+        function toggleInwardDcDropdown(expandId) {
+            const row = document.getElementById('inward-dc-expand-' + expandId);
+            const chevron = document.getElementById('chevron-' + expandId);
+            if (!row) return;
+            if (row.style.display === 'none' || !row.style.display) {
+                row.style.display = 'table-row';
+                if (chevron) {
+                    chevron.classList.remove('fa-chevron-down');
+                    chevron.classList.add('fa-chevron-up');
+                }
+            } else {
+                row.style.display = 'none';
+                if (chevron) {
+                    chevron.classList.remove('fa-chevron-up');
+                    chevron.classList.add('fa-chevron-down');
+                }
+            }
+        }
+
         function renderChallansTable() {
             const tbody = document.getElementById('dcTableBody');
+            if (!tbody) return;
             tbody.innerHTML = '';
 
-            if (rentalData.challans.length === 0) {
-                tbody.innerHTML = '<tr><td colspan="10" class="text-center py-4 text-muted">No Inward Delivery Challans uploaded yet.</td></tr>';
+            const groupedList = getGroupedChallans();
+            const q = rentalPagination.dc.search || '';
+            const filtered = groupedList.filter(grp => {
+                if (!q) return true;
+                const matchDc = grp.dc_entries.some(d => (d.dc_no || '').toLowerCase().includes(q));
+                return (grp.wo_file_no || '').toLowerCase().includes(q) ||
+                    (grp.vendor_name || '').toLowerCase().includes(q) ||
+                    (grp.received_by || '').toLowerCase().includes(q) ||
+                    matchDc;
+            });
+
+            const pageSize = rentalPagination.dc.pageSize;
+            const totalPages = Math.ceil(filtered.length / pageSize) || 1;
+            rentalPagination.dc.page = Math.min(Math.max(1, rentalPagination.dc.page), totalPages);
+            const currentPage = rentalPagination.dc.page;
+
+            renderRentalPaginationNav('dc-pagination-info', 'dc-pagination-nav', currentPage, pageSize, totalPages, filtered.length, (p) => {
+                rentalPagination.dc.page = p;
+                renderChallansTable();
+            });
+
+            if (filtered.length === 0) {
+                tbody.innerHTML = '<tr><td colspan="13" class="text-center py-4 text-muted">No Inward Delivery Challans found.</td></tr>';
                 return;
             }
 
-            rentalData.challans.forEach(dc => {
+            const pageData = filtered.slice((currentPage - 1) * pageSize, currentPage * pageSize);
+            pageData.forEach((grp, idx) => {
+                const sNo = (currentPage - 1) * pageSize + idx + 1;
+                const expandId = 'dc_' + sNo;
+                const numDcs = grp.dc_entries.length;
+
+                // Multiple DC dropdown toggle button under Work Order Ref
+                let dcBadgeHtml = '';
+                if (numDcs > 1) {
+                    dcBadgeHtml = `
+                        <div class="mt-1">
+                            <button type="button" class="btn btn-sm btn-outline-primary py-0 px-2 fw-semibold" style="font-size: 11px; border-radius: 6px;" 
+                                onclick="toggleInwardDcDropdown('${expandId}'); return false;" 
+                                title="Click to view all ${numDcs} Delivery Challans">
+                                <i class="fa-solid fa-layer-group me-1"></i>${numDcs} Delivery Challans <i class="fa-solid fa-chevron-down ms-1" id="chevron-${expandId}"></i>
+                            </button>
+                        </div>
+                    `;
+                }
+
+                // DC Number(s) formatting (Clickable to open uploaded DC copy!)
+                let dcNoHtml = '';
+                if (numDcs === 1) {
+                    const firstDc = grp.dc_entries[0];
+                    if (firstDc.dc_file_path) {
+                        dcNoHtml = `
+                            <a href="${contextPath}gccrentalmanagementfiles/${firstDc.dc_file_path}" target="_blank" 
+                               class="fw-bold text-primary text-decoration-none font-monospace d-inline-flex align-items-center" 
+                               title="Click to view uploaded Delivery Challan copy">
+                                <i class="fa-solid fa-file-pdf text-danger me-1"></i>${escapeHtml(firstDc.dc_no || '-')}
+                            </a>
+                        `;
+                    } else {
+                        dcNoHtml = `<strong class="text-dark font-monospace">${escapeHtml(firstDc.dc_no || '-')}</strong>`;
+                    }
+                } else {
+                    // List all DC numbers as clickable links
+                    dcNoHtml = grp.dc_entries.map(d => {
+                        if (d.dc_file_path) {
+                            return `<a href="${contextPath}gccrentalmanagementfiles/${d.dc_file_path}" target="_blank" 
+                                       class="badge bg-light text-primary border text-decoration-none font-monospace me-1 mb-1 d-inline-flex align-items-center" 
+                                       title="Click to view uploaded copy of DC ${escapeHtml(d.dc_no)}">
+                                       <i class="fa-solid fa-file-pdf text-danger me-1"></i>${escapeHtml(d.dc_no)}
+                                    </a>`;
+                        } else {
+                            return `<span class="badge bg-light text-dark border font-monospace me-1 mb-1">${escapeHtml(d.dc_no)}</span>`;
+                        }
+                    }).join(' ');
+                }
+
+                // Document column
+                let docColHtml = '-';
+                if (numDcs === 1) {
+                    const firstDc = grp.dc_entries[0];
+                    docColHtml = firstDc.dc_file_path
+                        ? `<a href="${contextPath}gccrentalmanagementfiles/${firstDc.dc_file_path}" target="_blank" class="btn btn-sm btn-outline-danger"><i class="fa-solid fa-file-pdf"></i> View DC</a>`
+                        : '<span class="text-muted">-</span>';
+                } else {
+                    docColHtml = `
+                        <button type="button" class="btn btn-sm btn-outline-primary py-1 px-2 fw-semibold" style="font-size: 11px;" 
+                            onclick="toggleInwardDcDropdown('${expandId}'); return false;" 
+                            title="View all ${numDcs} Delivery Challan copies">
+                            <i class="fa-solid fa-list-check me-1"></i>${numDcs} DC Copies
+                        </button>
+                    `;
+                }
+
                 const tr = document.createElement('tr');
                 tr.innerHTML = `
-                    <td><strong>${dc.dc_no || '-'}</strong><br><small class="text-muted">${dc.dc_date || '-'}</small></td>
-                    <td><strong>${dc.wo_file_no || 'WO #' + dc.wo_id}</strong></td>
-                    <td>${dc.vendor_name || '-'}</td>
-                    <td class="text-center fw-bold">${dc.inward_systems_qty || 0}</td>
-                    <td class="text-center fw-bold">${dc.inward_printers_qty || 0}</td>
-                    <td class="text-center fw-bold">${dc.inward_laptops_qty || 0}</td>
-                    <td class="text-center fw-bold text-success">${dc.total_inward_qty || (dc.inward_systems_qty + dc.inward_printers_qty + dc.inward_laptops_qty)}</td>
-                    <td>${dc.vehicle_no || '-'}</td>
-                    <td>
-                        ${dc.dc_file_path ? `<a href="${contextPath}gccrentalmanagementfiles/${dc.dc_file_path}" target="_blank" class="btn btn-sm btn-outline-danger"><i class="fa-solid fa-file-pdf"></i> View DC</a>` : '<span class="text-muted">-</span>'}
-                    </td>
-                    <td>${dc.received_by || '-'}</td>
+                    <td class="text-center font-monospace">${sNo}</td>
+                    <td><strong>${escapeHtml(grp.wo_file_no)}</strong>${dcBadgeHtml}</td>
+                    <td>${escapeHtml(grp.vendor_name)}</td>
+                    <td>${dcNoHtml}</td>
+                    <td class="text-center fw-bold font-monospace">${grp.inward_systems_qty}</td>
+                    <td class="text-center fw-bold font-monospace">${grp.inward_printers_qty}</td>
+                    <td class="text-center fw-bold font-monospace">${grp.inward_laptops_qty}</td>
+                    <td class="text-center fw-bold font-monospace text-info">${grp.inward_ups_qty}</td>
+                    <td class="text-center fw-bold font-monospace text-primary">${grp.inward_dongle_qty}</td>
+                    <td class="text-center fw-bold font-monospace text-success fs-6">${grp.total_inward_qty}</td>
+                    <td class="text-center">${docColHtml}</td>
+                    <td><small class="text-dark fw-semibold">${formatTimestamp(grp.latest_dc_date)}</small></td>
+                    <td>${escapeHtml(grp.received_by)}</td>
                 `;
                 tbody.appendChild(tr);
+
+                // If multiple DCs, append collapsible child row
+                if (numDcs > 1) {
+                    const expandTr = document.createElement('tr');
+                    expandTr.id = 'inward-dc-expand-' + expandId;
+                    expandTr.className = 'inward-expand-row';
+                    expandTr.style.display = 'none';
+                    expandTr.style.background = '#f8fafc';
+
+                    expandTr.innerHTML = `
+                        <td colspan="13" class="p-3 border-bottom">
+                            <div class="p-3 bg-white rounded-3 border shadow-sm">
+                                <div class="d-flex justify-content-between align-items-center mb-3 pb-2 border-bottom flex-wrap gap-2">
+                                    <div class="d-flex align-items-center gap-2">
+                                        <div class="rounded-circle p-2 d-flex align-items-center justify-content-center bg-primary-subtle text-primary" style="width: 32px; height: 32px;">
+                                            <i class="fa-solid fa-boxes-packing"></i>
+                                        </div>
+                                        <div>
+                                            <h6 class="fw-bold m-0 text-primary">
+                                                Delivery Challans Breakdown for Work Order: <span class="font-monospace text-dark">${escapeHtml(grp.wo_file_no)}</span>
+                                            </h6>
+                                            <span class="text-muted small">Vendor: <strong>${escapeHtml(grp.vendor_name)}</strong></span>
+                                        </div>
+                                    </div>
+                                    <span class="badge bg-primary fs-6 px-3 py-2">
+                                        Total Inwarded: ${grp.total_inward_qty} Units across ${numDcs} DCs
+                                    </span>
+                                </div>
+                                <div class="table-responsive">
+                                    <table class="table table-sm table-bordered table-hover align-middle mb-0" style="font-size: 0.88rem;">
+                                        <thead class="table-light">
+                                            <tr>
+                                                <th style="width: 50px;" class="text-center">#</th>
+                                                <th>Delivery Challan No</th>
+                                                <th>DC Date</th>
+                                                <th class="text-center">Systems</th>
+                                                <th class="text-center">Printers</th>
+                                                <th class="text-center">Laptops</th>
+                                                <th class="text-center text-info">UPS</th>
+                                                <th class="text-center text-primary">Dongle</th>
+                                                <th class="text-center text-success">Total Qty</th>
+                                                <th>Received By</th>
+                                                <th class="text-center">DC Copy</th>
+                                                <th>Created At</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            ${grp.dc_entries.map((dc, i) => {
+                        const letter = String.fromCharCode(97 + i);
+                        const dDate = formatTimestamp(dc.dc_date);
+                        const cDate = formatTimestamp(dc.created_at);
+                        let dcNoLink = escapeHtml(dc.dc_no);
+                        let docLink = `<span class="text-muted small">-</span>`;
+                        if (dc.dc_file_path) {
+                            dcNoLink = `
+                                                        <a href="${contextPath}gccrentalmanagementfiles/${dc.dc_file_path}" target="_blank" 
+                                                           class="fw-bold text-primary font-monospace text-decoration-none d-inline-flex align-items-center" 
+                                                           title="Click to view uploaded Delivery Challan copy">
+                                                            <i class="fa-solid fa-file-pdf text-danger me-1"></i>${escapeHtml(dc.dc_no)}
+                                                        </a>
+                                                    `;
+                            docLink = `
+                                                        <a href="${contextPath}gccrentalmanagementfiles/${dc.dc_file_path}" target="_blank" 
+                                                           class="btn btn-sm btn-outline-danger py-0 px-2 fw-semibold" style="font-size: 11px;">
+                                                            <i class="fa-solid fa-file-pdf me-1"></i>View PDF
+                                                        </a>
+                                                    `;
+                        }
+                        return `
+                                                    <tr>
+                                                        <td class="fw-bold text-primary font-monospace text-center">(${letter})</td>
+                                                        <td>${dcNoLink}</td>
+                                                        <td><small class="fw-semibold text-dark">${dDate}</small></td>
+                                                        <td class="text-center font-monospace">${dc.inward_systems_qty}</td>
+                                                        <td class="text-center font-monospace">${dc.inward_printers_qty}</td>
+                                                        <td class="text-center font-monospace">${dc.inward_laptops_qty}</td>
+                                                        <td class="text-center font-monospace text-info">${dc.inward_ups_qty}</td>
+                                                        <td class="text-center font-monospace text-primary">${dc.inward_dongle_qty}</td>
+                                                        <td class="text-center fw-bold text-success font-monospace">${dc.total_inward_qty}</td>
+                                                        <td>${escapeHtml(dc.received_by)}</td>
+                                                        <td class="text-center">${docLink}</td>
+                                                        <td><small class="text-muted">${cDate}</small></td>
+                                                    </tr>
+                                                `;
+                    }).join('')}
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </td>
+                    `;
+                    tbody.appendChild(expandTr);
+                }
             });
         }
 
         function openNewDCModal() {
-            document.getElementById('dcDateInput').value = formatDate(TODAY);
+            const dcForm = document.getElementById('newDCForm');
+            if (dcForm) dcForm.reset();
+            const dcDate = document.getElementById('dcDateInput');
+            if (dcDate) dcDate.value = formatDate(TODAY);
+            populateDCDetailsFromWO('');
             showModal('newDCModal');
         }
 
-        function populateDCVendorFromWO(woId) {
-            const wo = rentalData.workOrders.find(w => w.id == woId);
-            if (wo) {
-                document.getElementById('dcVendorDisplay').value = wo.vendor_name || '';
+        function formatTimestamp(ts) {
+            if (!ts) return '-';
+
+            try {
+                const date = new Date(ts);
+                if (isNaN(date.getTime())) return ts;
+                const dd = String(date.getDate()).padStart(2, '0');
+                const mm = String(date.getMonth() + 1).padStart(2, '0');
+                const yyyy = date.getFullYear();
+                let hh = date.getHours();
+                const min = String(date.getMinutes()).padStart(2, '0');
+                const ampm = hh >= 12 ? 'PM' : 'AM';
+                hh = hh % 12;
+                hh = hh === 0 ? 12 : hh;
+                hh = String(hh).padStart(2, '0');
+                return `${dd}/${mm}/${yyyy} ${hh}:${min} ${ampm}`;
+            } catch (e) {
+                return ts;
             }
         }
 
+        function populateDCDetailsFromWO(woId) {
+            const vendorDisp = document.getElementById('dcVendorDisplay');
+            const statusNotice = document.getElementById('dcWOStatusNotice');
+            const container = document.getElementById('dcCategoryInwardContainer');
+
+            if (!woId) {
+                if (vendorDisp) vendorDisp.value = '';
+                if (statusNotice) {
+                    statusNotice.style.display = 'none';
+                    statusNotice.innerHTML = '';
+                }
+                if (container) {
+                    container.innerHTML = `
+                        <div class="alert alert-light text-center py-3 text-muted border">
+                            <i class="fa-solid fa-arrow-up me-1"></i> Please select a Registered Work Order above to load its asset categories and quota balance.
+                        </div>
+                    `;
+                }
+                return;
+            }
+
+            const groupedWOs = getGroupedWorkOrders();
+            const wo = groupedWOs.find(w => w.id == woId || w.wo_file_no === woId || (w.allIds && w.allIds.includes(parseInt(woId))));
+            if (!wo) {
+                if (vendorDisp) vendorDisp.value = '';
+                if (statusNotice) {
+                    statusNotice.style.display = 'block';
+                    statusNotice.innerHTML = `<div class="alert alert-warning py-2 mb-2"><i class="fa-solid fa-triangle-exclamation me-2"></i> Selected Work Order details not found.</div>`;
+                }
+                return;
+            }
+
+            if (vendorDisp) vendorDisp.value = wo.vendor_name || '';
+
+            const stats = getWOInwardStats(wo);
+
+            // Status Banner with category badges
+            if (statusNotice) {
+                statusNotice.style.display = 'block';
+                if (stats.isFullyCompleted) {
+                    statusNotice.innerHTML = `
+                        <div class="alert alert-success py-2 mb-2 d-flex align-items-center">
+                            <i class="fa-solid fa-circle-check fs-5 me-2 text-success"></i>
+                            <div>
+                                <strong>All Stock Received:</strong> All ${stats.totalOrdered} hardware units for this Work Order have been fully inwarded.
+                            </div>
+                        </div>`;
+                } else {
+                    const catBreakdown = (wo.items || []).map(it => {
+                        const itStat = getItemInwardStats(wo, it);
+                        return `<span class="badge bg-primary-subtle text-primary border border-primary-subtle me-1 mb-1">${it.category_name}: ${itStat.pending} pending / ${itStat.quota}</span>`;
+                    }).join(' ');
+
+                    statusNotice.innerHTML = `
+                        <div class="alert alert-info py-2 mb-2">
+                            <div class="d-flex align-items-center mb-1">
+                                <i class="fa-solid fa-boxes-packing fs-5 me-2 text-primary"></i>
+                                <strong>Work Order Quota Balance:</strong>
+                                <span class="ms-2 fw-bold text-dark">${stats.totalBal} / ${stats.totalOrdered} Units remaining to be inwarded</span>
+                            </div>
+                            <div class="mt-1 d-flex flex-wrap align-items-center">
+                                <small class="text-secondary fw-semibold me-2">Category Quotas:</small>
+                                ${catBreakdown}
+                            </div>
+                        </div>`;
+                }
+            }
+
+            // Render Dynamic Category Rows
+            if (container) {
+                container.innerHTML = '';
+
+                if (!wo.items || wo.items.length === 0) {
+                    container.innerHTML = `
+                        <div class="alert alert-warning text-center py-2">
+                            No asset categories found for this Work Order.
+                        </div>`;
+                    return;
+                }
+
+                wo.items.forEach(it => {
+                    const itStat = getItemInwardStats(wo, it);
+
+                    const rowDiv = document.createElement('div');
+                    rowDiv.className = 'row g-2 align-items-center mb-2 p-2 border rounded-3 bg-light dc-cat-row';
+                    rowDiv.innerHTML = `
+                        <div class="col-md-5">
+                            <label class="form-label form-label-sm mb-1 fw-bold text-secondary" style="font-size:0.78rem;">Asset Category & Model</label>
+                            <div class="input-group input-group-sm">
+                                <span class="input-group-text bg-primary-subtle text-primary fw-bold" style="font-size:0.78rem;"><i class="fa-solid fa-tag me-1"></i>${it.category_name}</span>
+                                <input type="text" class="form-control bg-white" value="${it.category_model_name || '-'}" readonly title="${it.category_model_name}">
+                            </div>
+                        </div>
+                        <div class="col-md-4">
+                            <label class="form-label form-label-sm mb-1 fw-bold text-secondary" style="font-size:0.78rem;">Quota Status</label>
+                            <div class="input-group input-group-sm">
+
+                                <span class="input-group-text bg-white text-secondary" title="Already Inwarded">Recv: ${itStat.received}</span>
+                                <span class="input-group-text bg-white ${itStat.pending === 0 ? 'text-success fw-bold' : 'text-primary fw-bold'}" title="Pending to Inward">
+                                    ${itStat.pending === 0 ? '✓ Full' : 'Pending: ' + itStat.pending}
+                                </span>
+                            </div>
+                        </div>
+                        <div class="col-md-3">
+                            <label class="form-label form-label-sm mb-1 fw-bold text-dark" style="font-size:0.78rem;">Inward Qty *</label>
+                            <input type="number" class="form-control form-control-sm dc-cat-inward-input" 
+                                   min="0" max="${itStat.pending}" value="0" placeholder="0" onfocus="this.select()"
+                                   data-cid="${it.cid}" data-cat-name="${it.category_name}" data-model="${it.category_model_name}"
+                                   data-quota="${itStat.quota}" data-recv="${itStat.received}" data-bal="${itStat.pending}" 
+                                   ${itStat.pending === 0 ? 'disabled' : ''} required>
+                        </div>
+                    `;
+                    container.appendChild(rowDiv);
+                });
+            }
+        }
+
+        function populateDCVendorFromWO(woId) {
+            populateDCDetailsFromWO(woId);
+        }
+
         async function handleSaveDC(event) {
             event.preventDefault();
-            const formData = new FormData();
-            formData.append('woId', document.getElementById('dcWOSelect').value);
-            formData.append('dcNo', document.getElementById('dcNumberInput').value.trim());
-            formData.append('dcDate', document.getElementById('dcDateInput').value);
-            formData.append('vendorName', document.getElementById('dcVendorDisplay').value.trim());
-            formData.append('inSystemsQty', document.getElementById('dcSystemsQtyInput').value);
-            formData.append('inPrintersQty', document.getElementById('dcPrintersQtyInput').value);
-            formData.append('inLaptopsQty', document.getElementById('dcLaptopsQtyInput').value);
-            formData.append('vehicleNo', document.getElementById('dcVehicleInput').value.trim());
-            formData.append('receivedBy', document.getElementById('dcReceivedByInput').value.trim());
-            formData.append('remarks', document.getElementById('dcRemarksInput').value.trim());
+
+            const woId = document.getElementById('dcWOSelect')?.value || '';
+            if (!woId) {
+                showToast('Please select a Registered Work Order.', true);
+                return;
+            }
+
+            const inputs = document.querySelectorAll('.dc-cat-inward-input');
+            if (inputs.length === 0) {
+                showToast('No asset category items found for this Work Order.', true);
+                return;
+            }
+
+            let totalInward = 0;
+            let sysQty = 0;
+            let prtQty = 0;
+            let ltpQty = 0;
+            let upsQty = 0;
+            let dngQty = 0;
+
+            for (let input of inputs) {
+                const qty = parseInt(input.value) || 0;
+                const maxBal = parseInt(input.getAttribute('data-bal')) || 0;
+                const catName = ((input.getAttribute('data-cat-name') || '') + '').toLowerCase();
+
+                if (qty < 0) {
+                    showToast('Inward quantity cannot be negative.', true);
+                    input.focus();
+                    return;
+                }
+
+                if (qty > maxBal) {
+                    showToast(`Inward quantity (${qty}) cannot exceed pending quota balance (${maxBal}) for ${input.getAttribute('data-cat-name')}.`, true);
+                    input.focus();
+                    return;
+                }
+
+                totalInward += qty;
+                if (catName.includes('printer')) {
+                    prtQty += qty;
+                } else if (catName.includes('laptop') || catName.includes('notebook')) {
+                    ltpQty += qty;
+                } else if (catName.includes('ups')) {
+                    upsQty += qty;
+                } else if (catName.includes('dongle')) {
+                    dngQty += qty;
+                } else {
+                    sysQty += qty;
+                }
+            }
+
+            if (totalInward <= 0) {
+                showToast('Please enter an inward quantity greater than 0 for at least one asset category.', true);
+                return;
+            }
 
             const fileInput = document.getElementById('dcFileInput');
-            if (fileInput.files.length > 0) {
-                formData.append('dcFile', fileInput.files[0]);
+            if (!fileInput || !fileInput.files || fileInput.files.length === 0) {
+                showToast('Please upload the Delivery Challan (DC) Stock Copy.', true);
+                fileInput?.focus();
+                return;
             }
 
+            const formData = new FormData();
+            formData.append('woId', woId);
+            formData.append('dcNo', document.getElementById('dcNumberInput')?.value?.trim() || '');
+            formData.append('dcDate', document.getElementById('dcDateInput')?.value || '');
+            formData.append('vendorName', document.getElementById('dcVendorDisplay')?.value?.trim() || '');
+            formData.append('inSystemsQty', sysQty);
+            formData.append('inPrintersQty', prtQty);
+            formData.append('inLaptopsQty', ltpQty);
+            formData.append('inUpsQty', upsQty);
+            formData.append('inDongleQty', dngQty);
+            formData.append('receivedBy', document.getElementById('dcReceivedByInput')?.value?.trim() || '');
+            formData.append('remarks', document.getElementById('dcRemarksInput')?.value?.trim() || '');
+            formData.append('dcFile', fileInput.files[0]);
+
             try {
                 const response = await fetch(contextPath + 'gccrentalmanagement/api/inward-challans/save', {
                     method: 'POST',
@@ -2540,7 +4044,7 @@
                 if (res.success) {
                     showToast(res.message);
                     hideModal('newDCModal');
-                    document.getElementById('newDCForm').reset();
+                    document.getElementById('newDCForm')?.reset();
                     await loadAllRentalData();
                 } else {
                     showToast(res.error || 'Failed to save Inward DC', true);
@@ -2550,27 +4054,59 @@
             }
         }
 
+        // ==========================================
         // ==========================================
         // 4. ISSUED DETAILS RENDERING & ACTIONS
         // ==========================================
         function renderIssuedTable() {
             const tbody = document.getElementById('issuedTableBody');
+            if (!tbody) return;
             tbody.innerHTML = '';
 
-            if (rentalData.issuedAssets.length === 0) {
-                tbody.innerHTML = '<tr><td colspan="11" class="text-center py-4 text-muted">No Assets issued yet. Click "Issue Asset to Department" to allocate.</td></tr>';
+            const allData = rentalData.issuedAssets || [];
+            const q = rentalPagination.issued.search || '';
+            const filtered = allData.filter(iss => {
+                if (!q) return true;
+                return (iss.dept_name || '').toLowerCase().includes(q) ||
+                    (iss.tapal_no || '').toLowerCase().includes(q) ||
+                    (iss.category_name || '').toLowerCase().includes(q) ||
+                    (iss.category_model_name || '').toLowerCase().includes(q) ||
+                    (iss.custodian_officer || '').toLowerCase().includes(q) ||
+                    (iss.contact_no || '').toLowerCase().includes(q) ||
+                    (iss.status || '').toLowerCase().includes(q);
+            });
+
+            const pageSize = rentalPagination.issued.pageSize;
+            const totalPages = Math.ceil(filtered.length / pageSize) || 1;
+            rentalPagination.issued.page = Math.min(Math.max(1, rentalPagination.issued.page), totalPages);
+            const currentPage = rentalPagination.issued.page;
+
+            renderRentalPaginationNav('issued-pagination-info', 'issued-pagination-nav', currentPage, pageSize, totalPages, filtered.length, (p) => {
+                rentalPagination.issued.page = p;
+                renderIssuedTable();
+            });
+
+            if (filtered.length === 0) {
+                tbody.innerHTML = '<tr><td colspan="12" class="text-center py-4 text-muted">No Assets issued yet. Click "Issue Asset to Department" to allocate.</td></tr>';
                 return;
             }
 
-            rentalData.issuedAssets.forEach(iss => {
+            const pageData = filtered.slice((currentPage - 1) * pageSize, currentPage * pageSize);
+            pageData.forEach((iss, idx) => {
+                const sNo = (currentPage - 1) * pageSize + idx + 1;
                 const tr = document.createElement('tr');
                 tr.innerHTML = `
+                    <td>${sNo}</td>
                     <td><strong>${iss.dept_name || '-'}</strong><br><small class="text-muted">${iss.tapal_no || ''}</small></td>
                     <td>${iss.custodian_officer || '-'}<br><small class="text-muted">${iss.contact_no || ''}</small></td>
                     <td>${iss.issued_date || '-'}</td>
-                    <td class="text-center fw-bold">${iss.issued_systems_qty || 0}</td>
-                    <td class="text-center fw-bold">${iss.issued_printers_qty || 0}</td>
-                    <td class="text-center fw-bold">${iss.issued_laptops_qty || 0}</td>
+                    <td>
+                        <span class="badge bg-light text-primary border fw-bold px-2 py-1" style="font-size: 0.85rem;">
+                            <i class="fa-solid fa-microchip me-1"></i> ${escapeHtml(iss.category_name || 'General')}
+                        </span>
+                    </td>
+                    <td><strong>${escapeHtml(iss.category_model_name || '-')}</strong></td>
+                    <td class="text-center fw-bold fs-6 text-dark">${iss.issued_qty || iss.total_issued_qty || 0}</td>
                     <td>${iss.issued_from_date || '-'} to ${iss.issued_to_date || '-'}</td>
                     <td class="text-center fw-bold text-primary">${iss.issued_period_days || 0} Days</td>
                     <td>
@@ -2588,63 +4124,221 @@
         }
 
         function openIssueAssetModal() {
-            document.getElementById('issueDateInput').value = formatDate(TODAY);
-            document.getElementById('issueFromDateInput').value = formatDate(TODAY);
-            document.getElementById('issueToDateInput').value = formatDate(addDays(TODAY, 30));
+            document.getElementById('issueAssetForm')?.reset();
+            const issueDate = document.getElementById('issueDateInput');
+            if (issueDate) issueDate.value = formatDate(TODAY);
+            const fromDate = document.getElementById('issueFromDateInput');
+            if (fromDate) fromDate.value = formatDate(TODAY);
+            const toDate = document.getElementById('issueToDateInput');
+            if (toDate) toDate.value = formatDate(addDays(TODAY, 30));
             calculateIssuedDuration();
+
+            const tbody = document.getElementById('issueItemsTableBody');
+            if (tbody) {
+                tbody.innerHTML = `
+                    <tr>
+                        <td colspan="5" class="text-center text-muted py-3">
+                            <i class="fa-solid fa-hand-pointer me-1"></i> Please select a User Request above to view requested asset categories & models.
+                        </td>
+                    </tr>
+                `;
+            }
+            const badge = document.getElementById('issueTotalUnitsBadge');
+            if (badge) badge.textContent = 'Total Items: 0';
+
             showModal('issueAssetModal');
         }
 
         function openIssueAssetForRequest(reqId) {
             openIssueAssetModal();
-            document.getElementById('issueReqSelect').value = reqId;
+            const reqSel = document.getElementById('issueReqSelect');
+            if (reqSel) reqSel.value = reqId;
             populateIssueDetailsFromReq(reqId);
         }
 
         function populateIssueDetailsFromReq(reqId) {
-            const req = rentalData.requests.find(r => r.id == reqId);
-            if (req) {
-                document.getElementById('issueDeptDisplay').value = `${req.dept_name || 'Dept'} (${req.zone_name || 'HQ'})`;
-                document.getElementById('issueSystemsQtyInput').value = req.req_systems_qty || 0;
-                document.getElementById('issuePrintersQtyInput').value = req.req_printers_qty || 0;
-                document.getElementById('issueLaptopsQtyInput').value = req.req_laptops_qty || 0;
-                document.getElementById('issueFromDateInput').value = req.required_from_date || formatDate(TODAY);
-                document.getElementById('issueToDateInput').value = req.required_to_date || formatDate(addDays(TODAY, 30));
-                document.getElementById('issueCustodianOfficerInput').value = req.requesting_officer || '';
-                document.getElementById('issueContactNoInput').value = req.contact_no || '';
-                calculateIssuedDuration();
+            if (!reqId) {
+                const tbody = document.getElementById('issueItemsTableBody');
+                if (tbody) {
+                    tbody.innerHTML = `
+                        <tr>
+                            <td colspan="5" class="text-center text-muted py-3">
+                                <i class="fa-solid fa-hand-pointer me-1"></i> Please select a User Request above to view requested asset categories & models.
+                            </td>
+                        </tr>
+                    `;
+                }
+                const badge = document.getElementById('issueTotalUnitsBadge');
+                if (badge) badge.textContent = 'Total Items: 0';
+                return;
+            }
+
+            try {
+                const groupedReqs = getGroupedRequests();
+                const req = groupedReqs.find(r =>
+                    String(r.id) === String(reqId) ||
+                    (r.allIds && r.allIds.some(id => String(id) === String(reqId))) ||
+                    (r.tapal_no && (r.tapal_no === reqId || encodeURIComponent(r.tapal_no) === reqId))
+                );
+
+                if (req) {
+                    const deptDisp = document.getElementById('issueDeptDisplay');
+                    if (deptDisp) deptDisp.value = `${req.dept_name || 'Dept'} (${req.zone_name || 'HQ'})`;
+
+                    const fromIn = document.getElementById('issueFromDateInput');
+                    if (fromIn) fromIn.value = req.required_from_date || formatDate(TODAY);
+                    const toIn = document.getElementById('issueToDateInput');
+                    if (toIn) toIn.value = req.required_to_date || formatDate(addDays(TODAY, 30));
+
+                    const custIn = document.getElementById('issueCustodianOfficerInput');
+                    if (custIn) custIn.value = req.requesting_officer || '';
+                    const contIn = document.getElementById('issueContactNoInput');
+                    if (contIn) contIn.value = req.contact_no || '';
+
+                    calculateIssuedDuration();
+
+                    // Populate requested categories and models table
+                    const tbody = document.getElementById('issueItemsTableBody');
+                    if (tbody) {
+                        tbody.innerHTML = '';
+                        const items = req.items || [];
+                        if (items.length === 0) {
+                            tbody.innerHTML = `
+                                <tr>
+                                    <td colspan="5" class="text-center text-warning py-3">
+                                        <i class="fa-solid fa-triangle-exclamation me-1"></i> No specific asset categories or models found for this request.
+                                    </td>
+                                </tr>
+                            `;
+                            const badge = document.getElementById('issueTotalUnitsBadge');
+                            if (badge) badge.textContent = 'Total Items: 0';
+                        } else {
+                            let totalReqUnits = 0;
+                            items.forEach((it, idx) => {
+                                const reqQty = parseInt(it.category_qty) || 0;
+                                totalReqUnits += reqQty;
+                                const maxQty = reqQty > 0 ? reqQty : 999;
+                                const defaultVal = 0;
+                                const catName = it.category_name || 'General';
+                                const modelName = it.category_model_name || '-';
+
+                                const tr = document.createElement('tr');
+                                tr.innerHTML = `
+                                    <td class="text-center font-monospace">${idx + 1}</td>
+                                    <td>
+                                        <span class="badge bg-light text-primary border fw-bold px-2 py-1" style="font-size: 0.85rem;">
+                                            <i class="fa-solid fa-microchip me-1"></i> ${escapeHtml(catName)}
+                                        </span>
+                                    </td>
+                                    <td>
+                                        <strong class="text-dark">${escapeHtml(modelName)}</strong>
+                                    </td>
+                                    <td class="text-center font-monospace fw-bold text-secondary" style="font-size: 0.95rem;">
+                                        ${reqQty}
+                                    </td>
+                                    <td class="text-center">
+                                        <input type="number" 
+                                               class="form-control form-control-sm text-center fw-bold text-primary issue-item-qty" 
+                                               data-cid="${it.cid || ''}" 
+                                               data-model="${escapeHtml(modelName)}" 
+                                               data-req-qty="${reqQty}" 
+                                               min="0" 
+                                               max="${maxQty}" 
+                                               value="0" 
+                                               placeholder="0" 
+                                               onfocus="if(this.value==='0') this.select();" 
+                                               style="border-color: #0d6efd; font-size: 0.95rem; max-width: 110px; margin: 0 auto;" 
+                                               required>
+                                    </td>
+                                `;
+                                tbody.appendChild(tr);
+                            });
+                            const badge = document.getElementById('issueTotalUnitsBadge');
+                            if (badge) badge.textContent = `Total Items: ${items.length} (${totalReqUnits} Units)`;
+                        }
+                    }
+                } else {
+                    console.warn('No matching request found for reqId:', reqId);
+                }
+            } catch (err) {
+                console.error('Error populating issue details from request:', err);
             }
         }
 
         function calculateIssuedDuration() {
-            const from = document.getElementById('issueFromDateInput').value;
-            const to = document.getElementById('issueToDateInput').value;
+            const from = document.getElementById('issueFromDateInput')?.value;
+            const to = document.getElementById('issueToDateInput')?.value;
             if (from && to) {
                 const diff = Math.ceil((new Date(to) - new Date(from)) / (1000 * 60 * 60 * 24)) + 1;
-                document.getElementById('issueDurationDaysText').textContent = `${diff} Days`;
+                const durEl = document.getElementById('issueDurationDaysText');
+                if (durEl) durEl.textContent = `${diff} Days`;
             }
         }
 
         async function handleSaveIssueAsset(event) {
             event.preventDefault();
+            const reqId = document.getElementById('issueReqSelect')?.value;
+            if (!reqId) {
+                showToast('Please select a User Request.', true);
+                return;
+            }
+
+            const issueRows = document.querySelectorAll('.issue-item-qty');
+            if (issueRows.length === 0) {
+                showToast('No asset category items available to issue for this request.', true);
+                return;
+            }
+
             const formData = new FormData();
-            formData.append('requestId', document.getElementById('issueReqSelect').value);
-            formData.append('inwardDcId', document.getElementById('issueInwardDCSelect').value || '');
-            formData.append('issuedDate', document.getElementById('issueDateInput').value);
-            formData.append('issuedSystemsQty', document.getElementById('issueSystemsQtyInput').value);
-            formData.append('issuedPrintersQty', document.getElementById('issuePrintersQtyInput').value);
-            formData.append('issuedLaptopsQty', document.getElementById('issueLaptopsQtyInput').value);
-            formData.append('assetSerialDetails', document.getElementById('issueSerialDetailsInput').value.trim());
-            formData.append('issuedFromDate', document.getElementById('issueFromDateInput').value);
-            formData.append('issuedToDate', document.getElementById('issueToDateInput').value);
-            formData.append('custodianOfficer', document.getElementById('issueCustodianOfficerInput').value.trim());
-            formData.append('contactNo', document.getElementById('issueContactNoInput').value.trim());
-            formData.append('issuedBy', document.getElementById('issueIssuedByInput').value.trim());
+            formData.append('requestId', reqId);
+            formData.append('issuedDate', document.getElementById('issueDateInput')?.value || '');
+            formData.append('issuedFromDate', document.getElementById('issueFromDateInput')?.value || '');
+            formData.append('issuedToDate', document.getElementById('issueToDateInput')?.value || '');
+            formData.append('custodianOfficer', document.getElementById('issueCustodianOfficerInput')?.value?.trim() || '');
+            formData.append('contactNo', document.getElementById('issueContactNoInput')?.value?.trim() || '');
+            formData.append('issuedBy', document.getElementById('issueIssuedByInput')?.value?.trim() || '');
+
+            let totalIssued = 0;
+            let hasPositiveQty = false;
+
+            for (let input of issueRows) {
+                const cid = input.getAttribute('data-cid') || '';
+                const model = input.getAttribute('data-model') || '';
+                const reqQty = parseInt(input.getAttribute('data-req-qty')) || 0;
+                const issQty = parseInt(input.value) || 0;
+
+                if (issQty < 0) {
+                    showToast('Issued quantity cannot be negative.', true);
+                    input.focus();
+                    return;
+                }
+                if (issQty > 0) {
+                    hasPositiveQty = true;
+                }
+                totalIssued += issQty;
+
+                formData.append('cid', cid);
+                formData.append('categoryModelName', model);
+                formData.append('requestedQty', reqQty);
+                formData.append('issuedQty', issQty);
+            }
+
+            if (!hasPositiveQty) {
+                showToast('Please specify an issued quantity greater than 0 for at least one model.', true);
+                return;
+            }
+
+            formData.append('issuedSystemsQty', totalIssued);
+            formData.append('issuedPrintersQty', 0);
+            formData.append('issuedLaptopsQty', 0);
 
             const fileInput = document.getElementById('issueStockCopyFileInput');
-            if (fileInput.files.length > 0) {
-                formData.append('stockCopyFile', fileInput.files[0]);
+            if (!fileInput || !fileInput.files || fileInput.files.length === 0) {
+                showToast('Upload Stock Issue Copy (Acknowledgment / Handover Slip) is mandatory.', true);
+                fileInput?.focus();
+                return;
             }
+            formData.append('stockCopyFile', fileInput.files[0]);
 
             try {
                 const response = await fetch(contextPath + 'gccrentalmanagement/api/issued-assets/save', {
@@ -2656,13 +4350,13 @@
                 if (res.success) {
                     showToast(res.message);
                     hideModal('issueAssetModal');
-                    document.getElementById('issueAssetForm').reset();
+                    document.getElementById('issueAssetForm')?.reset();
                     await loadAllRentalData();
                 } else {
-                    showToast(res.error || 'Failed to issue assets', true);
+                    showToast(res.error || 'Failed to register Issue details', true);
                 }
             } catch (err) {
-                showToast('Network error issuing assets', true);
+                showToast('Network error registering Issue details', true);
             }
         }
 
@@ -2671,16 +4365,42 @@
         // ==========================================
         function renderReturnsTable() {
             const tbody = document.getElementById('returnsTableBody');
+            if (!tbody) return;
             tbody.innerHTML = '';
 
-            if (rentalData.returns.length === 0) {
-                tbody.innerHTML = '<tr><td colspan="11" class="text-center py-4 text-muted">No returns recorded yet.</td></tr>';
+            const allData = rentalData.returns || [];
+            const q = rentalPagination.returns.search || '';
+            const filtered = allData.filter(ret => {
+                if (!q) return true;
+                return (ret.dept_name || '').toLowerCase().includes(q) ||
+                    (ret.zone_name || '').toLowerCase().includes(q) ||
+                    (ret.custodian_officer || '').toLowerCase().includes(q) ||
+                    (ret.return_date || '').toLowerCase().includes(q) ||
+                    (ret.received_by || '').toLowerCase().includes(q) ||
+                    (ret.post_return_status_name || '').toLowerCase().includes(q);
+            });
+
+            const pageSize = rentalPagination.returns.pageSize;
+            const totalPages = Math.ceil(filtered.length / pageSize) || 1;
+            rentalPagination.returns.page = Math.min(Math.max(1, rentalPagination.returns.page), totalPages);
+            const currentPage = rentalPagination.returns.page;
+
+            renderRentalPaginationNav('returns-pagination-info', 'returns-pagination-nav', currentPage, pageSize, totalPages, filtered.length, (p) => {
+                rentalPagination.returns.page = p;
+                renderReturnsTable();
+            });
+
+            if (filtered.length === 0) {
+                tbody.innerHTML = '<tr><td colspan="12" class="text-center py-4 text-muted">No returns recorded yet.</td></tr>';
                 return;
             }
 
-            rentalData.returns.forEach(ret => {
+            const pageData = filtered.slice((currentPage - 1) * pageSize, currentPage * pageSize);
+            pageData.forEach((ret, idx) => {
+                const sNo = (currentPage - 1) * pageSize + idx + 1;
                 const tr = document.createElement('tr');
                 tr.innerHTML = `
+                    <td>${sNo}</td>
                     <td><strong>${ret.dept_name || '-'}</strong><br><small class="text-muted">${ret.zone_name || ''}</small></td>
                     <td>${ret.custodian_officer || '-'}</td>
                     <td class="text-success fw-bold">${ret.return_date || '-'}</td>
@@ -2700,47 +4420,54 @@
         }
 
         function openReturnAssetModal() {
-            document.getElementById('returnDateInput').value = formatDate(TODAY);
+            const retDate = document.getElementById('returnDateInput');
+            if (retDate) retDate.value = formatDate(TODAY);
             showModal('returnAssetModal');
         }
 
         function openReturnAssetForIssue(issueId) {
             openReturnAssetModal();
-            document.getElementById('returnIssuedSelect').value = issueId;
+            const retSel = document.getElementById('returnIssuedSelect');
+            if (retSel) retSel.value = issueId;
             populateReturnFromIssued(issueId);
         }
 
         function populateReturnFromIssued(issueId) {
-            const iss = rentalData.issuedAssets.find(i => i.id == issueId);
+            const iss = (rentalData.issuedAssets || []).find(i => i.id == issueId);
             if (iss) {
-                document.getElementById('returnDeptDisplay').value = `${iss.dept_name || 'Dept'} (${iss.custodian_officer || ''})`;
-                document.getElementById('returnDueDateDisplay').value = iss.issued_to_date || '';
-                document.getElementById('returnSystemsQtyInput').value = iss.issued_systems_qty || 0;
-                document.getElementById('returnPrintersQtyInput').value = iss.issued_printers_qty || 0;
-                document.getElementById('returnLaptopsQtyInput').value = iss.issued_laptops_qty || 0;
+                const deptDisp = document.getElementById('returnDeptDisplay');
+                if (deptDisp) deptDisp.value = `${iss.dept_name || 'Dept'} (${iss.custodian_officer || ''})`;
+                const dueDisp = document.getElementById('returnDueDateDisplay');
+                if (dueDisp) dueDisp.value = iss.issued_to_date || '';
+                const sysIn = document.getElementById('returnSystemsQtyInput');
+                if (sysIn) sysIn.value = iss.issued_systems_qty || 0;
+                const prtIn = document.getElementById('returnPrintersQtyInput');
+                if (prtIn) prtIn.value = iss.issued_printers_qty || 0;
+                const ltpIn = document.getElementById('returnLaptopsQtyInput');
+                if (ltpIn) ltpIn.value = iss.issued_laptops_qty || 0;
             }
         }
 
         async function handleSaveReturn(event) {
             event.preventDefault();
-            const issueId = document.getElementById('returnIssuedSelect').value;
-            const iss = rentalData.issuedAssets.find(i => i.id == issueId);
+            const issueId = document.getElementById('returnIssuedSelect')?.value || '';
+            const iss = (rentalData.issuedAssets || []).find(i => i.id == issueId);
             const requestId = iss ? iss.request_id : 0;
 
             const formData = new FormData();
             formData.append('issueId', issueId);
             formData.append('requestId', requestId);
-            formData.append('returnDate', document.getElementById('returnDateInput').value);
-            formData.append('retSystemsQty', document.getElementById('returnSystemsQtyInput').value);
-            formData.append('retPrintersQty', document.getElementById('returnPrintersQtyInput').value);
-            formData.append('retLaptopsQty', document.getElementById('returnLaptopsQtyInput').value);
-            formData.append('postReturnStatusId', document.getElementById('returnStatusInput').value);
-            formData.append('conditionGrade', document.getElementById('returnConditionInput').value);
-            formData.append('receivedBy', document.getElementById('returnReceivedByInput').value.trim());
-            formData.append('remarks', document.getElementById('returnRemarksInput').value.trim());
+            formData.append('returnDate', document.getElementById('returnDateInput')?.value || '');
+            formData.append('retSystemsQty', document.getElementById('returnSystemsQtyInput')?.value || '0');
+            formData.append('retPrintersQty', document.getElementById('returnPrintersQtyInput')?.value || '0');
+            formData.append('retLaptopsQty', document.getElementById('returnLaptopsQtyInput')?.value || '0');
+            formData.append('postReturnStatusId', document.getElementById('returnStatusInput')?.value || '1');
+            formData.append('conditionGrade', document.getElementById('returnConditionInput')?.value || '');
+            formData.append('receivedBy', document.getElementById('returnReceivedByInput')?.value?.trim() || '');
+            formData.append('remarks', document.getElementById('returnRemarksInput')?.value?.trim() || '');
 
             const fileInput = document.getElementById('returnStockCopyFileInput');
-            if (fileInput.files.length > 0) {
+            if (fileInput && fileInput.files && fileInput.files.length > 0) {
                 formData.append('stockCopyFile', fileInput.files[0]);
             }
 
@@ -2754,7 +4481,7 @@
                 if (res.success) {
                     showToast(res.message);
                     hideModal('returnAssetModal');
-                    document.getElementById('returnAssetForm').reset();
+                    document.getElementById('returnAssetForm')?.reset();
                     await loadAllRentalData();
                 } else {
                     showToast(res.error || 'Failed to process return', true);
@@ -2769,55 +4496,55 @@
         // ==========================================
         function renderRemindersTable() {
             const tbody = document.getElementById('remindersTableBody');
-            const radarTbody = document.getElementById('radarOverdueTableBody');
+            if (!tbody) return;
             tbody.innerHTML = '';
-            radarTbody.innerHTML = '';
 
-            const overdueItems = rentalData.reminders.filter(r => r.calculated_status === 'OVERDUE');
+            const allData = rentalData.reminders || [];
+            const q = rentalPagination.reminders.search || '';
+            const filtered = allData.filter(item => {
+                if (!q) return true;
+                return (item.dept_name || '').toLowerCase().includes(q) ||
+                    (item.zone_name || '').toLowerCase().includes(q) ||
+                    (item.custodian_officer || '').toLowerCase().includes(q) ||
+                    (item.contact_no || '').toLowerCase().includes(q) ||
+                    (item.status_label || '').toLowerCase().includes(q);
+            });
 
-            if (rentalData.reminders.length === 0) {
-                tbody.innerHTML = '<tr><td colspan="7" class="text-center py-4 text-success fw-bold"><i class="fa-solid fa-circle-check fs-4 d-block mb-2"></i> All rental items are on schedule!</td></tr>';
-            } else {
-                rentalData.reminders.forEach(item => {
-                    const tr = document.createElement('tr');
-                    tr.innerHTML = `
-                        <td><strong>${item.dept_name || '-'}</strong><br><small class="text-muted">${item.zone_name || ''}</small></td>
-                        <td>${item.custodian_officer || '-'}<br><small class="text-muted">${item.contact_no || ''}</small></td>
-                        <td>Sys: ${item.issued_systems_qty || 0} | Prt: ${item.issued_printers_qty || 0} | Ltp: ${item.issued_laptops_qty || 0}</td>
-                        <td>${item.issued_date || '-'}</td>
-                        <td class="${item.calculated_status === 'OVERDUE' ? 'text-danger fw-bold' : ''}">${item.issued_to_date || '-'}</td>
-                        <td><span class="badge-status ${item.badge_class || 'status-active'}">${item.status_label || '-'}</span></td>
-                        <td>
-                            <button class="btn btn-sm ${item.calculated_status === 'OVERDUE' ? 'btn-danger' : 'btn-outline-primary'}" onclick="openSingleReminderModal(${item.id})">
-                                <i class="fa-solid fa-paper-plane me-1"></i> Send Notice
-                            </button>
-                        </td>
-                    `;
-                    tbody.appendChild(tr);
-                });
-            }
+            const pageSize = rentalPagination.reminders.pageSize;
+            const totalPages = Math.ceil(filtered.length / pageSize) || 1;
+            rentalPagination.reminders.page = Math.min(Math.max(1, rentalPagination.reminders.page), totalPages);
+            const currentPage = rentalPagination.reminders.page;
 
-            if (overdueItems.length === 0) {
-                radarTbody.innerHTML = '<tr><td colspan="7" class="text-center py-4 text-success fw-bold"><i class="fa-solid fa-circle-check fs-4 d-block mb-2"></i> All rental items are on schedule! No overdue returns.</td></tr>';
-            } else {
-                overdueItems.forEach(item => {
-                    const tr = document.createElement('tr');
-                    tr.innerHTML = `
-                        <td><strong>${item.dept_name || '-'}</strong><br><small class="text-muted">${item.zone_name || ''}</small></td>
-                        <td>${item.custodian_officer || '-'}<br><small class="text-muted">${item.contact_no || ''}</small></td>
-                        <td>Sys: ${item.issued_systems_qty || 0} | Prt: ${item.issued_printers_qty || 0} | Ltp: ${item.issued_laptops_qty || 0}</td>
-                        <td>${item.issued_date || '-'}</td>
-                        <td class="text-danger fw-bold">${item.issued_to_date || '-'}</td>
-                        <td><span class="badge-status status-overdue">${item.overdue_days || 0} Days Overdue</span></td>
-                        <td>
-                            <button class="btn btn-sm btn-outline-danger" onclick="openSingleReminderModal(${item.id})">
-                                <i class="fa-solid fa-paper-plane me-1"></i> Send Notice
-                            </button>
-                        </td>
-                    `;
-                    radarTbody.appendChild(tr);
-                });
+            renderRentalPaginationNav('reminders-pagination-info', 'reminders-pagination-nav', currentPage, pageSize, totalPages, filtered.length, (p) => {
+                rentalPagination.reminders.page = p;
+                renderRemindersTable();
+            });
+
+            if (filtered.length === 0) {
+                tbody.innerHTML = '<tr><td colspan="8" class="text-center py-4 text-success fw-bold"><i class="fa-solid fa-circle-check fs-4 d-block mb-2"></i> All rental items are on schedule!</td></tr>';
+                return;
             }
+
+            const pageData = filtered.slice((currentPage - 1) * pageSize, currentPage * pageSize);
+            pageData.forEach((item, idx) => {
+                const sNo = (currentPage - 1) * pageSize + idx + 1;
+                const tr = document.createElement('tr');
+                tr.innerHTML = `
+                    <td>${sNo}</td>
+                    <td><strong>${item.dept_name || '-'}</strong><br><small class="text-muted">${item.zone_name || ''}</small></td>
+                    <td>${item.custodian_officer || '-'}<br><small class="text-muted">${item.contact_no || ''}</small></td>
+                    <td>Sys: ${item.issued_systems_qty || 0} | Prt: ${item.issued_printers_qty || 0} | Ltp: ${item.issued_laptops_qty || 0}</td>
+                    <td>${item.issued_date || '-'}</td>
+                    <td class="${item.calculated_status === 'OVERDUE' ? 'text-danger fw-bold' : ''}">${item.issued_to_date || '-'}</td>
+                    <td><span class="badge-status ${item.badge_class || 'status-active'}">${item.status_label || '-'}</span></td>
+                    <td>
+                        <button class="btn btn-sm ${item.calculated_status === 'OVERDUE' ? 'btn-danger' : 'btn-outline-primary'}" onclick="openSingleReminderModal(${item.id})">
+                            <i class="fa-solid fa-paper-plane me-1"></i> Send Notice
+                        </button>
+                    </td>
+                `;
+                tbody.appendChild(tr);
+            });
         }
 
         let selectedReminderItem = null;
@@ -2907,52 +4634,121 @@ Greater Chennai Corporation
         function populateCrossModuleDropdowns() {
             // Work Orders for Inward DC
             const woSelect = document.getElementById('dcWOSelect');
-            woSelect.innerHTML = '<option value="">-- Select Work Order --</option>';
-            rentalData.workOrders.forEach(wo => {
-                const opt = document.createElement('option');
-                opt.value = wo.id;
-                opt.textContent = `${wo.wo_file_no} (${wo.vendor_name || 'Vendor'})`;
-                woSelect.appendChild(opt);
-            });
+            if (woSelect) {
+                woSelect.innerHTML = '<option value="">-- Select Work Order --</option>';
+
+                const activeWOs = [];
+                const completedWOs = [];
+
+                const groupedWOs = getGroupedWorkOrders();
+                groupedWOs.forEach(wo => {
+                    const stats = getWOInwardStats(wo);
+                    if (stats.isFullyCompleted) {
+                        completedWOs.push({ wo, stats });
+                    } else {
+                        activeWOs.push({ wo, stats });
+                    }
+                });
+
+                // 1. Add Active Work Orders (still have balance stock to inward)
+                activeWOs.forEach(({ wo, stats }) => {
+                    const opt = document.createElement('option');
+                    opt.value = wo.id;
+                    const catCountText = wo.items.length === 1 ? `1 Category: ${wo.items[0].category_name}` : `${wo.items.length} Categories`;
+                    opt.textContent = `${wo.wo_file_no} (${wo.vendor_name || 'Vendor'}) — [Pending: ${stats.totalBal}/${stats.totalOrdered} Units | ${catCountText}]`;
+                    woSelect.appendChild(opt);
+                });
+
+                // 2. Add Completed Work Orders (disabled group so user knows all stock is received)
+                if (completedWOs.length > 0) {
+                    const optGroup = document.createElement('optgroup');
+                    optGroup.label = '✓ Fully Inwarded Work Orders (All Stock Received)';
+                    completedWOs.forEach(({ wo, stats }) => {
+                        const opt = document.createElement('option');
+                        opt.value = wo.id;
+                        opt.disabled = true;
+                        opt.textContent = `✓ ${wo.wo_file_no} (${wo.vendor_name || 'Vendor'}) — [Fully Completed ${stats.totalInwarded}/${stats.totalOrdered}]`;
+                        optGroup.appendChild(opt);
+                    });
+                    woSelect.appendChild(optGroup);
+                }
+            }
 
             // User Requests for Issue Asset
             const reqSelect = document.getElementById('issueReqSelect');
-            reqSelect.innerHTML = '<option value="">-- Choose User Request --</option>';
-            rentalData.requests.forEach(req => {
-                const opt = document.createElement('option');
-                opt.value = req.id;
-                opt.textContent = `Tapal: ${req.tapal_no} - ${req.dept_name || 'Dept'}`;
-                reqSelect.appendChild(opt);
-            });
+            if (reqSelect) {
+                reqSelect.innerHTML = '<option value="">-- Choose User Request --</option>';
+                const groupedReqs = getGroupedRequests();
+                groupedReqs.forEach(req => {
+                    const opt = document.createElement('option');
+                    opt.value = req.id;
+                    const catCountText = req.items.length === 1 ? `1 Cat: ${req.items[0].category_name}` : `${req.items.length} Categories`;
+                    opt.textContent = `Tapal: ${req.tapal_no} - ${req.dept_name || 'Dept'} [${req.total_units} Units | ${catCountText}]`;
+                    reqSelect.appendChild(opt);
+                });
+            }
 
-            // Inward DC for Issue Asset
+            // Inward DC for Issue Asset (if present in DOM)
             const dcSelect = document.getElementById('issueInwardDCSelect');
-            dcSelect.innerHTML = '<option value="">-- Choose Inward DC (Optional) --</option>';
-            rentalData.challans.forEach(dc => {
-                const opt = document.createElement('option');
-                opt.value = dc.id;
-                opt.textContent = `DC: ${dc.dc_no} (${dc.vendor_name || 'Vendor'})`;
-                dcSelect.appendChild(opt);
-            });
+            if (dcSelect) {
+                dcSelect.innerHTML = '<option value="">-- Choose Inward DC (Optional) --</option>';
+                (rentalData.challans || []).forEach(dc => {
+                    const opt = document.createElement('option');
+                    opt.value = dc.id;
+                    opt.textContent = `DC: ${dc.dc_no} (${dc.vendor_name || 'Vendor'})`;
+                    dcSelect.appendChild(opt);
+                });
+            }
 
             // Issued Records for Return
             const retSelect = document.getElementById('returnIssuedSelect');
-            retSelect.innerHTML = '<option value="">-- Choose Issued Record --</option>';
-            rentalData.issuedAssets.forEach(iss => {
-                const opt = document.createElement('option');
-                opt.value = iss.id;
-                opt.textContent = `ID #${iss.id}: ${iss.dept_name || 'Dept'} (${iss.custodian_officer || ''}) - Due: ${iss.issued_to_date || ''}`;
-                retSelect.appendChild(opt);
-            });
+            if (retSelect) {
+                retSelect.innerHTML = '<option value="">-- Choose Issued Record --</option>';
+                (rentalData.issuedAssets || []).forEach(iss => {
+                    const opt = document.createElement('option');
+                    opt.value = iss.id;
+                    opt.textContent = `ID #${iss.id}: ${iss.dept_name || 'Dept'} (${iss.custodian_officer || ''}) - Due: ${iss.issued_to_date || ''}`;
+                    retSelect.appendChild(opt);
+                });
+            }
         }
 
         function renderMasterReportTable() {
             const tbody = document.getElementById('masterReportTableBody');
+            if (!tbody) return;
             tbody.innerHTML = '';
 
-            rentalData.issuedAssets.forEach(iss => {
+            const allData = rentalData.issuedAssets || [];
+            const q = rentalPagination.master.search || '';
+            const filtered = allData.filter(iss => {
+                if (!q) return true;
+                return (iss.dept_name || '').toLowerCase().includes(q) ||
+                    (iss.tapal_no || '').toLowerCase().includes(q) ||
+                    (iss.custodian_officer || '').toLowerCase().includes(q) ||
+                    (iss.status || '').toLowerCase().includes(q);
+            });
+
+            const pageSize = rentalPagination.master.pageSize;
+            const totalPages = Math.ceil(filtered.length / pageSize) || 1;
+            rentalPagination.master.page = Math.min(Math.max(1, rentalPagination.master.page), totalPages);
+            const currentPage = rentalPagination.master.page;
+
+            renderRentalPaginationNav('master-pagination-info', 'master-pagination-nav', currentPage, pageSize, totalPages, filtered.length, (p) => {
+                rentalPagination.master.page = p;
+                renderMasterReportTable();
+            });
+
+            if (filtered.length === 0) {
+                tbody.innerHTML = '<tr><td colspan="10" class="text-center py-4 text-muted">No master report records found.</td></tr>';
+                return;
+            }
+
+            const pageData = filtered.slice((currentPage - 1) * pageSize, currentPage * pageSize);
+            pageData.forEach((iss, idx) => {
+                const sNo = (currentPage - 1) * pageSize + idx + 1;
                 const tr = document.createElement('tr');
                 tr.innerHTML = `
+                    <td>${sNo}</td>
                     <td><strong>${iss.dept_name || '-'}</strong><br><small class="text-muted">${iss.tapal_no || ''}</small></td>
                     <td>${iss.custodian_officer || '-'}</td>
                     <td>${iss.issued_date || '-'}</td>
@@ -2996,20 +4792,164 @@ Greater Chennai Corporation
 
         // Generic Filter and Excel Exporter
         function filterGenericTable(tableId, query) {
-            const q = query.toLowerCase().trim();
-            const table = document.getElementById(tableId);
-            const rows = table.getElementsByTagName('tbody')[0].getElementsByTagName('tr');
-            for (let i = 0; i < rows.length; i++) {
-                const text = rows[i].textContent.toLowerCase();
-                rows[i].style.display = text.includes(q) ? '' : 'none';
+            const tableMap = {
+                'radarOverdueTable': 'radar',
+                'woTable': 'wo',
+                'reqTable': 'req',
+                'dcTable': 'dc',
+                'issuedTable': 'issued',
+                'returnsTable': 'returns',
+                'remindersTable': 'reminders',
+                'masterReportTable': 'master'
+            };
+            const key = tableMap[tableId] || tableId;
+            if (rentalPagination[key]) {
+                handleRentalTableSearch(key, query);
             }
         }
 
         function exportTableToExcel(tableId, fileName) {
-            const table = document.getElementById(tableId);
-            const wb = XLSX.utils.table_to_book(table, { sheet: "Sheet1" });
-            XLSX.writeFile(wb, `${fileName}_${formatDate(TODAY)}.xlsx`);
-            showToast(`Exported ${fileName}.xlsx successfully.`);
+            let rows = [];
+            if (tableId === 'radarOverdueTable') {
+                const overdueItems = (rentalData.reminders || []).filter(r => r.calculated_status === 'OVERDUE');
+                rows = overdueItems.map((item, idx) => ({
+                    'S.No': idx + 1,
+                    'Department': item.dept_name || '-',
+                    'Zone': item.zone_name || '-',
+                    'Custodian Officer': item.custodian_officer || '-',
+                    'Contact No': item.contact_no || '-',
+                    'Issued Systems': item.issued_systems_qty || 0,
+                    'Issued Printers': item.issued_printers_qty || 0,
+                    'Issued Laptops': item.issued_laptops_qty || 0,
+                    'Issued Date': item.issued_date || '-',
+                    'Due Date': item.issued_to_date || '-',
+                    'Overdue Days': item.overdue_days || 0
+                }));
+            } else if (tableId === 'woTable') {
+                const grouped = getGroupedWorkOrders();
+                rows = grouped.map((wo, idx) => {
+                    const stats = getWOInwardStats(wo);
+                    const catSummary = wo.items.map(it => `${it.category_name}: ${it.category_qty} (${it.category_model_name})`).join('; ');
+                    return {
+                        'S.No': idx + 1,
+                        'WO File No': wo.wo_file_no || '-',
+                        'File Subject': wo.file_subject || '-',
+                        'Period From': wo.period_from_date || '-',
+                        'Period To': wo.period_to_date || '-',
+                        'Vendor Name': wo.vendor_name || '-',
+                        'Categories Breakdown': catSummary,
+                        'Total Units Ordered': wo.total_units || stats.totalOrdered,
+                        'Total Inwarded Units': stats.totalInwarded,
+                        'Inward Stock Status': stats.isFullyCompleted ? 'Stock Full' : (stats.totalInwarded > 0 ? 'Partial' : 'Pending')
+                    };
+                });
+            } else if (tableId === 'reqTable') {
+                rows = (rentalData.requests || []).map((req, idx) => ({
+                    'S.No': idx + 1,
+                    'Tapal No': req.tapal_no || '-',
+                    'Tapal Date': req.tapal_date || '-',
+                    'Department': req.dept_name || '-',
+                    'Zone': req.zone_name || '-',
+                    'Requesting Officer': req.requesting_officer || '-',
+                    'Contact No': req.contact_no || '-',
+                    'Asset Category': req.category_name || 'General',
+                    'Requested Quantity': req.category_qty || req.total_req_qty || 0,
+                    'Model / Specifications': req.category_model_name || '-',
+                    'Required From': formatDateDMY(req.required_from_date),
+                    'Required To': formatDateDMY(req.required_to_date),
+                    'Duration (Days)': req.calculated_days || 0,
+                    'Status': req.status_name || 'Pending'
+                }));
+            } else if (tableId === 'dcTable') {
+                rows = (rentalData.challans || []).map((dc, idx) => ({
+                    'S.No': idx + 1,
+                    'Work Order Ref': dc.wo_file_no || 'WO #' + dc.wo_id,
+                    'Vendor Name': dc.vendor_name || '-',
+                    'DC No': dc.dc_no || '-',
+                    'Inward Systems': dc.inward_systems_qty || 0,
+                    'Inward Printers': dc.inward_printers_qty || 0,
+                    'Inward Laptops': dc.inward_laptops_qty || 0,
+                    'Inward UPS': dc.inward_ups_qty || 0,
+                    'Inward Dongle': dc.inward_dongle_qty || 0,
+                    'Total Inward Stock': dc.total_inward_qty || (parseInt(dc.inward_systems_qty || 0) + parseInt(dc.inward_printers_qty || 0) + parseInt(dc.inward_laptops_qty || 0) + parseInt(dc.inward_ups_qty || 0) + parseInt(dc.inward_dongle_qty || 0)),
+                    'DC Date': formatTimestamp(dc.dc_date),
+                    'Received By': dc.received_by || '-'
+                }));
+            } else if (tableId === 'issuedTable') {
+                rows = (rentalData.issuedAssets || []).map((iss, idx) => ({
+                    'S.No': idx + 1,
+                    'Department': iss.dept_name || '-',
+                    'Tapal No': iss.tapal_no || '-',
+                    'Custodian Officer': iss.custodian_officer || '-',
+                    'Contact No': iss.contact_no || '-',
+                    'Issued Date': iss.issued_date || '-',
+                    'Asset Category': iss.category_name || 'General',
+                    'Model Name / Specifications': iss.category_model_name || '-',
+                    'Issued Quantity': iss.issued_qty || iss.total_issued_qty || 0,
+                    'Issued From': iss.issued_from_date || '-',
+                    'Issued To': iss.issued_to_date || '-',
+                    'Duration (Days)': iss.issued_period_days || 0,
+                    'Status': iss.status || 'Issued'
+                }));
+            } else if (tableId === 'returnsTable') {
+                rows = (rentalData.returns || []).map((ret, idx) => ({
+                    'S.No': idx + 1,
+                    'Department': ret.dept_name || '-',
+                    'Zone': ret.zone_name || '-',
+                    'Custodian Officer': ret.custodian_officer || '-',
+                    'Return Date': ret.return_date || '-',
+                    'Returned Systems': ret.returned_systems_qty || 0,
+                    'Returned Printers': ret.returned_printers_qty || 0,
+                    'Returned Laptops': ret.returned_laptops_qty || 0,
+                    'Total Returned': ret.total_returned_qty || 0,
+                    'Post-Return Status': ret.post_return_status_name || 'Completed',
+                    'Quality Condition': ret.condition_grade || 'Good',
+                    'Received By': ret.received_by || '-'
+                }));
+            } else if (tableId === 'remindersTable') {
+                rows = (rentalData.reminders || []).map((rem, idx) => ({
+                    'S.No': idx + 1,
+                    'Department': rem.dept_name || '-',
+                    'Zone': rem.zone_name || '-',
+                    'Custodian Officer': rem.custodian_officer || '-',
+                    'Contact No': rem.contact_no || '-',
+                    'Issued Systems': rem.issued_systems_qty || 0,
+                    'Issued Printers': rem.issued_printers_qty || 0,
+                    'Issued Laptops': rem.issued_laptops_qty || 0,
+                    'Issued Date': rem.issued_date || '-',
+                    'Return Due Date': rem.issued_to_date || '-',
+                    'Calculated Status': rem.status_label || '-'
+                }));
+            } else if (tableId === 'masterReportTable') {
+                rows = (rentalData.issuedAssets || []).map((iss, idx) => ({
+                    'S.No': idx + 1,
+                    'Department': iss.dept_name || '-',
+                    'Tapal No': iss.tapal_no || '-',
+                    'Custodian Officer': iss.custodian_officer || '-',
+                    'Issued Date': iss.issued_date || '-',
+                    'Return Due Date': iss.issued_to_date || '-',
+                    'Issued Systems': iss.issued_systems_qty || 0,
+                    'Issued Printers': iss.issued_printers_qty || 0,
+                    'Issued Laptops': iss.issued_laptops_qty || 0,
+                    'Total Issued Qty': iss.total_issued_qty || 0,
+                    'Status': iss.status || 'Issued'
+                }));
+            }
+
+            if (rows.length > 0) {
+                const ws = XLSX.utils.json_to_sheet(rows);
+                const wb = XLSX.utils.book_new();
+                XLSX.utils.book_append_sheet(wb, ws, "Sheet1");
+                XLSX.writeFile(wb, `${fileName}_${formatDate(TODAY)}.xlsx`);
+                showToast(`Exported ${rows.length} records to ${fileName}.xlsx`);
+            } else {
+                const table = document.getElementById(tableId);
+                if (table) {
+                    const wb = XLSX.utils.table_to_book(table, { sheet: "Sheet1" });
+                    XLSX.writeFile(wb, `${fileName}_${formatDate(TODAY)}.xlsx`);
+                    showToast(`Exported ${fileName}.xlsx successfully.`);
+                }
+            }
         }
 
         // Chart.js Visuals
diff --git a/src/main/resources/templates/gcctonermanagement/details.html b/src/main/resources/templates/gcctonermanagement/details.html
new file mode 100644
index 0000000..7f318de
--- /dev/null
+++ b/src/main/resources/templates/gcctonermanagement/details.html
@@ -0,0 +1,1637 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org" lang="en">
+
+<head>
+    <script th:inline="javascript">
+        /*<![CDATA[*/
+        (function () {
+            const currentUser = /*[[${session.toner_usrName}]]*/ null;
+            if (currentUser && sessionStorage.getItem("toner_usrName") !== currentUser) {
+                window.location.replace(/*[[@{/gcctonermanagement/login}]]*/ '/gcctonermanagement/login');
+            }
+        })();
+        const IS_ADMIN = /*[[${isAdmin}]]*/ false;
+        const USER_ROLE = /*[[${session.toner_usrRole}]]*/ 'USER';
+        /*]]>*/
+    </script>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Drilldown Details - GCC Toner Management Portal</title>
+
+    <!-- CSRF Tokens -->
+    <meta th:if="${_csrf != null}" name="_csrf" th:content="${_csrf.token}" />
+    <meta th:if="${_csrf != null}" name="_csrf_header" th:content="${_csrf.headerName}" />
+
+    <!-- Google Fonts -->
+    <link
+        href="https://fonts.googleapis.com/css2?family=Outfit:wght@300;400;500;600;700&family=Poppins:wght@300;400;500;600;700&display=swap"
+        rel="stylesheet">
+
+    <!-- Bootstrap & FontAwesome CSS -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css">
+    <link rel="stylesheet" th:href="@{/assets/font-awesome-6.5.2/css/all.min.css}" type="text/css">
+
+    <!-- JS Libraries -->
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+    <script src="https://cdn.jsdelivr.net/npm/xlsx@0.18.5/dist/xlsx.full.min.js"></script>
+
+    <style>
+        :root {
+            --primary-color: #0f5c78;
+            --primary-dark: #083b4e;
+            --primary-light: #e0f2fe;
+            --primary-border: #bae6fd;
+            --accent-color: #06b6d4;
+            --success-color: #10b981;
+            --warning-color: #f59e0b;
+            --danger-color: #ef4444;
+            --text-dark: #1e293b;
+            --text-muted: #64748b;
+            --border-color: #cbd5e1;
+            --card-bg: #ffffff;
+            --body-bg: #f8fafc;
+        }
+
+        body {
+            background-color: var(--body-bg);
+            font-family: 'Poppins', sans-serif;
+            color: var(--text-dark);
+            min-height: 100vh;
+        }
+
+        /* Top Navbar */
+        .navbar-custom {
+            background: linear-gradient(135deg, #0f5c78 0%, #083b4e 100%);
+            box-shadow: 0 4px 15px rgba(0, 0, 0, 0.15);
+            padding: 12px 24px;
+        }
+
+        .navbar-brand {
+            font-family: 'Outfit', sans-serif;
+            font-weight: 700;
+            font-size: 1.35rem;
+            color: #ffffff !important;
+            letter-spacing: 0.5px;
+        }
+
+        .btn-back {
+            background: rgba(255, 255, 255, 0.15);
+            border: 1px solid rgba(255, 255, 255, 0.35);
+            color: #ffffff !important;
+            padding: 6px 16px;
+            border-radius: 8px;
+            font-size: 0.86rem;
+            font-weight: 600;
+            text-decoration: none;
+            transition: all 0.2s ease;
+        }
+
+        .btn-back:hover {
+            background: rgba(255, 255, 255, 0.28);
+            border-color: #ffffff;
+            transform: translateX(-2px);
+        }
+
+        .user-indicator {
+            display: flex;
+            align-items: center;
+            gap: 8px;
+            background: rgba(255, 255, 255, 0.12);
+            padding: 6px 14px;
+            border-radius: 20px;
+            border: 1px solid rgba(255, 255, 255, 0.25);
+            color: #ffffff;
+            font-size: 0.85rem;
+            font-weight: 600;
+        }
+
+        .btn-logout {
+            background: #ef4444;
+            color: #ffffff !important;
+            padding: 6px 14px;
+            border-radius: 8px;
+            font-size: 0.84rem;
+            font-weight: 600;
+            text-decoration: none;
+            transition: all 0.2s;
+        }
+
+        .btn-logout:hover {
+            background: #dc2626;
+        }
+
+        /* Card Custom */
+        .card-custom {
+            background: var(--card-bg);
+            border-radius: 14px;
+            border: 1px solid #e2e8f0;
+            box-shadow: 0 4px 12px rgba(0, 0, 0, 0.03);
+            padding: 24px;
+            margin-bottom: 24px;
+        }
+
+        .form-control-custom {
+            border-radius: 8px;
+            border: 1px solid #cbd5e1;
+            padding: 9px 14px;
+            font-size: 0.9rem;
+            transition: all 0.2s;
+            width: 100%;
+            background-color: #ffffff;
+        }
+
+        .form-control-custom:focus {
+            border-color: #0f5c78;
+            box-shadow: 0 0 0 3px rgba(15, 92, 120, 0.15);
+            outline: none;
+        }
+
+        /* Metrics Grid */
+        .metrics-grid {
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(210px, 1fr));
+            gap: 16px;
+        }
+
+        .metric-card {
+            background: #ffffff;
+            border-radius: 12px;
+            padding: 20px 22px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            box-shadow: 0 4px 12px rgba(0, 0, 0, 0.03);
+            border: 1px solid #e2e8f0;
+            position: relative;
+            overflow: hidden;
+            transition: all 0.2s ease;
+        }
+
+        .metric-card:hover {
+            transform: translateY(-2px);
+            box-shadow: 0 8px 16px rgba(0, 0, 0, 0.06);
+        }
+
+        .metric-card::before {
+            content: '';
+            position: absolute;
+            left: 0;
+            top: 0;
+            bottom: 0;
+            width: 5px;
+        }
+
+        .card-indigo::before {
+            background: #6366f1;
+        }
+
+        .card-blue::before {
+            background: #0284c7;
+        }
+
+        .card-cyan::before {
+            background: #0891b2;
+        }
+
+        .card-green::before {
+            background: #10b981;
+        }
+
+        .card-amber::before {
+            background: #f59e0b;
+        }
+
+        .card-indigo .metric-value {
+            color: #4338ca;
+        }
+
+        .card-blue .metric-value {
+            color: #0369a1;
+        }
+
+        .card-cyan .metric-value {
+            color: #0e7490;
+        }
+
+        .card-green .metric-value {
+            color: #047857;
+        }
+
+        .card-amber .metric-value {
+            color: #b45309;
+        }
+
+        .metric-info {
+            display: flex;
+            flex-direction: column;
+            gap: 4px;
+        }
+
+        .metric-label {
+            font-size: 0.76rem;
+            font-weight: 700;
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
+            color: #64748b;
+        }
+
+        .metric-value {
+            font-size: 1.85rem;
+            font-weight: 800;
+            font-family: 'Outfit', sans-serif;
+            line-height: 1.2;
+        }
+
+        .metric-icon {
+            font-size: 2.2rem;
+            opacity: 0.15;
+            color: #1e293b;
+        }
+
+
+
+        /* Table Styling with Strict Vertical Borders */
+        .details-table {
+            width: 100%;
+            border-collapse: collapse !important;
+            border: 1px solid #cbd5e1 !important;
+            font-size: 0.83rem;
+            background: #ffffff;
+        }
+
+        .details-table th,
+        .details-table td {
+            border: 1px solid #cbd5e1 !important;
+            padding: 10px 12px;
+            vertical-align: middle;
+        }
+
+        .details-table thead th {
+            background-color: #f1f5f9 !important;
+            color: #334155 !important;
+            font-weight: 700;
+            font-size: 0.75rem;
+            text-transform: uppercase;
+            letter-spacing: 0.4px;
+            border-bottom: 2px solid #94a3b8 !important;
+            white-space: nowrap;
+        }
+
+        .details-table tbody tr:hover {
+            background-color: #f8fafc;
+        }
+
+        /* Models plain text styling */
+        .badge-toner-model {
+            color: #0f172a;
+            font-weight: 600;
+            display: inline-block;
+        }
+
+        .badge-printer-model {
+            color: #334155;
+            font-weight: 500;
+            display: inline-block;
+        }
+
+        .status-badge-pending {
+            background: #fef3c7;
+            color: #92400e;
+            border: 1px solid #fde68a;
+            font-weight: 700;
+            padding: 4px 10px;
+            border-radius: 20px;
+            font-size: 0.74rem;
+        }
+
+        .status-badge-delivered {
+            background: #dcfce7;
+            color: #166534;
+            border: 1px solid #bbf7d0;
+            font-weight: 700;
+            padding: 4px 10px;
+            border-radius: 20px;
+            font-size: 0.74rem;
+        }
+
+        .status-badge-partial {
+            background: #ffedd5;
+            color: #c2410c;
+            border: 1px solid #fed7aa;
+            font-weight: 700;
+            padding: 4px 10px;
+            border-radius: 20px;
+            font-size: 0.74rem;
+        }
+
+        /* Active context badge */
+        .active-filter-badge {
+            background: linear-gradient(135deg, #0f5c78 0%, #083b4e 100%);
+            color: #ffffff;
+            font-size: 0.8rem;
+            font-weight: 700;
+            padding: 6px 14px;
+            border-radius: 20px;
+            letter-spacing: 0.5px;
+            display: inline-flex;
+            align-items: center;
+            gap: 6px;
+        }
+
+        .printer-header-card {
+            background: linear-gradient(135deg, #ffffff 0%, #f0fdf4 100%);
+            border: 1.5px solid #bbf7d0;
+            border-radius: 14px;
+            padding: 20px 24px;
+            margin-bottom: 24px;
+        }
+
+        /* Pagination */
+        .pagination-container {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            flex-wrap: gap;
+            padding-top: 16px;
+        }
+
+        .pagination-btn {
+            background: #ffffff;
+            border: 1px solid #cbd5e1;
+            color: #334155;
+            padding: 6px 12px;
+            border-radius: 6px;
+            font-size: 0.82rem;
+            font-weight: 600;
+            cursor: pointer;
+            transition: all 0.15s;
+        }
+
+        .pagination-btn:hover:not(:disabled) {
+            background: #0f5c78;
+            color: #ffffff;
+            border-color: #0f5c78;
+        }
+
+        .pagination-btn:disabled {
+            opacity: 0.5;
+            cursor: not-allowed;
+        }
+
+        .pagination-btn.active {
+            background: #0f5c78;
+            color: #ffffff;
+            border-color: #0f5c78;
+        }
+    </style>
+</head>
+
+<body>
+    <!-- Top Navbar -->
+    <nav class="navbar navbar-expand-lg navbar-custom mb-4">
+        <div class="container-fluid px-3">
+            <a class="navbar-brand d-flex align-items-center gap-2" th:href="@{/gcctonermanagement/upload}">
+                <i class="fa-solid fa-print text-warning fs-4"></i>
+                <span>GCC Toner Management - Drilldown Details View</span>
+            </a>
+            <div class="d-flex align-items-center gap-2 gap-sm-3">
+                <a th:href="@{/gcctonermanagement/upload}" class="btn-back d-flex align-items-center gap-2 shadow-sm">
+                    <i class="fa-solid fa-arrow-left"></i> <span>Back to Dashboard</span>
+                </a>
+                <div class="user-indicator d-none d-md-flex">
+                    <i class="fa-solid fa-circle-user text-warning"></i>
+                    <span th:text="${usrName}">User</span>
+                    <span class="badge bg-warning text-dark px-2 py-0.5" style="font-size: 10px;">USER</span>
+                </div>
+                <a th:href="@{/gcctonermanagement/logout}" class="btn-logout shadow-sm">
+                    <i class="fa-solid fa-right-from-bracket me-1"></i> Logout
+                </a>
+            </div>
+        </div>
+    </nav>
+
+    <!-- Main Content Container -->
+    <div class="container-fluid px-3 px-lg-4 pb-5">
+
+        <!-- Top Header & Context Card -->
+        <div class="card-custom mb-4">
+            <div class="d-flex justify-content-between align-items-center flex-wrap gap-3 mb-3">
+                <div>
+                    <div class="d-flex align-items-center gap-2 mb-1">
+                        <div
+                            style="width: 36px; height: 36px; border-radius: 8px; background: #e0f2fe; color: #0369a1; display: flex; align-items: center; justify-content: center; font-size: 1.1rem;">
+                            <i class="fa-solid fa-sliders"></i>
+                        </div>
+                        <h4 class="fw-bold m-0" style="color: #0f5c78;" id="drilldown-page-title">
+                            Printer Model Stock & Distribution Details
+                        </h4>
+                    </div>
+                    <small class="text-muted">
+                        Detailed register reports, stock metrics, and distribution ledger data for the selected printer
+                        model.
+                    </small>
+                </div>
+                <div class="d-flex align-items-center gap-2 flex-wrap">
+                    <span class="active-filter-badge" id="drilldown-active-context-badge">
+                        <i class="fa-solid fa-print"></i> MODEL: ALL PRINTERS
+                    </span>
+                    <button type="button"
+                        class="btn btn-success btn-sm fw-semibold px-3 py-2 d-inline-flex align-items-center gap-1 shadow-sm"
+                        onclick="exportDrilldownToExcel()" style="border-radius: 8px;">
+                        <i class="fa-solid fa-file-excel"></i> Export to Excel
+                    </button>
+                    <a th:href="@{/gcctonermanagement/upload}"
+                        class="btn btn-outline-secondary btn-sm fw-semibold px-3 py-2 d-inline-flex align-items-center gap-1 shadow-sm"
+                        style="border-radius: 8px;">
+                        <i class="fa-solid fa-arrow-left"></i> Back to Dashboard
+                    </a>
+                </div>
+            </div>
+        </div>
+
+        <!-- Metric Quantities For Selected Printer Model (Below Quantities for each category) -->
+        <div class="mb-4">
+            <div class="d-flex justify-content-between align-items-center mb-2 px-1">
+                <span class="text-uppercase fw-bold text-secondary" style="font-size: 0.82rem; letter-spacing: 0.5px;"
+                    id="metrics-section-title">
+                    <i class="fa-solid fa-chart-simple text-primary me-1"></i> Aggregated Quantities for Selected
+                    Printer Model
+                </span>
+                <span class="badge bg-light text-dark border px-2 py-1" id="metrics-period-indicator">
+                    <i class="fa-solid fa-clock me-1"></i> All Time
+                </span>
+            </div>
+            <div class="metrics-grid">
+                <div class="metric-card card-indigo cursor-pointer"
+                    onclick="switchReportTypeFromMetric('workorder_register')" title="View Workorder Register">
+                    <div class="metric-info">
+                        <span class="metric-label">Total Workorder Qty</span>
+                        <span class="metric-value" id="drilldown-metric-workorder">0</span>
+                    </div>
+                    <i class="fa-solid fa-file-contract metric-icon"></i>
+                </div>
+                <div class="metric-card card-blue cursor-pointer" onclick="switchReportTypeFromMetric('inward_stock')"
+                    title="View Inward Register">
+                    <div class="metric-info">
+                        <span class="metric-label">Total Inward / In Hand</span>
+                        <span class="metric-value" id="drilldown-metric-inward">0</span>
+                    </div>
+                    <i class="fa-solid fa-boxes-packing metric-icon"></i>
+                </div>
+                <div class="metric-card card-cyan cursor-pointer" onclick="switchReportTypeFromMetric('user_requests')"
+                    title="View User Requests">
+                    <div class="metric-info">
+                        <span class="metric-label">Total Qty Requested</span>
+                        <span class="metric-value" id="drilldown-metric-requested">0</span>
+                    </div>
+                    <i class="fa-solid fa-file-invoice metric-icon"></i>
+                </div>
+                <div class="metric-card card-green cursor-pointer"
+                    onclick="switchReportTypeFromMetric('outward_history')" title="View Outward Distribution">
+                    <div class="metric-info">
+                        <span class="metric-label">Total Delivered Qty</span>
+                        <span class="metric-value" id="drilldown-metric-delivered">0</span>
+                    </div>
+                    <i class="fa-solid fa-truck-ramp-box metric-icon"></i>
+                </div>
+                <div class="metric-card card-amber cursor-pointer" onclick="switchReportTypeFromMetric('stock_summary')"
+                    title="View Stock Summary">
+                    <div class="metric-info">
+                        <span class="metric-label">Available In-Hand Stock</span>
+                        <span class="metric-value" id="drilldown-metric-available">0</span>
+                    </div>
+                    <i class="fa-solid fa-warehouse metric-icon"></i>
+                </div>
+            </div>
+        </div>
+
+
+        <!-- Dynamic Datatable Card -->
+        <div class="card-custom" id="drilldown-datatable-card">
+            <!-- Table Header Toolbar -->
+            <div class="d-flex justify-content-between align-items-center mb-3 flex-wrap gap-3">
+                <div class="d-flex align-items-center gap-2 flex-wrap">
+                    <h5 class="fw-bold m-0" style="color: #0f5c78;" id="table-dynamic-heading">
+                        <i class="fa-solid fa-table me-2"></i>User Request Details Report
+                    </h5>
+                    <span class="badge bg-primary px-2.5 py-1" id="table-total-records-badge"
+                        style="font-size: 0.82rem;">
+                        0 Records
+                    </span>
+                </div>
+                <div class="d-flex align-items-center gap-2 flex-wrap">
+                    <button type="button"
+                        class="btn btn-sm btn-outline-success fw-semibold px-3 py-1.5 d-inline-flex align-items-center gap-1 shadow-sm"
+                        onclick="exportDrilldownToExcel()" style="border-radius: 8px;">
+                        <i class="fa-solid fa-file-excel"></i> Export Excel
+                    </button>
+                </div>
+            </div>
+
+            <!-- Page Size & Quick Search Control Bar -->
+            <div class="d-flex justify-content-between align-items-center flex-wrap gap-2 mb-3 pb-2 border-bottom">
+                <div class="d-flex align-items-center gap-2">
+                    <span class="text-secondary fw-semibold" style="font-size: 0.85rem;">Show</span>
+                    <select id="drilldown-page-size-select" class="form-select form-select-sm" style="width: 85px;"
+                        onchange="onPageSizeSelectChange(this.value)">
+                        <option value="15">15</option>
+                        <option value="20" selected>20</option>
+                        <option value="50">50</option>
+                        <option value="100">100</option>
+                        <option value="all">All</option>
+                    </select>
+                    <span class="text-secondary fw-semibold" style="font-size: 0.85rem;">entries</span>
+                </div>
+                <div class="d-flex align-items-center gap-2">
+                    <span class="text-secondary fw-semibold" style="font-size: 0.85rem;">Search:</span>
+                    <input type="text" id="drilldown-quick-search" class="form-control form-control-sm"
+                        style="width: 260px; border-radius: 6px;" placeholder="Search in records..."
+                        oninput="onQuickSearchInput(this.value)">
+                </div>
+            </div>
+
+            <!-- Table Responsive Container with Full Vertical Lines -->
+            <div class="table-responsive" style="max-height: 560px; overflow-y: auto;">
+                <table class="table details-table table-hover align-middle mb-0" id="drilldown-main-table">
+                    <thead id="drilldown-table-head">
+                        <!-- Populated dynamically based on report view -->
+                    </thead>
+                    <tbody id="drilldown-table-body">
+                        <tr>
+                            <td colspan="12" class="text-center py-4 text-muted">
+                                <i class="fa-solid fa-spinner fa-spin fa-2x mb-2 text-primary"></i>
+                                <p class="mb-0">Loading drilldown report records...</p>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+
+            <!-- Pagination Toolbar -->
+            <div class="pagination-container">
+                <div class="text-muted fw-semibold" style="font-size: 0.84rem;" id="drilldown-pagination-info">
+                    Showing 0 to 0 of 0 entries
+                </div>
+                <div class="d-flex align-items-center gap-1" id="drilldown-pagination-controls">
+                    <!-- Dynamic page buttons -->
+                </div>
+            </div>
+        </div>
+
+    </div>
+
+    <!-- Generic Document Viewer Modal -->
+    <div class="modal fade" id="drilldownDocModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-lg modal-dialog-centered">
+            <div class="modal-content" style="border-radius: 12px; overflow: hidden;">
+                <div class="modal-header text-white" style="background: #0f5c78;">
+                    <h5 class="modal-title fw-bold" id="drilldownDocModalTitle">
+                        <i class="fa-solid fa-file-pdf me-2"></i>Document Preview
+                    </h5>
+                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"
+                        aria-label="Close"></button>
+                </div>
+                <div class="modal-body p-0" style="min-height: 480px; background: #e2e8f0;">
+                    <iframe id="drilldownDocIframe" src="" style="width: 100%; height: 500px; border: none;"></iframe>
+                </div>
+                <div class="modal-footer py-2">
+                    <a id="drilldownDocDownloadBtn" href="#" target="_blank" class="btn btn-sm btn-primary">
+                        <i class="fa-solid fa-arrow-up-right-from-square me-1"></i> Open in New Tab
+                    </a>
+                    <button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Core JavaScript Logic -->
+    <script th:inline="javascript">
+        /*<![CDATA[*/
+        const contextPath = /*[[@{/}]]*/ '/';
+
+        // URL Parameters & State
+        let urlPrinterId = '';
+        let urlPrinterName = '';
+        let urlTonerId = '';
+        let urlReportType = 'user_requests';
+
+        // Cached datasets
+        let masterPrintersCached = [];
+        let masterTonersCached = [];
+        let masterDeptsCached = [];
+        let masterZonesCached = [];
+        let userRequestsCached = [];
+        let inwardHistoryCached = [];
+        let outwardHistoryCached = [];
+        let workorderHistoryCached = [];
+        let stockSummaryCached = [];
+
+        // Active filter state
+        let activePrinterId = '';
+        let activeTonerId = '';
+        let activeReportType = 'user_requests';
+        let activeDept = '';
+        let activeZone = '';
+        let activeStatus = '';
+        let activePeriodPreset = 'all';
+        let activeFromDate = '';
+        let activeToDate = '';
+        let activeQuickSearch = '';
+
+        // Pagination state
+        let currentPage = 1;
+        let pageSize = 20;
+        let currentFilteredRecords = [];
+
+        // Colors for Toner Cards
+        const PALETTES = [
+            { primary: '#0284c7', light: '#f0f9ff', border: '#bae6fd' },
+            { primary: '#10b981', light: '#ecfdf5', border: '#a7f3d0' },
+            { primary: '#8b5cf6', light: '#f5f3ff', border: '#ddd6fe' },
+            { primary: '#f59e0b', light: '#fffbeb', border: '#fde68a' },
+            { primary: '#ec4899', light: '#fdf2f8', border: '#fbcfe8' },
+            { primary: '#06b6d4', light: '#ecfeff', border: '#a5f3fc' },
+            { primary: '#6366f1', light: '#eef2ff', border: '#c7d2fe' }
+        ];
+
+        function escapeHtml(text) {
+            if (text === null || text === undefined) return '';
+            return String(text)
+                .replace(/&/g, '&amp;')
+                .replace(/</g, '&lt;')
+                .replace(/>/g, '&gt;')
+                .replace(/"/g, '&quot;')
+                .replace(/'/g, '&#39;');
+        }
+
+        function resolveUploadUrl(path) {
+            if (!path) return '#';
+            let clean = String(path).trim();
+            if (clean.startsWith('.')) clean = clean.substring(1);
+            if (clean.startsWith('/')) clean = clean.substring(1);
+            return contextPath + clean;
+        }
+
+        function formatDateOnly(dateStr) {
+            if (!dateStr) return '-';
+            try {
+                const s = String(dateStr).trim();
+                if (/^\d{4}-\d{2}-\d{2}/.test(s)) {
+                    const parts = s.substring(0, 10).split('-');
+                    return `${parts[2]}-${parts[1]}-${parts[0]}`;
+                }
+                const d = new Date(dateStr);
+                if (isNaN(d.getTime())) return s;
+                const dd = String(d.getDate()).padStart(2, '0');
+                const mm = String(d.getMonth() + 1).padStart(2, '0');
+                const yyyy = d.getFullYear();
+                return `${dd}-${mm}-${yyyy}`;
+            } catch (e) {
+                return dateStr;
+            }
+        }
+
+        // Initialize on DOM load
+        document.addEventListener('DOMContentLoaded', () => {
+            parseUrlParams();
+            fetchAllInitialDatasets();
+        });
+
+        function parseUrlParams() {
+            const params = new URLSearchParams(window.location.search);
+            urlPrinterId = params.get('printerId') || '';
+            urlPrinterName = params.get('printerName') || '';
+            urlTonerId = params.get('tonerId') || '';
+            urlReportType = params.get('reportType') || 'user_requests';
+
+            activePrinterId = urlPrinterId;
+            activeTonerId = urlTonerId;
+            activeReportType = urlReportType;
+
+            const repSelect = document.getElementById('drilldown-report-type');
+            if (repSelect) repSelect.value = activeReportType;
+        }
+
+        function updateUrlParams() {
+            const params = new URLSearchParams();
+            if (activePrinterId) {
+                params.append('printerId', activePrinterId);
+                const pObj = masterPrintersCached.find(p => String(p.id) === String(activePrinterId));
+                if (pObj) params.append('printerName', pObj.printer_name);
+            }
+            if (activeTonerId) params.append('tonerId', activeTonerId);
+            if (activeReportType && activeReportType !== 'user_requests') {
+                params.append('reportType', activeReportType);
+            }
+            const newUrl = window.location.pathname + (params.toString() ? '?' + params.toString() : '');
+            window.history.replaceState({}, '', newUrl);
+        }
+
+        async function fetchAllInitialDatasets() {
+            try {
+                const ts = Date.now();
+                const [printers, toners, depts, zones, requests, inward, outward, workorders, report] = await Promise.all([
+                    fetch(contextPath + 'gcctonermanagement/api/printers?_=' + ts).then(r => r.json()).catch(() => []),
+                    fetch(contextPath + 'gcctonermanagement/api/toners/all?_=' + ts).then(r => r.json()).catch(() => []),
+                    fetch(contextPath + 'gcctonermanagement/api/departments?_=' + ts).then(r => r.json()).catch(() => []),
+                    fetch(contextPath + 'gcctonermanagement/api/zones?_=' + ts).then(r => r.json()).catch(() => []),
+                    fetch(contextPath + 'gcctonermanagement/api/requests/list?_=' + ts).then(r => r.json()).catch(() => []),
+                    fetch(contextPath + 'gcctonermanagement/api/inward/list?_=' + ts).then(r => r.json()).catch(() => []),
+                    fetch(contextPath + 'gcctonermanagement/api/outward/list?_=' + ts).then(r => r.json()).catch(() => []),
+                    fetch(contextPath + 'gcctonermanagement/api/workorder/history?_=' + ts).then(r => r.json()).catch(() => []),
+                    fetch(contextPath + 'gcctonermanagement/api/report?_=' + ts).then(r => r.json()).catch(() => ({}))
+                ]);
+
+                masterPrintersCached = (printers || []).filter(p => !p.is_delete && (p.is_active === undefined || p.is_active == 1));
+                masterTonersCached = (toners || []).filter(t => !t.is_delete && (t.is_active === undefined || t.is_active == 1));
+                masterDeptsCached = depts || [];
+                masterZonesCached = zones || [];
+                userRequestsCached = requests || [];
+                inwardHistoryCached = inward || [];
+                outwardHistoryCached = outward || [];
+                workorderHistoryCached = workorders || [];
+                stockSummaryCached = (report && report.summary) ? report.summary : [];
+
+                populateDropdowns();
+                syncViewForSelectedPrinter();
+            } catch (err) {
+                console.error("Error loading drilldown datasets:", err);
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Load Failed',
+                    text: 'Could not load inventory datasets. Please refresh the page.'
+                });
+            }
+        }
+
+        function populateDropdowns() {
+            // Populate Printers Dropdown
+            const pSel = document.getElementById('drilldown-printer-select');
+            if (pSel) {
+                pSel.innerHTML = '<option value="">-- All Printer Models --</option>';
+                masterPrintersCached.forEach(p => {
+                    const opt = document.createElement('option');
+                    opt.value = p.id;
+                    opt.textContent = p.printer_name;
+                    pSel.appendChild(opt);
+                });
+                if (activePrinterId) {
+                    pSel.value = activePrinterId;
+                }
+            }
+
+            // Populate Departments Dropdown
+            const deptSel = document.getElementById('drilldown-dept-filter');
+            if (deptSel) {
+                deptSel.innerHTML = '<option value="">-- All Departments --</option>';
+                const depts = [...new Set(masterDeptsCached.map(d => d.dept_name || d.department_name || d.name).filter(Boolean))].sort();
+                depts.forEach(d => {
+                    const opt = document.createElement('option');
+                    opt.value = d;
+                    opt.textContent = d;
+                    deptSel.appendChild(opt);
+                });
+            }
+
+            // Populate Zones Dropdown
+            const zoneSel = document.getElementById('drilldown-zone-filter');
+            if (zoneSel) {
+                zoneSel.innerHTML = '<option value="">-- All Zones --</option>';
+                const zones = [...new Set(masterZonesCached.map(z => z.zone_name || z.name).filter(Boolean))].sort();
+                zones.forEach(z => {
+                    const opt = document.createElement('option');
+                    opt.value = z;
+                    opt.textContent = z;
+                    zoneSel.appendChild(opt);
+                });
+            }
+
+            populateTonerDropdown();
+        }
+
+        function populateTonerDropdown() {
+            const tSel = document.getElementById('drilldown-toner-select');
+            if (!tSel) return;
+
+            let filteredToners = masterTonersCached;
+            if (activePrinterId) {
+                filteredToners = filteredToners.filter(t => String(t.pid || t.printer_id) === String(activePrinterId));
+            }
+
+            tSel.innerHTML = `<option value="">-- ${activePrinterId ? 'All Toners for Selected Model' : 'All Toner Models'} --</option>`;
+            filteredToners.forEach(t => {
+                const opt = document.createElement('option');
+                opt.value = t.id || t.tid;
+                opt.textContent = t.model_name || t.toner_model || `Toner #${t.id}`;
+                tSel.appendChild(opt);
+            });
+
+            if (activeTonerId) {
+                tSel.value = activeTonerId;
+            }
+        }
+
+        function onDrilldownPrinterChange(val) {
+            activePrinterId = val ? String(val).trim() : '';
+            activeTonerId = ''; // Reset toner when printer changes
+            populateTonerDropdown();
+            updateUrlParams();
+            syncViewForSelectedPrinter();
+        }
+
+        function onDrilldownTonerChange(val) {
+            activeTonerId = val ? String(val).trim() : '';
+            const tSel = document.getElementById('drilldown-toner-select');
+            if (tSel) tSel.value = activeTonerId;
+
+            updateUrlParams();
+            applyDrilldownFilters(1);
+        }
+
+        function onDrilldownReportTypeChange(val) {
+            activeReportType = val;
+            updateUrlParams();
+            applyDrilldownFilters(1);
+        }
+
+        function switchReportTypeFromMetric(repType) {
+            activeReportType = repType;
+            const repSelect = document.getElementById('drilldown-report-type');
+            if (repSelect) repSelect.value = repType;
+            updateUrlParams();
+            applyDrilldownFilters(1);
+
+            const card = document.getElementById('drilldown-datatable-card');
+            if (card) card.scrollIntoView({ behavior: 'smooth' });
+        }
+
+        function onDrilldownPeriodPresetChange() {
+            const val = document.getElementById('drilldown-period-preset')?.value || 'all';
+            activePeriodPreset = val;
+
+            const fromWrap = document.getElementById('drilldown-from-date-wrapper');
+            const toWrap = document.getElementById('drilldown-to-date-wrapper');
+            if (val === 'custom') {
+                if (fromWrap) fromWrap.style.display = 'block';
+                if (toWrap) toWrap.style.display = 'block';
+            } else {
+                if (fromWrap) fromWrap.style.display = 'none';
+                if (toWrap) toWrap.style.display = 'none';
+                const fIn = document.getElementById('drilldown-from-date');
+                const tIn = document.getElementById('drilldown-to-date');
+                if (fIn) fIn.value = '';
+                if (tIn) tIn.value = '';
+                activeFromDate = '';
+                activeToDate = '';
+            }
+
+            const indicator = document.getElementById('metrics-period-indicator');
+            if (indicator) {
+                const label = val === 'all' ? 'All Time' : (val.toUpperCase());
+                indicator.innerHTML = `<i class="fa-solid fa-clock me-1"></i> ${label}`;
+            }
+
+            calculateAndRenderMetrics();
+            applyDrilldownFilters(1);
+        }
+
+        function resetAllDrilldownFilters() {
+            activePrinterId = '';
+            activeTonerId = '';
+            activeReportType = 'user_requests';
+            activeDept = '';
+            activeZone = '';
+            activeStatus = '';
+            activePeriodPreset = 'all';
+            activeFromDate = '';
+            activeToDate = '';
+            activeQuickSearch = '';
+
+            const setVal = (id, val) => { const el = document.getElementById(id); if (el) el.value = val; };
+            setVal('drilldown-printer-select', '');
+            setVal('drilldown-toner-select', '');
+            setVal('drilldown-report-type', 'user_requests');
+            setVal('drilldown-period-preset', 'all');
+            setVal('drilldown-dept-filter', '');
+            setVal('drilldown-zone-filter', '');
+            setVal('drilldown-status-filter', '');
+            setVal('drilldown-quick-search', '');
+            const fromW = document.getElementById('drilldown-from-date-wrapper'); if (fromW) fromW.style.display = 'none';
+            const toW = document.getElementById('drilldown-to-date-wrapper'); if (toW) toW.style.display = 'none';
+
+            populateTonerDropdown();
+            updateUrlParams();
+            syncViewForSelectedPrinter();
+        }
+
+        function syncViewForSelectedPrinter() {
+            // Update Header & Badge
+            const pObj = masterPrintersCached.find(p => String(p.id) === String(activePrinterId));
+            const printerName = pObj ? pObj.printer_name : (activePrinterId ? `Printer #${activePrinterId}` : 'ALL PRINTERS');
+
+            const badge = document.getElementById('drilldown-active-context-badge');
+            if (badge) {
+                badge.innerHTML = `<i class="fa-solid fa-print"></i> MODEL: ${escapeHtml(printerName.toUpperCase())}`;
+            }
+
+            const titleText = document.getElementById('drilldown-page-title');
+            if (titleText) {
+                titleText.textContent = activePrinterId
+                    ? `${printerName} - Stock & Distribution Drilldown Details`
+                    : `Printer Models Stock & Distribution Details`;
+            }
+
+            calculateAndRenderMetrics();
+            applyDrilldownFilters(1);
+        }
+
+        // Date Period filter checker
+        function matchesDatePeriod(dateValue) {
+            if (!dateValue || activePeriodPreset === 'all') return true;
+            try {
+                const s = String(dateValue).trim().substring(0, 10);
+                const d = new Date(s);
+                if (isNaN(d.getTime())) return true;
+
+                const today = new Date();
+                today.setHours(0, 0, 0, 0);
+
+                if (activePeriodPreset === 'today') {
+                    const itemDate = new Date(d);
+                    itemDate.setHours(0, 0, 0, 0);
+                    return itemDate.getTime() === today.getTime();
+                } else if (activePeriodPreset === 'week') {
+                    const startOfWeek = new Date(today);
+                    startOfWeek.setDate(today.getDate() - today.getDay());
+                    return d >= startOfWeek;
+                } else if (activePeriodPreset === 'month') {
+                    return d.getMonth() === today.getMonth() && d.getFullYear() === today.getFullYear();
+                } else if (activePeriodPreset === 'last30') {
+                    const past30 = new Date(today);
+                    past30.setDate(today.getDate() - 30);
+                    return d >= past30;
+                } else if (activePeriodPreset === 'year') {
+                    return d.getFullYear() === today.getFullYear();
+                } else if (activePeriodPreset === 'custom') {
+                    const fromStr = document.getElementById('drilldown-from-date')?.value;
+                    const toStr = document.getElementById('drilldown-to-date')?.value;
+                    if (fromStr && d < new Date(fromStr)) return false;
+                    if (toStr && d > new Date(toStr + 'T23:59:59')) return false;
+                    return true;
+                }
+                return true;
+            } catch (e) {
+                return true;
+            }
+        }
+
+        // Calculate and Render Metrics for Selected Printer Model
+        function calculateAndRenderMetrics() {
+            let totalWorkorder = 0;
+            let totalInward = 0;
+            let totalRequested = 0;
+            let totalDelivered = 0;
+
+            // 1. Workorders
+            workorderHistoryCached.forEach(wo => {
+                if (!matchesDatePeriod(wo.workorder_start_date || wo.cdate)) return;
+                const items = wo.items || [wo];
+                items.forEach(it => {
+                    const pid = String(it.pid !== undefined && it.pid !== null ? it.pid : (it.printer_id || '')).trim();
+                    const tid = String(it.tid !== undefined && it.tid !== null ? it.tid : (it.toner_id || '')).trim();
+                    if (activePrinterId && pid !== String(activePrinterId)) return;
+                    if (activeTonerId && tid !== String(activeTonerId)) return;
+                    totalWorkorder += parseInt(it.qty_registered || it.total_qty_registered || 0) || 0;
+                });
+            });
+
+            // 2. Inward Stock
+            inwardHistoryCached.forEach(inw => {
+                if (!matchesDatePeriod(inw.cdate || inw.dc_date)) return;
+                const items = inw.items || [inw];
+                items.forEach(it => {
+                    const pid = String(it.pid !== undefined && it.pid !== null ? it.pid : (it.printer_id || '')).trim();
+                    const tid = String(it.tid !== undefined && it.tid !== null ? it.tid : (it.toner_id || '')).trim();
+                    if (activePrinterId && pid !== String(activePrinterId)) return;
+                    if (activeTonerId && tid !== String(activeTonerId)) return;
+                    totalInward += parseInt(it.qty_registered || it.inward_qty || 0) || 0;
+                });
+            });
+
+            // 3. User Requests
+            userRequestsCached.forEach(req => {
+                if (!matchesDatePeriod(req.request_date || req.cdate)) return;
+                const items = req.items || [req];
+                items.forEach(it => {
+                    const pid = String(it.pid !== undefined && it.pid !== null ? it.pid : (it.printer_id || '')).trim();
+                    const tid = String(it.tid !== undefined && it.tid !== null ? it.tid : (it.toner_id || '')).trim();
+                    if (activePrinterId && pid !== String(activePrinterId)) return;
+                    if (activeTonerId && tid !== String(activeTonerId)) return;
+                    totalRequested += parseInt(it.qty_requested || it.request_qty || 0) || 0;
+                    totalDelivered += parseInt(it.qty_delivered || it.outward_qty || 0) || 0;
+                });
+            });
+
+            // 4. Outward Fallback for delivered if delivered was 0
+            if (totalDelivered === 0 && outwardHistoryCached.length > 0) {
+                outwardHistoryCached.forEach(out => {
+                    if (!matchesDatePeriod(out.dc_date || out.cdate)) return;
+                    const items = out.items || [out];
+                    items.forEach(it => {
+                        const pid = String(it.pid !== undefined && it.pid !== null ? it.pid : (it.printer_id || '')).trim();
+                        const tid = String(it.tid !== undefined && it.tid !== null ? it.tid : (it.toner_id || '')).trim();
+                        if (activePrinterId && pid !== String(activePrinterId)) return;
+                        if (activeTonerId && tid !== String(activeTonerId)) return;
+                        totalDelivered += parseInt(it.qty_delivered || it.qty || 0) || 0;
+                    });
+                });
+            }
+
+            const available = Math.max(0, totalInward - totalDelivered);
+
+            // Update DOM Elements
+            document.getElementById('drilldown-metric-workorder').textContent = totalWorkorder.toLocaleString();
+            document.getElementById('drilldown-metric-inward').textContent = totalInward.toLocaleString();
+            document.getElementById('drilldown-metric-requested').textContent = totalRequested.toLocaleString();
+            document.getElementById('drilldown-metric-delivered').textContent = totalDelivered.toLocaleString();
+            document.getElementById('drilldown-metric-available').textContent = available.toLocaleString();
+        }
+
+
+        // Apply Drilldown Filters & Render Datatable
+        function applyDrilldownFilters(targetPage = 1) {
+            currentPage = targetPage;
+            activeDept = document.getElementById('drilldown-dept-filter')?.value || '';
+            activeZone = document.getElementById('drilldown-zone-filter')?.value || '';
+            activeStatus = document.getElementById('drilldown-status-filter')?.value || '';
+
+            let records = [];
+
+            if (activeReportType === 'user_requests') {
+                records = filterUserRequests();
+            } else if (activeReportType === 'inward_stock') {
+                records = filterInwardStock();
+            } else if (activeReportType === 'outward_history') {
+                records = filterOutwardHistory();
+            } else if (activeReportType === 'stock_summary') {
+                records = filterStockSummary();
+            } else if (activeReportType === 'workorder_register') {
+                records = filterWorkorders();
+            }
+
+            // Quick search filter
+            if (activeQuickSearch) {
+                const q = activeQuickSearch.toLowerCase().trim();
+                records = records.filter(item => {
+                    return JSON.stringify(item).toLowerCase().includes(q);
+                });
+            }
+
+            currentFilteredRecords = records;
+
+            // Update badge & heading
+            const totalBadge = document.getElementById('table-total-records-badge');
+            if (totalBadge) totalBadge.textContent = `${records.length} Records`;
+
+            const heading = document.getElementById('table-dynamic-heading');
+            if (heading) {
+                const reportNames = {
+                    'user_requests': 'User Request Details Report',
+                    'inward_stock': 'Inward Register Stock Report',
+                    'outward_history': 'Outward Distribution History',
+                    'stock_summary': 'Current Stock Summary',
+                    'workorder_register': 'Workorder Register Report'
+                };
+                heading.innerHTML = `<i class="fa-solid fa-table me-2"></i>${reportNames[activeReportType] || 'Report'}`;
+            }
+
+            renderTableHeader();
+            renderTableBody();
+            renderPaginationControls();
+        }
+
+        function filterUserRequests() {
+            let res = [];
+            userRequestsCached.forEach(r => {
+                if (!matchesDatePeriod(r.request_date || r.cdate)) return;
+                if (activeDept && (r.dept_name || r.department_name) !== activeDept) return;
+                if (activeZone && (r.zone_name) !== activeZone) return;
+                if (activeStatus && (r.status || 'Pending').toLowerCase() !== activeStatus.toLowerCase()) return;
+
+                const itcellRef = String(r.itcell_ref_no || r.req_no || r.it_cell_ref_no || '').trim();
+                const docUpload = String(r.user_request_upload || r.dc_upload || r.request_doc || r.letter_file || '').trim();
+
+                const items = r.items || [r];
+                items.forEach(it => {
+                    const pid = String(it.pid !== undefined && it.pid !== null ? it.pid : (it.printer_id || '')).trim();
+                    const tid = String(it.tid !== undefined && it.tid !== null ? it.tid : (it.toner_id || '')).trim();
+                    if (activePrinterId && pid !== String(activePrinterId)) return;
+                    if (activeTonerId && tid !== String(activeTonerId)) return;
+
+                    const itemRef = String(it.itcell_ref_no || it.req_no || it.it_cell_ref_no || itcellRef).trim();
+                    const itemDoc = String(it.user_request_upload || it.dc_upload || it.request_doc || it.letter_file || docUpload).trim();
+
+                    res.push({
+                        ...r,
+                        ...it,
+                        reqId: r.id || it.id,
+                        it_cell_ref_no: itemRef || '-',
+                        dept_name: r.dept_name || it.dept_name || '-',
+                        zone_name: r.zone_name || it.zone_name || '-',
+                        printer_name: it.printer_name || r.printer_name || '-',
+                        model_name: it.model_name || it.toner_model || r.model_name || '-',
+                        qty_req: it.qty_requested || it.request_qty || r.qty_requested || 0,
+                        qty_del: it.qty_delivered || it.outward_qty || r.qty_delivered || 0,
+                        req_date: r.request_date || it.request_date || r.cdate,
+                        cdate: r.cdate || it.cdate,
+                        status: r.status || it.status || 'Pending',
+                        doc_file: itemDoc
+                    });
+                });
+            });
+            return res;
+        }
+
+        function filterInwardStock() {
+            let res = [];
+            inwardHistoryCached.forEach(inw => {
+                if (!matchesDatePeriod(inw.cdate || inw.dc_date)) return;
+                const items = inw.items || [inw];
+                items.forEach(it => {
+                    const pid = String(it.pid !== undefined && it.pid !== null ? it.pid : (it.printer_id || '')).trim();
+                    const tid = String(it.tid !== undefined && it.tid !== null ? it.tid : (it.toner_id || '')).trim();
+                    if (activePrinterId && pid !== String(activePrinterId)) return;
+                    if (activeTonerId && tid !== String(activeTonerId)) return;
+
+                    res.push({
+                        ...inw,
+                        ...it,
+                        dc_no: inw.dc_no || it.dc_no || '-',
+                        dc_date: inw.dc_date || it.dc_date,
+                        vendor_name: inw.vendor_name || it.vendor_name || '-',
+                        printer_name: it.printer_name || inw.printer_name || '-',
+                        model_name: it.model_name || it.toner_model || inw.model_name || '-',
+                        inward_qty: it.qty_registered || it.inward_qty || 0,
+                        cdate: inw.cdate || it.cdate,
+                        dc_file: (inw.dc_uploads && inw.dc_uploads.length > 0) ? inw.dc_uploads[0] : (inw.dc_file || it.dc_file)
+                    });
+                });
+            });
+            return res;
+        }
+
+        function filterOutwardHistory() {
+            let res = [];
+            outwardHistoryCached.forEach(out => {
+                if (!matchesDatePeriod(out.dc_date || out.cdate)) return;
+                if (activeDept && (out.dept_name || out.department_name) !== activeDept) return;
+                if (activeZone && (out.zone_name) !== activeZone) return;
+
+                const items = out.items || [out];
+                items.forEach(it => {
+                    const pid = String(it.pid !== undefined && it.pid !== null ? it.pid : (it.printer_id || '')).trim();
+                    const tid = String(it.tid !== undefined && it.tid !== null ? it.tid : (it.toner_id || '')).trim();
+                    if (activePrinterId && pid !== String(activePrinterId)) return;
+                    if (activeTonerId && tid !== String(activeTonerId)) return;
+
+                    res.push({
+                        ...out,
+                        ...it,
+                        ref_no: out.it_cell_ref_no || out.ref_no || '-',
+                        dept_name: out.dept_name || '-',
+                        zone_name: out.zone_name || '-',
+                        printer_name: it.printer_name || out.printer_name || '-',
+                        model_name: it.model_name || it.toner_model || out.model_name || '-',
+                        outward_qty: it.qty_delivered || it.qty || 0,
+                        del_date: out.dc_date || out.cdate,
+                        doc_file: out.handover_doc || out.dc_file || it.dc_file
+                    });
+                });
+            });
+            return res;
+        }
+
+        function filterStockSummary() {
+            let res = [];
+            stockSummaryCached.forEach(st => {
+                const pid = String(st.pid !== undefined && st.pid !== null ? st.pid : (st.printer_id || '')).trim();
+                const tid = String(st.tid !== undefined && st.tid !== null ? st.tid : (st.id || '')).trim();
+                if (activePrinterId && pid !== String(activePrinterId)) return;
+                if (activeTonerId && tid !== String(activeTonerId)) return;
+
+                res.push({
+                    printer_name: st.printer_name || '-',
+                    model_name: st.model_name || st.toner_model || '-',
+                    workorder_qty: st.workorder_qty || 0,
+                    inward_qty: st.inward_qty || 0,
+                    requested_qty: st.requested_qty || 0,
+                    outward_qty: st.outward_qty || 0,
+                    available_stock: Math.max(0, (parseInt(st.inward_qty || 0) - parseInt(st.outward_qty || 0)))
+                });
+            });
+            return res;
+        }
+
+        function filterWorkorders() {
+            let res = [];
+            workorderHistoryCached.forEach(wo => {
+                if (!matchesDatePeriod(wo.workorder_start_date || wo.cdate)) return;
+                const items = wo.items || [wo];
+                items.forEach(it => {
+                    const pid = String(it.pid !== undefined && it.pid !== null ? it.pid : (it.printer_id || '')).trim();
+                    const tid = String(it.tid !== undefined && it.tid !== null ? it.tid : (it.toner_id || '')).trim();
+                    if (activePrinterId && pid !== String(activePrinterId)) return;
+                    if (activeTonerId && tid !== String(activeTonerId)) return;
+
+                    res.push({
+                        ...wo,
+                        ...it,
+                        ref_no: wo.ref_no || it.ref_no || '-',
+                        file_number: wo.file_number || it.file_number || '-',
+                        vendor_name: wo.vendor_name || it.vendor_name || '-',
+                        printer_name: it.printer_name || wo.printer_name || '-',
+                        model_name: it.model_name || it.toner_model || wo.model_name || '-',
+                        total_qty: it.total_qty_registered || it.qty_registered || 0,
+                        balance_qty: it.balance_qty || 0,
+                        start_date: wo.workorder_start_date || it.workorder_start_date,
+                        end_date: wo.workorder_end_date || it.workorder_end_date,
+                        doc_file: (wo.workorder_copies && wo.workorder_copies.length > 0) ? wo.workorder_copies[0] : wo.doc_file
+                    });
+                });
+            });
+            return res;
+        }
+
+        function renderTableHeader() {
+            const thead = document.getElementById('drilldown-table-head');
+            if (!thead) return;
+
+            if (activeReportType === 'user_requests') {
+                thead.innerHTML = `
+                    <tr>
+                        <th class="text-center" style="width: 50px;">S.No</th>
+                        <th>IT Cell Ref No</th>
+                        <th>Department</th>
+                        <th>Zone</th>
+                        <th>Printer Model</th>
+                        <th>Toner Model</th>
+                        <th class="text-center">Qty Req</th>
+                        <th class="text-center">Qty Delivered</th>
+                        <th>Requested Date</th>
+                        <th>Created Date</th>
+                        <th class="text-center">Status</th>
+                        <th class="text-center">Request Doc</th>
+                    </tr>`;
+            } else if (activeReportType === 'inward_stock') {
+                thead.innerHTML = `
+                    <tr>
+                        <th class="text-center" style="width: 50px;">S.No</th>
+                        <th>DC Number</th>
+                        <th>DC Date</th>
+                        <th>Vendor / Supplier</th>
+                        <th>Printer Model</th>
+                        <th>Toner Model</th>
+                        <th class="text-center">Inward Qty</th>
+                        <th>Received Date</th>
+                        <th class="text-center">DC Copy</th>
+                    </tr>`;
+            } else if (activeReportType === 'outward_history') {
+                thead.innerHTML = `
+                    <tr>
+                        <th class="text-center" style="width: 50px;">S.No</th>
+                        <th>IT Cell Ref No</th>
+                        <th>Department</th>
+                        <th>Zone</th>
+                        <th>Printer Model</th>
+                        <th>Toner Model</th>
+                        <th class="text-center">Delivered Qty</th>
+                        <th>Delivery Date</th>
+                        <th class="text-center">Delivery Slip</th>
+                    </tr>`;
+            } else if (activeReportType === 'stock_summary') {
+                thead.innerHTML = `
+                    <tr>
+                        <th class="text-center" style="width: 50px;">S.No</th>
+                        <th>Printer Model</th>
+                        <th>Toner Model</th>
+                        <th class="text-center">WO Qty</th>
+                        <th class="text-center">Inward Qty</th>
+                        <th class="text-center">Requested Qty</th>
+                        <th class="text-center">Delivered Qty</th>
+                        <th class="text-center">Available Stock</th>
+                        <th class="text-center">Status</th>
+                    </tr>`;
+            } else if (activeReportType === 'workorder_register') {
+                thead.innerHTML = `
+                    <tr>
+                        <th class="text-center" style="width: 50px;">S.No</th>
+                        <th>WO Ref No</th>
+                        <th>File Number</th>
+                        <th>Vendor / Supplier</th>
+                        <th>Printer Model</th>
+                        <th>Toner Model</th>
+                        <th class="text-center">Total Qty</th>
+                        <th class="text-center">Balance Qty</th>
+                        <th>WO Start Date</th>
+                        <th>WO End Date</th>
+                        <th class="text-center">WO Copy</th>
+                    </tr>`;
+            }
+        }
+
+        function renderTableBody() {
+            const tbody = document.getElementById('drilldown-table-body');
+            if (!tbody) return;
+
+            if (currentFilteredRecords.length === 0) {
+                tbody.innerHTML = `
+                    <tr>
+                        <td colspan="12" class="text-center py-5 text-muted">
+                            <i class="fa-solid fa-magnifying-glass fa-2x mb-2 opacity-50"></i>
+                            <p class="mb-0 fw-semibold">No records found matching current printer and filter criteria.</p>
+                        </td>
+                    </tr>`;
+                return;
+            }
+
+            const startIndex = (currentPage - 1) * pageSize;
+            const endIndex = pageSize === 'all' ? currentFilteredRecords.length : Math.min(startIndex + pageSize, currentFilteredRecords.length);
+            const pagedRecords = pageSize === 'all' ? currentFilteredRecords : currentFilteredRecords.slice(startIndex, endIndex);
+
+            let html = '';
+            pagedRecords.forEach((item, index) => {
+                const sNo = startIndex + index + 1;
+
+                if (activeReportType === 'user_requests') {
+                    const statusBadge = item.status === 'Delivered'
+                        ? '<span class="status-badge-delivered"><i class="fa-solid fa-circle-check me-1"></i>Delivered</span>'
+                        : (item.status === 'Partial'
+                            ? '<span class="status-badge-partial"><i class="fa-solid fa-clock-rotate-left me-1"></i>Partial</span>'
+                            : '<span class="status-badge-pending">Pending</span>');
+
+                    const files = (item.doc_file ? String(item.doc_file).split(',') : []).map(f => f.trim()).filter(Boolean);
+                    let docBtn = '<span class="text-muted small">N/A</span>';
+                    if (files.length === 1) {
+                        docBtn = `<button type="button" class="btn btn-sm btn-outline-danger py-0 px-2 fw-semibold" onclick="previewDoc('${resolveUploadUrl(files[0])}', 'Request Letter')"><i class="fa-solid fa-file-pdf me-1"></i>View Letter</button>`;
+                    } else if (files.length > 1) {
+                        docBtn = files.map((f, i) => `<button type="button" class="btn btn-sm btn-outline-danger py-0 px-2 fw-semibold me-1 mb-1" onclick="previewDoc('${resolveUploadUrl(f)}', 'Request Letter ${i + 1}')"><i class="fa-solid fa-file-pdf me-1"></i>Doc ${i + 1}</button>`).join('');
+                    }
+
+                    html += `
+                        <tr>
+                            <td class="text-center fw-semibold text-secondary">${sNo}</td>
+                            <td class="fw-bold font-monospace text-primary">${escapeHtml(item.it_cell_ref_no)}</td>
+                            <td>${escapeHtml(item.dept_name)}</td>
+                            <td>${escapeHtml(item.zone_name)}</td>
+                            <td>${escapeHtml(item.printer_name)}</td>
+                            <td class="fw-semibold text-dark">${escapeHtml(item.model_name)}</td>
+                            <td class="text-center fw-bold font-monospace text-secondary">${item.qty_req}</td>
+                            <td class="text-center fw-bold font-monospace text-success">${item.qty_del}</td>
+                            <td>${formatDateOnly(item.req_date)}</td>
+                            <td><small class="text-muted">${formatDateOnly(item.cdate)}</small></td>
+                            <td class="text-center">${statusBadge}</td>
+                            <td class="text-center">${docBtn}</td>
+                        </tr>`;
+                } else if (activeReportType === 'inward_stock') {
+                    const docBtn = item.dc_file
+                        ? `<button type="button" class="btn btn-sm btn-outline-danger py-0 px-2 fw-semibold" onclick="previewDoc('${resolveUploadUrl(item.dc_file)}', 'Delivery Challan')"><i class="fa-solid fa-file-pdf me-1"></i>View DC</button>`
+                        : `<span class="text-muted small">N/A</span>`;
+
+                    html += `
+                        <tr>
+                            <td class="text-center fw-semibold text-secondary">${sNo}</td>
+                            <td class="fw-bold font-monospace text-dark">${escapeHtml(item.dc_no)}</td>
+                            <td>${formatDateOnly(item.dc_date)}</td>
+                            <td>${escapeHtml(item.vendor_name)}</td>
+                            <td>${escapeHtml(item.printer_name)}</td>
+                            <td class="fw-semibold text-dark">${escapeHtml(item.model_name)}</td>
+                            <td class="text-center fw-bold font-monospace text-primary fs-6">${item.inward_qty}</td>
+                            <td><small class="text-muted">${formatDateOnly(item.cdate)}</small></td>
+                            <td class="text-center">${docBtn}</td>
+                        </tr>`;
+                } else if (activeReportType === 'outward_history') {
+                    const docBtn = item.doc_file
+                        ? `<button type="button" class="btn btn-sm btn-outline-danger py-0 px-2 fw-semibold" onclick="previewDoc('${resolveUploadUrl(item.doc_file)}', 'Delivery Slip')"><i class="fa-solid fa-file-pdf me-1"></i>View Slip</button>`
+                        : `<span class="text-muted small">N/A</span>`;
+
+                    html += `
+                        <tr>
+                            <td class="text-center fw-semibold text-secondary">${sNo}</td>
+                            <td class="fw-bold font-monospace text-primary">${escapeHtml(item.ref_no)}</td>
+                            <td>${escapeHtml(item.dept_name)}</td>
+                            <td>${escapeHtml(item.zone_name)}</td>
+                            <td>${escapeHtml(item.printer_name)}</td>
+                            <td class="fw-semibold text-dark">${escapeHtml(item.model_name)}</td>
+                            <td class="text-center fw-bold font-monospace text-success fs-6">${item.outward_qty}</td>
+                            <td>${formatDateOnly(item.del_date)}</td>
+                            <td class="text-center">${docBtn}</td>
+                        </tr>`;
+                } else if (activeReportType === 'stock_summary') {
+                    const statusText = item.available_stock > 10
+                        ? '<span class="badge bg-success">In Stock</span>'
+                        : (item.available_stock > 0
+                            ? '<span class="badge bg-warning text-dark">Low Stock</span>'
+                            : '<span class="badge bg-danger">Out of Stock</span>');
+
+                    html += `
+                        <tr>
+                            <td class="text-center fw-semibold text-secondary">${sNo}</td>
+                            <td>${escapeHtml(item.printer_name)}</td>
+                            <td class="fw-semibold text-dark">${escapeHtml(item.model_name)}</td>
+                            <td class="text-center font-monospace">${item.workorder_qty}</td>
+                            <td class="text-center font-monospace fw-bold text-primary">${item.inward_qty}</td>
+                            <td class="text-center font-monospace">${item.requested_qty}</td>
+                            <td class="text-center font-monospace fw-bold text-success">${item.outward_qty}</td>
+                            <td class="text-center font-monospace fw-bold fs-6 ${item.available_stock > 0 ? 'text-primary' : 'text-danger'}">${item.available_stock}</td>
+                            <td class="text-center">${statusText}</td>
+                        </tr>`;
+                } else if (activeReportType === 'workorder_register') {
+                    const docBtn = item.doc_file
+                        ? `<button type="button" class="btn btn-sm btn-outline-danger py-0 px-2 fw-semibold" onclick="previewDoc('${resolveUploadUrl(item.doc_file)}', 'Workorder Copy')"><i class="fa-solid fa-file-pdf me-1"></i>View PDF</button>`
+                        : `<span class="text-muted small">N/A</span>`;
+
+                    html += `
+                        <tr>
+                            <td class="text-center fw-semibold text-secondary">${sNo}</td>
+                            <td class="fw-bold font-monospace text-primary">${escapeHtml(item.ref_no)}</td>
+                            <td class="font-monospace">${escapeHtml(item.file_number)}</td>
+                            <td>${escapeHtml(item.vendor_name)}</td>
+                            <td>${escapeHtml(item.printer_name)}</td>
+                            <td class="fw-semibold text-dark">${escapeHtml(item.model_name)}</td>
+                            <td class="text-center fw-bold font-monospace text-dark">${item.total_qty}</td>
+                            <td class="text-center fw-bold font-monospace text-warning">${item.balance_qty}</td>
+                            <td>${formatDateOnly(item.start_date)}</td>
+                            <td>${formatDateOnly(item.end_date)}</td>
+                            <td class="text-center">${docBtn}</td>
+                        </tr>`;
+                }
+            });
+
+            tbody.innerHTML = html;
+
+            // Update Pagination Info Text
+            const info = document.getElementById('drilldown-pagination-info');
+            if (info) {
+                if (currentFilteredRecords.length === 0) {
+                    info.textContent = 'Showing 0 to 0 of 0 entries';
+                } else {
+                    const startDisp = startIndex + 1;
+                    const endDisp = endIndex;
+                    info.textContent = `Showing ${startDisp} to ${endDisp} of ${currentFilteredRecords.length} entries`;
+                }
+            }
+        }
+
+        function renderPaginationControls() {
+            const container = document.getElementById('drilldown-pagination-controls');
+            if (!container) return;
+
+            if (pageSize === 'all' || currentFilteredRecords.length <= pageSize) {
+                container.innerHTML = '';
+                return;
+            }
+
+            const totalPages = Math.ceil(currentFilteredRecords.length / pageSize);
+            let html = '';
+
+            html += `<button type="button" class="pagination-btn" ${currentPage === 1 ? 'disabled' : ''} onclick="applyDrilldownFilters(${currentPage - 1})"><i class="fa-solid fa-chevron-left"></i> Prev</button>`;
+
+            const maxVisible = 5;
+            let startP = Math.max(1, currentPage - 2);
+            let endP = Math.min(totalPages, startP + maxVisible - 1);
+            if (endP - startP < maxVisible - 1) {
+                startP = Math.max(1, endP - maxVisible + 1);
+            }
+
+            if (startP > 1) {
+                html += `<button type="button" class="pagination-btn" onclick="applyDrilldownFilters(1)">1</button>`;
+                if (startP > 2) html += `<span class="px-1 text-muted">...</span>`;
+            }
+
+            for (let i = startP; i <= endP; i++) {
+                html += `<button type="button" class="pagination-btn ${i === currentPage ? 'active' : ''}" onclick="applyDrilldownFilters(${i})">${i}</button>`;
+            }
+
+            if (endP < totalPages) {
+                if (endP < totalPages - 1) html += `<span class="px-1 text-muted">...</span>`;
+                html += `<button type="button" class="pagination-btn" onclick="applyDrilldownFilters(${totalPages})">${totalPages}</button>`;
+            }
+
+            html += `<button type="button" class="pagination-btn" ${currentPage === totalPages ? 'disabled' : ''} onclick="applyDrilldownFilters(${currentPage + 1})">Next <i class="fa-solid fa-chevron-right"></i></button>`;
+
+            container.innerHTML = html;
+        }
+
+        function onPageSizeSelectChange(val) {
+            pageSize = val === 'all' ? 'all' : parseInt(val) || 20;
+            applyDrilldownFilters(1);
+        }
+
+        function onQuickSearchInput(val) {
+            activeQuickSearch = val;
+            applyDrilldownFilters(1);
+        }
+
+        function previewDoc(url, title) {
+            if (!url || url === '#') {
+                Swal.fire({ icon: 'info', title: 'No Document', text: 'Document copy is not available.' });
+                return;
+            }
+            const modalEl = document.getElementById('drilldownDocModal');
+            const iframe = document.getElementById('drilldownDocIframe');
+            const modalTitle = document.getElementById('drilldownDocModalTitle');
+            const dlBtn = document.getElementById('drilldownDocDownloadBtn');
+
+            if (modalTitle) modalTitle.innerHTML = `<i class="fa-solid fa-file-pdf me-2"></i>${escapeHtml(title)}`;
+            if (iframe) iframe.src = url;
+            if (dlBtn) dlBtn.href = url;
+
+            const modal = new bootstrap.Modal(modalEl);
+            modal.show();
+        }
+
+        function exportDrilldownToExcel() {
+            if (!currentFilteredRecords || currentFilteredRecords.length === 0) {
+                Swal.fire({ icon: 'warning', title: 'No Data', text: 'No records available to export.' });
+                return;
+            }
+
+            const rows = currentFilteredRecords.map((item, idx) => {
+                if (activeReportType === 'user_requests') {
+                    return {
+                        'S.No': idx + 1,
+                        'IT Cell Ref No': item.it_cell_ref_no || '',
+                        'Department': item.dept_name || '',
+                        'Zone': item.zone_name || '',
+                        'Printer Model': item.printer_name || '',
+                        'Toner Model': item.model_name || '',
+                        'Quantity Requested': item.qty_req || 0,
+                        'Quantity Delivered': item.qty_del || 0,
+                        'Requested Date': formatDateOnly(item.req_date),
+                        'Status': item.status || 'Pending'
+                    };
+                } else if (activeReportType === 'inward_stock') {
+                    return {
+                        'S.No': idx + 1,
+                        'DC Number': item.dc_no || '',
+                        'DC Date': formatDateOnly(item.dc_date),
+                        'Vendor': item.vendor_name || '',
+                        'Printer Model': item.printer_name || '',
+                        'Toner Model': item.model_name || '',
+                        'Inward Quantity': item.inward_qty || 0,
+                        'Received Date': formatDateOnly(item.cdate)
+                    };
+                } else if (activeReportType === 'outward_history') {
+                    return {
+                        'S.No': idx + 1,
+                        'IT Cell Ref No': item.ref_no || '',
+                        'Department': item.dept_name || '',
+                        'Zone': item.zone_name || '',
+                        'Printer Model': item.printer_name || '',
+                        'Toner Model': item.model_name || '',
+                        'Delivered Quantity': item.outward_qty || 0,
+                        'Delivery Date': formatDateOnly(item.del_date)
+                    };
+                } else if (activeReportType === 'stock_summary') {
+                    return {
+                        'S.No': idx + 1,
+                        'Printer Model': item.printer_name || '',
+                        'Toner Model': item.model_name || '',
+                        'Workorder Qty': item.workorder_qty || 0,
+                        'Inward Qty': item.inward_qty || 0,
+                        'Requested Qty': item.requested_qty || 0,
+                        'Delivered Qty': item.outward_qty || 0,
+                        'Available Stock': item.available_stock || 0
+                    };
+                } else {
+                    return {
+                        'S.No': idx + 1,
+                        'WO Ref No': item.ref_no || '',
+                        'File Number': item.file_number || '',
+                        'Vendor': item.vendor_name || '',
+                        'Printer Model': item.printer_name || '',
+                        'Toner Model': item.model_name || '',
+                        'Total Qty': item.total_qty || 0,
+                        'Balance Qty': item.balance_qty || 0,
+                        'Start Date': formatDateOnly(item.start_date),
+                        'End Date': formatDateOnly(item.end_date)
+                    };
+                }
+            });
+
+            const ws = XLSX.utils.json_to_sheet(rows);
+            const wb = XLSX.utils.book_new();
+            XLSX.utils.book_append_sheet(wb, ws, "Drilldown_Report");
+
+            const pObj = masterPrintersCached.find(p => String(p.id) === String(activePrinterId));
+            const pName = pObj ? pObj.printer_name.replace(/[^a-zA-Z0-9]/g, '_') : 'All_Printers';
+            const fileName = `GCC_Toner_${activeReportType}_${pName}_${new Date().toISOString().slice(0, 10)}.xlsx`;
+
+            XLSX.writeFile(wb, fileName);
+        }
+        /*]]>*/
+    </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/gcctonermanagement/login.html b/src/main/resources/templates/gcctonermanagement/login.html
index e2cbbee..11f6c2e 100644
--- a/src/main/resources/templates/gcctonermanagement/login.html
+++ b/src/main/resources/templates/gcctonermanagement/login.html
@@ -94,6 +94,8 @@
 				.then(data => {
 					if (data.result) {
 						sessionStorage.setItem("toner_usrName", data.usrName);
+						sessionStorage.setItem("toner_usrRole", data.usrRole || 'USER');
+						sessionStorage.setItem("toner_isAdmin", data.isAdmin ? 'true' : 'false');
 						window.location.href = contextPath + 'gcctonermanagement/upload';
 					} else {
 						submitBtn.disabled = false;
diff --git a/src/main/resources/templates/gcctonermanagement/upload.html b/src/main/resources/templates/gcctonermanagement/upload.html
index 55b8115..51b8a3e 100644
--- a/src/main/resources/templates/gcctonermanagement/upload.html
+++ b/src/main/resources/templates/gcctonermanagement/upload.html
@@ -3,12 +3,16 @@
 
 <head>
     <script th:inline="javascript">
+        /*<![CDATA[*/
         (function () {
             const currentUser = /*[[${session.toner_usrName}]]*/ null;
             if (currentUser && sessionStorage.getItem("toner_usrName") !== currentUser) {
                 window.location.replace(/*[[@{/gcctonermanagement/login}]]*/ '/gcctonermanagement/login');
             }
         })();
+        const IS_ADMIN = /*[[${isAdmin}]]*/ false;
+        const USER_ROLE = /*[[${session.toner_usrRole}]]*/ 'USER';
+        /*]]>*/
     </script>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -469,10 +473,12 @@
             transform: none;
         }
 
-        /* Custom Data Grid Table */
+        /* Custom Data Grid Table with Vertical Column Lines */
         .grid-table {
             font-size: 0.85rem;
             width: 100%;
+            border-collapse: collapse !important;
+            border: 1px solid #cbd5e1 !important;
         }
 
         .grid-table th {
@@ -483,19 +489,48 @@
             font-size: 0.75rem;
             letter-spacing: 0.5px;
             padding: 14px 10px;
-            border-bottom: 2px solid #cbd5e1 !important;
+            border: 1px solid #cbd5e1 !important;
+            border-bottom: 2px solid #94a3b8 !important;
         }
 
         .grid-table td {
             padding: 12px 10px;
             vertical-align: middle;
-            border-bottom: 1px solid #e2e8f0;
+            border: 1px solid #cbd5e1 !important;
         }
 
         .grid-table tbody tr:hover {
             background-color: #f8fafc;
         }
 
+        /* Vertical Lines for all Datatables, Sub-tables, and Modal Tables in Toner Management */
+        .card-custom table,
+        .modal table,
+        .table-bordered,
+        .table-responsive>table {
+            border-collapse: collapse !important;
+            border: 1px solid #cbd5e1 !important;
+        }
+
+        .card-custom table th,
+        .card-custom table td,
+        .modal table th,
+        .modal table td,
+        .table-bordered th,
+        .table-bordered td,
+        .table-responsive>table th,
+        .table-responsive>table td {
+            border: 1px solid #cbd5e1 !important;
+        }
+
+        .card-custom table thead th,
+        .modal table thead th,
+        .table-bordered thead th,
+        .table-responsive>table thead th {
+            background-color: #f1f5f9 !important;
+            border-bottom: 2px solid #94a3b8 !important;
+        }
+
         /* Progress Bar */
         .progress-container {
             display: none;
@@ -570,17 +605,17 @@
             color: #ffffff;
         }
 
-        /* Prominent Toner Model Badge */
+        /* Clean Normal Text Toner Model */
         .badge-toner-model {
-            background-color: #475569 !important;
-            color: #ffffff !important;
+            background-color: transparent !important;
+            color: #0f172a !important;
             font-size: 0.92rem !important;
-            font-weight: 700 !important;
-            padding: 6px 14px !important;
-            border-radius: 8px !important;
-            letter-spacing: 0.5px;
+            font-weight: 600 !important;
+            padding: 0 !important;
+            border-radius: 0 !important;
+            letter-spacing: normal !important;
             display: inline-block;
-            box-shadow: 0 2px 6px rgba(0, 0, 0, 0.12);
+            box-shadow: none !important;
         }
 
         .sortable-th {
@@ -781,6 +816,222 @@
                 white-space: nowrap;
             }
         }
+
+        /* Printer Model Stock Cards Enhanced Styling */
+        .printer-section-icon-badge {
+            width: 40px;
+            height: 40px;
+            border-radius: 12px;
+            background: linear-gradient(135deg, rgba(15, 92, 120, 0.12), rgba(15, 92, 120, 0.04));
+            border: 1px solid rgba(15, 92, 120, 0.15);
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            color: #0f5c78;
+            font-size: 1.15rem;
+        }
+
+        .printer-stock-card {
+            background: #ffffff;
+            border-radius: 16px;
+            border: 1.5px solid #e2e8f0;
+            padding: 18px 16px;
+            transition: all 0.25s cubic-bezier(0.16, 1, 0.3, 1);
+            cursor: pointer;
+            position: relative;
+            overflow: hidden;
+            box-shadow: 0 4px 14px rgba(0, 0, 0, 0.03);
+            height: 100%;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+        }
+
+        .printer-stock-card:hover {
+            transform: translateY(-4px);
+            box-shadow: 0 12px 28px rgba(15, 92, 120, 0.1);
+            border-color: var(--accent-border, #93c5fd);
+        }
+
+        .printer-stock-card.active-printer-card {
+            border-color: #0f5c78;
+            background: linear-gradient(to bottom, #f0fdfa, #ffffff);
+            box-shadow: 0 0 0 2.5px #0f5c78, 0 10px 25px rgba(15, 92, 120, 0.15);
+        }
+
+        .printer-stock-card::before {
+            content: '';
+            position: absolute;
+            top: 0;
+            left: 0;
+            right: 0;
+            height: 4px;
+            background: var(--accent-primary, #cbd5e1);
+            transition: height 0.2s;
+        }
+
+        .printer-stock-card.active-printer-card::before {
+            background: #0f5c78;
+            height: 5px;
+        }
+
+        .printer-card-icon {
+            width: 40px;
+            height: 40px;
+            min-width: 40px;
+            border-radius: 10px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 1.1rem;
+            transition: all 0.2s;
+        }
+
+        .printer-stock-card:hover .printer-card-icon {
+            transform: scale(1.08);
+        }
+
+        .printer-card-title {
+            font-family: 'Outfit', sans-serif;
+            font-size: 1.35rem;
+            font-weight: 800;
+            color: #0f172a;
+            line-height: 1.2;
+            letter-spacing: -0.3px;
+        }
+
+        .printer-card-subtitle {
+            font-size: 0.78rem;
+            font-weight: 600;
+        }
+
+        .printer-inhand-box {
+            border-radius: 12px;
+            padding: 14px 10px;
+            text-align: center;
+            transition: all 0.2s;
+        }
+
+        .printer-stock-card:hover .printer-inhand-box {
+            filter: brightness(0.97);
+        }
+
+        .printer-inhand-label {
+            font-size: 0.78rem;
+            font-weight: 700;
+            color: #475569;
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
+            display: block;
+        }
+
+        .printer-inhand-value {
+            font-family: 'Outfit', sans-serif;
+            font-size: 2.5rem;
+            font-weight: 800;
+            line-height: 1.1;
+            margin-top: 5px;
+        }
+
+        .printer-submetrics-row {
+            margin-top: 4px;
+        }
+
+        .printer-mini-box {
+            border-radius: 12px;
+            padding: 10px 8px;
+            text-align: center;
+            transition: all 0.2s;
+        }
+
+        .printer-mini-box.requested-box {
+            background: #faf5ff;
+            border: 1.5px solid #e9d5ff;
+        }
+
+        .printer-mini-box.delivered-box {
+            background: #f0fdf4;
+            border: 1.5px solid #bbf7d0;
+        }
+
+        .printer-mini-label {
+            display: block;
+            font-size: 0.72rem;
+            font-weight: 700;
+            color: #64748b;
+            text-transform: uppercase;
+            letter-spacing: 0.4px;
+            margin-bottom: 3px;
+        }
+
+        .printer-mini-label.text-purple {
+            color: #7c3aed;
+        }
+
+        .printer-mini-label.text-teal {
+            color: #0f5c78;
+        }
+
+        .printer-mini-val {
+            display: block;
+            font-family: 'Outfit', sans-serif;
+            font-size: 1.55rem;
+            font-weight: 800;
+            line-height: 1.1;
+        }
+
+        .printer-mini-val.text-purple {
+            color: #6b21a8;
+        }
+
+        .printer-mini-val.text-teal {
+            color: #0f5c78;
+        }
+
+        /* Sticky Header & Column Grid Borders for Requested Toners & Stock Status Table & Inward Configure Table */
+        #outward-toners-table,
+        #inward-toners-table {
+            border: 1px solid #cbd5e1 !important;
+            border-collapse: separate !important;
+            border-spacing: 0 !important;
+        }
+
+        #outward-toners-table th,
+        #outward-toners-table td,
+        #inward-toners-table th,
+        #inward-toners-table td {
+            border-right: 1px solid #cbd5e1 !important;
+            border-bottom: 1px solid #cbd5e1 !important;
+        }
+
+        #outward-toners-table thead tr:first-child th:last-child,
+        #outward-toners-table tbody td:last-child,
+        #inward-toners-table thead tr:first-child th:last-child,
+        #inward-toners-table tbody td:last-child {
+            border-right: none !important;
+        }
+
+        #outward-toners-table thead tr:nth-child(2) th,
+        #inward-toners-table thead tr:nth-child(2) th {
+            border-right: 1px solid #cbd5e1 !important;
+        }
+
+        #outward-toners-table thead th,
+        #inward-toners-table thead th {
+            position: sticky;
+            top: 0;
+            z-index: 10;
+            background-color: #f8fafc;
+            box-shadow: inset 0 -1px 0 #cbd5e1;
+        }
+
+        #outward-toners-table thead tr:nth-child(2) th,
+        #inward-toners-table thead tr:nth-child(2) th {
+            top: 33px;
+            z-index: 9;
+            background-color: #f8fafc;
+            box-shadow: inset 0 -1px 0 #cbd5e1;
+        }
     </style>
 </head>
 
@@ -813,6 +1064,10 @@
             <div th:if="${isLoggedIn}" class="user-badge">
                 <i class="fa-solid fa-circle-user text-white"></i>
                 <span th:text="${usrName}" class="user-name-text">User</span>
+                <span th:if="${isAdmin}" class="badge bg-warning text-dark ms-1"
+                    style="font-size: 10px; font-weight: 700; border-radius: 4px;">ADMIN</span>
+                <span th:if="${!isAdmin}" class="badge bg-info text-dark ms-1"
+                    style="font-size: 10px; font-weight: 700; border-radius: 4px;">USER</span>
             </div>
             <a th:if="${isLoggedIn}" th:href="@{/gcctonermanagement/logout}" class="btn-logout">
                 <i class="fa-solid fa-right-from-bracket"></i> <span class="logout-text">Logout</span>
@@ -835,29 +1090,33 @@
                 <i class="fa-solid fa-chart-pie"></i>
                 <span>Dashboard & Reports</span>
             </a>
-            <a class="nav-tab" onclick="switchView('workorder')">
+            <a th:href="@{/gcctonermanagement/details}" class="nav-tab">
+                <i class="fa-solid fa-layer-group"></i>
+                <span>Drilldown Details</span>
+            </a>
+            <a th:if="${!isAdmin}" class="nav-tab" onclick="switchView('workorder')">
                 <i class="fa-solid fa-file-contract"></i>
                 <span>Workorder Register</span>
             </a>
             <!--
-            <a class="nav-tab" onclick="switchView('workorder-request')">
+            <a th:if="${!isAdmin}" class="nav-tab" onclick="switchView('workorder-request')">
                 <i class="fa-solid fa-file-circle-check"></i>
                 <span>Workorder Model Request</span>
             </a>
             -->
-            <a class="nav-tab" onclick="switchView('inward')">
+            <a th:if="${!isAdmin}" class="nav-tab" onclick="switchView('inward')">
                 <i class="fa-solid fa-cloud-arrow-up"></i>
                 <span>Inward Register</span>
             </a>
-            <a class="nav-tab" onclick="switchView('request')">
+            <a th:if="${!isAdmin}" class="nav-tab" onclick="switchView('request')">
                 <i class="fa-solid fa-file-invoice"></i>
                 <span>User Request Details</span>
             </a>
-            <a class="nav-tab" onclick="switchView('outward')">
+            <a th:if="${!isAdmin}" class="nav-tab" onclick="switchView('outward')">
                 <i class="fa-solid fa-truck-ramp-box"></i>
                 <span>Outward Register</span>
             </a>
-            <a class="nav-tab" onclick="switchView('master')">
+            <a th:if="${!isAdmin}" class="nav-tab" onclick="switchView('master')">
                 <i class="fa-solid fa-sliders"></i>
                 <span>Master Settings</span>
             </a>
@@ -876,142 +1135,43 @@
                 </div>
 
                 <!-- Interactive Report Filter Controls (First) -->
-                <div class="card-custom mb-4">
-                    <div class="d-flex justify-content-between align-items-center mb-3 flex-wrap gap-2">
-                        <h5 class="fw-bold m-0" style="color: #0f5c78;">
-                            <i class="fa-solid fa-filter me-2"></i>Report Filters & Options
-                        </h5>
-                        <button type="button"
-                            class="btn btn-sm btn-outline-secondary fw-semibold px-3 py-1 d-inline-flex align-items-center gap-1 shadow-sm"
-                            onclick="resetReportFilters()" style="border-radius: 8px;">
-                            <i class="fa-solid fa-rotate-left"></i> Reset Filters
-                        </button>
-                    </div>
-                    <div class="row g-3 align-items-end">
-                        <!-- Select Report Type -->
-                        <div class="col-12 col-sm-6 col-lg-3">
-                            <label class="form-label" for="report-type-select">
-                                <i class="fa-solid fa-table-list text-primary me-1"></i> Select Report Type
-                            </label>
-                            <select id="report-type-select" class="form-control-custom" onchange="onReportTypeChange()">
-                                <option value="user_requests">User Request Details Report</option>
-                                <option value="workorder_register">Workorder Register Report</option>
-                                <!-- <option value="workorder_request">Workorder Model Request Report</option> -->
-                                <option value="inward_stock">Inward Register Stock Report</option>
-                                <option value="stock_summary">Current Stock Summary</option>
-                                <option value="outward_history">Outward Distribution History</option>
-                            </select>
-                        </div>
-
-                        <!-- Printer Model Filter -->
-                        <div class="col-12 col-sm-6 col-lg-3">
-                            <label class="form-label" for="report-printer-filter">
-                                <i class="fa-solid fa-print text-primary me-1"></i> Printer Model
-                            </label>
-                            <select id="report-printer-filter" class="form-control-custom"
-                                onchange="onReportPrinterFilterChange()">
-                                <option value="">-- All Printer Models --</option>
-                            </select>
-                        </div>
-
-                        <!-- Toner Model Filter -->
-                        <div class="col-12 col-sm-6 col-lg-2">
-                            <label class="form-label" for="report-toner-filter">
-                                <i class="fa-solid fa-droplet text-primary me-1"></i> Toner Model
-                            </label>
-                            <select id="report-toner-filter" class="form-control-custom"
-                                onchange="onReportTonerFilterChange()" disabled>
-                                <option value="">-- All Toners --</option>
-                            </select>
-                        </div>
 
-                        <!-- File Number Filter (For Workorder Register Report) -->
-                        <div class="col-12 col-sm-6 col-lg-2" id="report-fileno-filter-wrapper" style="display: none;">
-                            <label class="form-label" for="report-fileno-filter">
-                                <i class="fa-solid fa-folder-open text-primary me-1"></i> File Number
-                            </label>
-                            <select id="report-fileno-filter" class="form-control-custom"
-                                onchange="applyReportFilters(1)">
-                                <option value="">-- All File Numbers --</option>
-                            </select>
-                        </div>
-
-                        <!-- Department Filter -->
-                        <div class="col-12 col-sm-6 col-lg-2" id="report-dept-filter-wrapper">
-                            <label class="form-label" for="report-dept-filter">
-                                <i class="fa-solid fa-building-user text-primary me-1"></i> Department
-                            </label>
-                            <select id="report-dept-filter" class="form-control-custom"
-                                onchange="applyReportFilters(1)">
-                                <option value="">-- All Departments --</option>
-                            </select>
-                        </div>
-
-                        <!-- Status Filter -->
-                        <div class="col-12 col-sm-6 col-lg-2" id="report-status-filter-wrapper">
-                            <label class="form-label" for="report-status-filter">
-                                <i class="fa-solid fa-clock-rotate-left text-primary me-1"></i> Status
-                            </label>
-                            <select id="report-status-filter" class="form-control-custom"
-                                onchange="applyReportFilters(1)">
-                                <option value="">-- All Statuses --</option>
-                                <option value="Pending">Pending</option>
-                                <option value="Delivered">Delivered</option>
-                                <option value="Partial">Partial</option>
-                            </select>
-                        </div>
-
-                        <!-- Date Period Preset -->
-                        <div class="col-12 col-sm-6 col-lg-3">
-                            <label class="form-label" for="report-period-preset">
-                                <i class="fa-solid fa-calendar-days text-primary me-1"></i> Date Period
-                            </label>
-                            <select id="report-period-preset" class="form-control-custom"
-                                onchange="onReportPeriodPresetChange()">
-                                <option value="all" selected>All Time</option>
-                                <option value="today">Today</option>
-                                <option value="week">This Week</option>
-                                <option value="month">This Month</option>
-                                <option value="last30">Last 30 Days</option>
-                                <option value="year">This Year</option>
-                                <option value="custom">Custom Range</option>
-                            </select>
-                        </div>
 
-                        <!-- Custom From Date -->
-                        <div class="col-12 col-sm-6 col-lg-2" id="report-from-date-wrapper" style="display: none;">
-                            <label class="form-label" for="report-from-date">
-                                <i class="fa-solid fa-calendar-plus text-primary me-1"></i> From Date
-                            </label>
-                            <input type="date" id="report-from-date" class="form-control-custom"
-                                onchange="applyReportFilters(1)">
+                <!-- Printer Models Inward Stock Section -->
+                <div class="card-custom mb-4" id="printer-inward-stock-section">
+                    <div class="d-flex justify-content-between align-items-center mb-3 flex-wrap gap-2">
+                        <div class="d-flex align-items-center gap-2">
+                            <div class="printer-section-icon-badge">
+                                <i class="fa-solid fa-print"></i>
+                            </div>
+                            <div>
+                                <h5 class="fw-bold m-0" style="color: #0f5c78;">
+                                    Printer Models &amp; Inward Stock
+                                </h5>
+                                <small class="text-muted">Total inward stock counts aggregated per printer model. Click
+                                    any card to open detailed drilldown in separate page.</small>
+                            </div>
                         </div>
-
-                        <!-- Custom To Date -->
-                        <div class="col-12 col-sm-6 col-lg-2" id="report-to-date-wrapper" style="display: none;">
-                            <label class="form-label" for="report-to-date">
-                                <i class="fa-solid fa-calendar-check text-primary me-1"></i> To Date
-                            </label>
-                            <input type="date" id="report-to-date" class="form-control-custom"
-                                onchange="applyReportFilters(1)">
+                        <div class="d-flex align-items-center gap-2 flex-wrap">
+                            <a href="javascript:void(0)" onclick="openPrinterDrilldown('', 'All Printers')"
+                                class="btn btn-sm btn-outline-primary fw-semibold px-3 py-1.5 shadow-sm d-inline-flex align-items-center gap-1"
+                                style="border-radius: 8px; font-size: 0.82rem;">
+                                <i class="fa-solid fa-arrow-up-right-from-square"></i> Open Drilldown Details
+                            </a>
+                            <span class="badge"
+                                style="background: #e0f2fe; color: #0369a1; font-weight: 600; font-size: 0.85rem; padding: 7px 14px; border-radius: 8px; border: 1px solid #bae6fd;">
+                                <i class="fa-solid fa-boxes-stacked me-1"></i> Total Inward Stock: <strong class="fs-6"
+                                    id="printer-cards-total-inward">0</strong>
+                            </span>
                         </div>
+                    </div>
 
-                        <!-- Search Filter with Search Button -->
-                        <div class="col-12 col-sm-6 col-lg-3">
-                            <label class="form-label" for="report-search-input">
-                                <i class="fa-solid fa-magnifying-glass text-primary me-1"></i> Search
-                            </label>
-                            <div class="d-flex gap-2">
-                                <input type="text" id="report-search-input" class="form-control-custom"
-                                    placeholder="Search report..." oninput="syncFilterSearch(this.value)"
-                                    onkeyup="if(event.key==='Enter') applyReportFilters(1)">
-                                <button type="button"
-                                    class="btn fw-bold text-white px-3 d-flex align-items-center justify-content-center"
-                                    onclick="applyReportFilters(1)" style="background: #0f5c78; border-radius: 10px;"
-                                    title="Search">
-                                    <i class="fa-solid fa-magnifying-glass"></i>
-                                </button>
-                            </div>
+                    <!-- Grid container for printer model cards -->
+                    <div class="row g-3" id="printer-model-cards-grid">
+                        <!-- Dynamic printer model cards rendered here -->
+                        <div class="col-12 text-center py-4 text-muted">
+                            <i class="fa-solid fa-spinner fa-spin fa-2x mb-2 text-primary"></i>
+                            <p class="mb-0">Loading printer models inward stock...</p>
                         </div>
                     </div>
                 </div>
@@ -1022,31 +1182,32 @@
                         onclick="onMetricCardClick('workorder_registered')"
                         title="Click to view Workorder Register report">
                         <div class="metric-info">
-                            <span class="metric-label">Total Workorder Registered</span>
+                            <span class="metric-label">Total Workorder Quantity</span>
                             <span class="metric-value" id="stats-workorder-registered">0</span>
                         </div>
                         <i class="fa-solid fa-file-contract metric-icon"></i>
                     </div>
-                    <div class="metric-card card-cyan cursor-pointer" onclick="onMetricCardClick('user_requests')"
-                        title="Click to view User Request Details report">
-                        <div class="metric-info">
-                            <span class="metric-label">Total User Requested</span>
-                            <span class="metric-value" id="stats-user-requested">0</span>
-                        </div>
-                        <i class="fa-solid fa-file-invoice metric-icon"></i>
-                    </div>
+
                     <div class="metric-card card-blue cursor-pointer" onclick="onMetricCardClick('total_stock')"
                         title="Click to view Total Stock report">
                         <div class="metric-info">
-                            <span class="metric-label">Total Stock</span>
+                            <span class="metric-label">Total Stock in Hand</span>
                             <span class="metric-value" id="stats-inward">0</span>
                         </div>
                         <i class="fa-solid fa-boxes-packing metric-icon"></i>
                     </div>
+                    <div class="metric-card card-cyan cursor-pointer" onclick="onMetricCardClick('user_requests')"
+                        title="Click to view User Request Details report">
+                        <div class="metric-info">
+                            <span class="metric-label">Total Quantity Requested</span>
+                            <span class="metric-value" id="stats-user-requested">0</span>
+                        </div>
+                        <i class="fa-solid fa-file-invoice metric-icon"></i>
+                    </div>
                     <div class="metric-card card-green cursor-pointer" onclick="onMetricCardClick('delivered')"
                         title="Click to view Total Delivered report">
                         <div class="metric-info">
-                            <span class="metric-label">Total Delievered</span>
+                            <span class="metric-label">Total Delivered Quantity</span>
                             <span class="metric-value" id="stats-distributed">0</span>
                         </div>
                         <i class="fa-solid fa-truck-ramp-box metric-icon"></i>
@@ -1061,6 +1222,8 @@
                     </div>
                 </div>
 
+
+
                 <!-- Single Dynamic Datatable Below -->
                 <div class="card-custom" id="dynamic-report-card">
                     <div class="d-flex justify-content-between align-items-center mb-4 flex-wrap gap-3">
@@ -1082,6 +1245,20 @@
                             </div>
                         </div>
                         <div class="d-flex align-items-center gap-2 flex-wrap">
+                            <!-- Department Filter Dropdown in Datatable -->
+                            <select id="table-dept-filter" class="form-select form-select-sm"
+                                style="width: auto; min-width: 150px; font-weight: 600; border-radius: 8px;"
+                                onchange="syncDeptFilter(this.value)" title="Filter by Department">
+                                <option value="">-- All Departments --</option>
+                            </select>
+
+                            <!-- Zone Filter Dropdown in Datatable -->
+                            <select id="table-zone-filter" class="form-select form-select-sm"
+                                style="width: auto; min-width: 130px; font-weight: 600; border-radius: 8px;"
+                                onchange="syncZoneFilter(this.value)" title="Filter by Zone">
+                                <option value="">-- All Zones --</option>
+                            </select>
+
                             <!-- Printer Model Dropdown in Datatable -->
                             <select id="table-printer-filter" class="form-select form-select-sm"
                                 style="width: auto; font-weight: 600; border-radius: 8px;"
@@ -1139,7 +1316,7 @@
 
 
             <!-- ================= WORKORDER REGISTER PANEL ================= -->
-            <div id="panel-workorder" class="view-panel">
+            <div th:if="${!isAdmin}" id="panel-workorder" class="view-panel">
                 <div class="section-header">
                     <h1 class="section-title">
                         <i class="fa-solid fa-file-contract"></i>
@@ -1243,19 +1420,20 @@
                             </div>
 
                             <div class="table-responsive mt-3" style="max-height: 300px; overflow-y: auto;">
-                                <table class="table table-hover align-middle">
+                                <table class="table table-bordered table-hover align-middle">
                                     <thead class="table-light">
                                         <tr>
+                                            <th style="width: 50px;" class="text-center">S.No</th>
                                             <th>Printer Model</th>
                                             <th>Toner Model</th>
                                             <th>Part Code</th>
                                             <th class="text-end">Qty</th>
-                                            <th class="text-center">Action</th>
+                                            <th class="text-center" style="width: 70px;">Action</th>
                                         </tr>
                                     </thead>
                                     <tbody id="workorder-items-tbody">
                                         <tr>
-                                            <td colspan="5" class="text-center text-muted py-4">No models added yet.
+                                            <td colspan="6" class="text-center text-muted py-4">No models added yet.
                                                 Configure and click "Add".</td>
                                         </tr>
                                     </tbody>
@@ -1453,7 +1631,7 @@
 
 
             <!-- ================= INWARD REGISTER PANEL ================= -->
-            <div id="panel-inward" class="view-panel">
+            <div th:if="${!isAdmin}" id="panel-inward" class="view-panel">
                 <div class="section-header">
                     <h1 class="section-title">
                         <i class="fa-solid fa-cart-flatbed-suitcases"></i>
@@ -1493,17 +1671,18 @@
                                 <div class="mb-3">
                                     <label class="form-label" for="inward-dc-no">
                                         <i class="fa-solid fa-receipt text-primary me-1"></i> Delivery Challan (DC) No.
+                                        *
                                     </label>
-                                    <input type="text" id="inward-dc-no" class="form-control-custom"
+                                    <input type="text" id="inward-dc-no" required class="form-control-custom"
                                         placeholder="e.g. DC-2026-001" maxlength="100">
                                 </div>
 
                                 <!-- DC Upload Date -->
                                 <div class="mb-3">
                                     <label class="form-label" for="inward-dc-date">
-                                        <i class="fa-solid fa-calendar-days text-primary me-1"></i> DC Date
+                                        <i class="fa-solid fa-calendar-days text-primary me-1"></i> DC Date *
                                     </label>
-                                    <input type="date" id="inward-dc-date" class="form-control-custom">
+                                    <input type="date" id="inward-dc-date" required class="form-control-custom">
                                 </div>
 
                                 <!-- Delivery Challan DC Upload -->
@@ -1546,9 +1725,12 @@
                                 <i class="fa-solid fa-list-check me-2"></i>Configure Inward Quantities
                             </h5>
                             <div class="table-responsive" style="max-height: 400px; overflow-y: auto;">
-                                <table class="table table-hover align-middle">
-                                    <thead class="table-light">
+                                <table class="table table-bordered table-hover align-middle mb-0"
+                                    id="inward-toners-table">
+                                    <thead class="table-light sticky-top">
                                         <tr>
+                                            <th rowspan="2" class="text-center align-middle" style="width: 50px;">S.No
+                                            </th>
                                             <th rowspan="2" class="align-middle">Printer Model</th>
                                             <th rowspan="2" class="align-middle">Toner Model</th>
                                             <th colspan="3" class="text-center align-middle"
@@ -1568,7 +1750,7 @@
                                     </thead>
                                     <tbody id="inward-items-tbody">
                                         <tr>
-                                            <td colspan="6" class="text-center text-muted py-4">
+                                            <td colspan="7" class="text-center text-muted py-4">
                                                 Please select a File No. to view registered models.
                                             </td>
                                         </tr>
@@ -1638,7 +1820,7 @@
 
 
             <!-- ================= USER REQUEST PANEL ================= -->
-            <div id="panel-request" class="view-panel">
+            <div th:if="${!isAdmin}" id="panel-request" class="view-panel">
                 <div class="section-header">
                     <h1 class="section-title">
                         <i class="fa-solid fa-file-signature"></i>
@@ -1768,9 +1950,10 @@
                             </div>
 
                             <div class="table-responsive mt-3" style="max-height: 300px; overflow-y: auto;">
-                                <table class="table table-hover align-middle">
+                                <table class="table table-bordered table-hover align-middle">
                                     <thead class="table-light">
                                         <tr>
+                                            <th style="width: 50px;" class="text-center">S.No</th>
                                             <th>Printer Model</th>
                                             <th>Toner Model</th>
                                             <th class="text-center">Qty</th>
@@ -1779,7 +1962,7 @@
                                     </thead>
                                     <tbody id="request-items-table-body">
                                         <tr>
-                                            <td colspan="4" class="text-center text-muted py-4">No items added to
+                                            <td colspan="5" class="text-center text-muted py-4">No items added to
                                                 request yet.</td>
                                         </tr>
                                     </tbody>
@@ -1924,7 +2107,7 @@
             </div>
 
             <!-- ================= OUTWARD REGISTER PANEL ================= -->
-            <div id="panel-outward" class="view-panel">
+            <div th:if="${!isAdmin}" id="panel-outward" class="view-panel">
                 <div class="section-header">
                     <h1 class="section-title">
                         <i class="fa-solid fa-truck-moving"></i>
@@ -1952,21 +2135,36 @@
                                     </select>
                                 </div>
 
+                                <!-- User Requested Letter Copy (View Document) -->
+                                <div class="mb-3" id="outward-request-letter-wrapper" style="display: none;">
+                                    <label class="form-label d-flex justify-content-between align-items-center mb-1">
+                                        <span class="fw-semibold text-secondary small">
+                                            <i class="fa-solid fa-file-pdf text-danger me-1"></i> User Request Letter
+                                            Copy
+                                        </span>
+                                    </label>
+                                    <div id="outward-request-letter-container"
+                                        class="p-2 bg-light rounded border d-flex align-items-center justify-content-between flex-wrap gap-2">
+                                        <!-- Dynamically updated when active request is selected -->
+                                    </div>
+                                </div>
+
                                 <!-- Department / Office -->
-                                <div class="mb-3">
+                                <!-- <div class="mb-3">
                                     <label class="form-label" for="outward-dept-disp">
                                         <i class="fa-solid fa-building text-primary me-1"></i> Department / Office
                                     </label>
                                     <input type="text" id="outward-dept-disp" class="form-control-custom" readonly
                                         style="background-color: #f1f5f9; font-weight: bold; color: #334155;">
-                                </div>
+                                </div> -->
 
                                 <!-- Outward Date -->
                                 <div class="mb-3">
                                     <label class="form-label" for="outward-date">
-                                        <i class="fa-solid fa-calendar-days text-primary me-1"></i> Outward Date *
+                                        <i class="fa-solid fa-calendar-days text-primary me-1"></i> Outward Date
                                     </label>
-                                    <input type="date" id="outward-date" required class="form-control-custom">
+                                    <input type="date" id="outward-date" class="form-control-custom" readonly
+                                        style="background-color: #f1f5f9; font-weight: bold; color: #334155; cursor: not-allowed; pointer-events: none;">
                                 </div>
 
                                 <!-- Save & Download Button -->
@@ -2014,20 +2212,13 @@
                                                 <div id="outward-photo-placeholder" class="py-2">
                                                     <i class="fa-solid fa-user-tie text-secondary mb-2"
                                                         style="font-size: 1.8rem; opacity: 0.6;"></i>
-                                                    <div class="d-flex gap-2 justify-content-center mt-1 flex-wrap">
+                                                    <div class="d-flex justify-content-center mt-1">
                                                         <button type="button"
-                                                            class="btn btn-sm btn-primary fw-semibold px-2"
+                                                            class="btn btn-sm btn-primary fw-semibold px-3 py-1"
                                                             id="outward-camera-btn" onclick="openOutwardCameraModal()"
-                                                            style="border-radius: 8px; font-size: 11px; background-color: #0f5c78; border-color: #0f5c78;">
+                                                            style="border-radius: 8px; font-size: 12px; background-color: #0f5c78; border-color: #0f5c78;">
                                                             <i class="fa-solid fa-camera me-1"></i> Take Photo
                                                         </button>
-                                                        <button type="button"
-                                                            class="btn btn-sm btn-outline-secondary fw-semibold px-2"
-                                                            id="outward-file-photo-btn"
-                                                            onclick="document.getElementById('outward-user-photo-file').click()"
-                                                            style="border-radius: 8px; font-size: 11px;">
-                                                            <i class="fa-solid fa-image me-1"></i> Select File
-                                                        </button>
                                                     </div>
                                                 </div>
 
@@ -2086,12 +2277,15 @@
                                 <i class="fa-solid fa-boxes-stacked me-2"></i>Requested Toners & Stock Status
                             </h5>
                             <div class="table-responsive" style="max-height: 480px; overflow-y: auto;">
-                                <table class="table table-hover align-middle">
-                                    <thead class="table-light">
+                                <table class="table table-bordered table-hover align-middle mb-0"
+                                    id="outward-toners-table">
+                                    <thead class="table-light sticky-top">
                                         <tr>
+                                            <th rowspan="2" class="text-center align-middle" style="width: 50px;">S.No
+                                            </th>
                                             <th rowspan="2" class="align-middle">Printer Model</th>
                                             <th rowspan="2" class="align-middle">Toner Model</th>
-                                            <th colspan="3" class="text-center align-middle"
+                                            <th colspan="4" class="text-center align-middle"
                                                 style="background-color: #f1f5f9; color: #0f5c78; font-weight: 700; border-bottom: 1px solid #cbd5e1;">
                                                 Request Status</th>
                                             <th rowspan="2" class="text-center align-middle" style="width: 120px;">
@@ -2100,7 +2294,10 @@
                                                 Issue</th>
                                         </tr>
                                         <tr class="text-center" style="font-size: 0.75rem; background-color: #f8fafc;">
-                                            <th class="py-1 px-2 text-secondary fw-bold" style="width: 55px;">Req</th>
+                                            <th class="py-1 px-2 text-primary fw-bold" style="width: 65px;"
+                                                title="Work Order Registered Quantity">Workorder quantity</th>
+                                            <th class="py-1 px-2 text-secondary fw-bold" style="width: 55px;">quantity
+                                                Req</th>
                                             <th class="py-1 px-2 text-success fw-bold" style="width: 55px;">Issued</th>
                                             <th class="py-1 px-2 fw-bold" style="width: 60px; color: #d97706;">Pending
                                             </th>
@@ -2108,7 +2305,7 @@
                                     </thead>
                                     <tbody id="outward-items-tbody">
                                         <tr>
-                                            <td colspan="7" class="text-center text-muted py-4">
+                                            <td colspan="9" class="text-center text-muted py-4">
                                                 Please select an Active Request to view requested toner models.
                                             </td>
                                         </tr>
@@ -2178,7 +2375,7 @@
             </div>
 
             <!-- ================= MASTER MANAGEMENT PANEL ================= -->
-            <div id="panel-master" class="view-panel">
+            <div th:if="${!isAdmin}" id="panel-master" class="view-panel">
                 <div class="section-header d-flex justify-content-between align-items-center flex-wrap gap-2">
                     <h1 class="section-title m-0">
                         <i class="fa-solid fa-sliders"></i>
@@ -2645,11 +2842,19 @@
         let lastY = 0;
 
         document.addEventListener('DOMContentLoaded', () => {
+            // Set current date for outward date input
+            const outDate = document.getElementById('outward-date');
+            if (outDate) {
+                outDate.value = new Date().toISOString().split('T')[0];
+            }
+
             // Load base list of printers on startup
             fetchPrinters();
-            fetchDepartmentsList();
-            fetchZonesList();
-            fetchActiveWorkordersForInward();
+            if (!IS_ADMIN) {
+                fetchDepartmentsList();
+                fetchZonesList();
+                fetchActiveWorkordersForInward();
+            }
             // Load vendors map, then default to Dashboard & Report View Data
             loadVendorsMap(() => {
                 loadReportPage();
@@ -2677,6 +2882,11 @@
 
         // Toggle dynamic views
         function switchView(panelName) {
+            // If admin, enforce only report (Dashboard & Reports) view
+            if (IS_ADMIN && panelName !== 'report' && panelName !== 'dashboard') {
+                panelName = 'report';
+            }
+
             // Auto close mobile sidebar drawer on navigation
             if (window.innerWidth < 992) {
                 closeSidebar();
@@ -2696,7 +2906,7 @@
                 loadVendorsMap(() => {
                     loadReportPage();
                 });
-            } else if (panelName === 'workorder') {
+            } else if (!IS_ADMIN && panelName === 'workorder') {
                 resetForm('workorder');
                 populatePrintersDropdown('workorder');
                 fetchWorkorderVendorsList();
@@ -2715,7 +2925,7 @@
                 resetForm('inward');
                 const tbody = document.getElementById('inward-items-tbody');
                 if (tbody) {
-                    tbody.innerHTML = '<tr><td colspan="6" class="text-center text-muted py-4">Please select a File No. to view registered models.</td></tr>';
+                    tbody.innerHTML = '<tr><td colspan="7" class="text-center text-muted py-4">Please select a File No. to view registered models.</td></tr>';
                 }
                 fetchActiveWorkordersForInward();
                 loadVendorsMap(() => {
@@ -2752,6 +2962,7 @@
                     printersCached = data;
                     populateReportPrinterFilters();
                     populateDashboardPrinterFilters();
+                    renderPrinterModelStockCards();
                     if (userRequestsCached && userRequestsCached.length > 0) {
                         populateUserReqFilters(userRequestsCached);
                     }
@@ -2793,17 +3004,41 @@
                     tableSelect.appendChild(opt);
                 });
             }
+            renderPrinterModelStockCards();
         }
 
+        let activeSelectedReportType = 'user_requests';
+
         function syncPrinterFilter(val) {
+            activeSelectedPrinterId = val ? String(val).trim() : '';
             const reportPrinter = document.getElementById('report-printer-filter');
-            if (reportPrinter) reportPrinter.value = val;
+            if (reportPrinter) reportPrinter.value = activeSelectedPrinterId;
+            const tablePrinter = document.getElementById('table-printer-filter');
+            if (tablePrinter) tablePrinter.value = activeSelectedPrinterId;
             onReportPrinterFilterChange();
         }
 
         function syncTonerFilter(val) {
             const reportToner = document.getElementById('report-toner-filter');
             if (reportToner) reportToner.value = val;
+            const tableToner = document.getElementById('table-toner-filter');
+            if (tableToner) tableToner.value = val;
+            applyReportFilters(1);
+        }
+
+        function syncDeptFilter(val) {
+            const reportDept = document.getElementById('report-dept-filter');
+            if (reportDept) reportDept.value = val;
+            const tableDept = document.getElementById('table-dept-filter');
+            if (tableDept) tableDept.value = val;
+            applyReportFilters(1);
+        }
+
+        function syncZoneFilter(val) {
+            const reportZone = document.getElementById('report-zone-filter');
+            if (reportZone) reportZone.value = val;
+            const tableZone = document.getElementById('table-zone-filter');
+            if (tableZone) tableZone.value = val;
             applyReportFilters(1);
         }
 
@@ -2813,41 +3048,34 @@
             if (cardType === 'total_stock') {
                 const card = document.querySelector('.metrics-grid .card-blue');
                 if (card) card.style.outline = '3px solid #0f5c78';
-                const typeSelect = document.getElementById('report-type-select');
-                if (typeSelect) typeSelect.value = 'inward_stock';
-                onReportTypeChange();
+                activeSelectedReportType = 'inward_stock';
             } else if (cardType === 'delivered') {
                 const card = document.querySelector('.metrics-grid .card-green');
                 if (card) card.style.outline = '3px solid #166534';
-                const typeSelect = document.getElementById('report-type-select');
-                if (typeSelect) typeSelect.value = 'outward_history';
-                onReportTypeChange();
+                activeSelectedReportType = 'outward_history';
             } else if (cardType === 'available_stock') {
                 const card = document.querySelector('.metrics-grid .card-amber');
                 if (card) card.style.outline = '3px solid #d97706';
-                const typeSelect = document.getElementById('report-type-select');
-                if (typeSelect) typeSelect.value = 'stock_summary';
-                onReportTypeChange();
+                activeSelectedReportType = 'stock_summary';
             } else if (cardType === 'workorder_registered') {
                 const card = document.querySelector('.metrics-grid .card-indigo');
                 if (card) card.style.outline = '3px solid #4338ca';
-                const typeSelect = document.getElementById('report-type-select');
-                if (typeSelect) typeSelect.value = 'workorder_register';
-                onReportTypeChange();
+                activeSelectedReportType = 'workorder_register';
             } else if (cardType === 'user_requests' || cardType === 'user_requested') {
                 const card = document.querySelector('.metrics-grid .card-cyan');
                 if (card) card.style.outline = '3px solid #0891b2';
-                const typeSelect = document.getElementById('report-type-select');
-                if (typeSelect) typeSelect.value = 'user_requests';
-                onReportTypeChange();
+                activeSelectedReportType = 'user_requests';
             } else if (cardType === 'workorder_requested') {
                 const card = document.querySelector('.metrics-grid .card-purple');
                 if (card) card.style.outline = '3px solid #7c3aed';
-                const typeSelect = document.getElementById('report-type-select');
-                if (typeSelect) typeSelect.value = 'workorder_request';
-                onReportTypeChange();
+                activeSelectedReportType = 'workorder_request';
             }
 
+            const typeSelect = document.getElementById('report-type-select');
+            if (typeSelect) typeSelect.value = activeSelectedReportType;
+
+            onReportTypeChange();
+
             const reportCard = document.getElementById('dynamic-report-card');
             if (reportCard) {
                 reportCard.scrollIntoView({ behavior: 'smooth' });
@@ -2875,7 +3103,11 @@
                     toners.forEach(t => {
                         const opt = document.createElement('option');
                         opt.value = t.id;
-                        opt.textContent = t.model_name;
+                        const partCodeStr = (t.part_code && String(t.part_code).trim() !== '' && String(t.part_code).trim().toLowerCase() !== 'null' && String(t.part_code).trim().toLowerCase() !== 'n/a' && String(t.part_code).trim() !== '-')
+                            ? ` (${t.part_code.trim()})`
+                            : '';
+                        opt.textContent = `${t.model_name || ''}${partCodeStr}`;
+                        opt.setAttribute('data-model-name', t.model_name || '');
                         if (t.available_stock !== undefined) {
                             opt.setAttribute('data-stock', t.available_stock);
                         }
@@ -3005,12 +3237,16 @@
                 const deptDisp = document.getElementById('outward-dept-disp');
                 if (deptDisp) deptDisp.value = '';
                 const outDate = document.getElementById('outward-date');
-                if (outDate) outDate.value = '';
+                if (outDate) outDate.value = new Date().toISOString().split('T')[0];
                 const reqSel = document.getElementById('outward-request-select');
                 if (reqSel) reqSel.value = '';
+                const letterWrapper = document.getElementById('outward-request-letter-wrapper');
+                if (letterWrapper) letterWrapper.style.display = 'none';
+                const letterContainer = document.getElementById('outward-request-letter-container');
+                if (letterContainer) letterContainer.innerHTML = '';
                 const tbody = document.getElementById('outward-items-tbody');
                 if (tbody) {
-                    tbody.innerHTML = '<tr><td colspan="7" class="text-center text-muted py-4">Please select an Active Request to view requested toner models.</td></tr>';
+                    tbody.innerHTML = '<tr><td colspan="9" class="text-center text-muted py-4">Please select an Active Request to view requested toner models.</td></tr>';
                 }
                 clearOutwardPhoto();
                 disableUploadArea();
@@ -3077,7 +3313,11 @@
                         toners.forEach(t => {
                             const opt = document.createElement('option');
                             opt.value = t.id;
-                            opt.textContent = t.model_name;
+                            const partCodeStr = (t.part_code && String(t.part_code).trim() !== '' && String(t.part_code).trim().toLowerCase() !== 'null' && String(t.part_code).trim().toLowerCase() !== 'n/a' && String(t.part_code).trim() !== '-')
+                                ? ` (${t.part_code.trim()})`
+                                : '';
+                            opt.textContent = `${t.model_name || ''}${partCodeStr}`;
+                            opt.setAttribute('data-model-name', t.model_name || '');
                             tonerSelect.appendChild(opt);
                         });
                         if (toners.length > 0) {
@@ -4049,9 +4289,9 @@
 
             if (data.length === 0) {
                 let cols = 6;
-                if (activeDashboardDetailsType === 'workorder_registered') cols = 8;
+                if (activeDashboardDetailsType === 'workorder_registered') cols = 9;
                 else if (activeDashboardDetailsType === 'workorder_requested') cols = 7;
-                else if (activeDashboardDetailsType === 'inward_register') cols = 10;
+                else if (activeDashboardDetailsType === 'inward_register') cols = 9;
                 else if (activeDashboardDetailsType === 'user_requested') cols = 10;
                 else if (activeDashboardDetailsType === 'outward_register') cols = 10;
 
@@ -4072,6 +4312,7 @@
                         <th class="text-center">Registered Qty</th>
                         <th>Start Date</th>
                         <th>End Date</th> 
+                        <th class="text-center">Status</th>
                         <th class="text-center">Workorder Copy</th>
                     </tr>`;
 
@@ -4089,25 +4330,23 @@
                         pdfBtn = `<a href="${resolveUploadUrl(item.dc_upload)}" target="_blank" class="btn-action btn-view-doc"><i class="fa-solid fa-file-pdf"></i> View</a>`;
                     }
 
-                    const groupKeyParam = encodeURIComponent(item.key || item.file_number || item.ref_no || '');
-                    const modelsCountBadge = item.items && item.items.length > 1
-                        ? `<br><span class="badge bg-light text-secondary border mt-1" style="cursor: pointer;" onclick="showWorkorderHistoryBreakdownModal('${encodeURIComponent(item.ref_no || '')}', '${encodeURIComponent(item.file_number || '')}', '${groupKeyParam}');" title="Click to view ${item.items.length} toners"><i class="fa-solid fa-layer-group me-1"></i>${item.items.length} Toners</span>`
-                        : (item.items && item.items.length === 1 ? `<br><small class="text-muted font-monospace">${escapeHtml(item.items[0].model_name || '')}</small>` : '');
-
-                    const fileNoLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #0f5c78; cursor: pointer; font-size: 0.95rem;" onclick="showWorkorderHistoryBreakdownModal('${encodeURIComponent(item.ref_no || '')}', '${encodeURIComponent(item.file_number || '')}', '${groupKeyParam}'); return false;" title="Click to view workorder toners breakdown">${escapeHtml(item.file_number || item.ref_no || '-')}</a>`;
+                    const firstFile = (item.dc_uploads && item.dc_uploads.length > 0) ? item.dc_uploads[0] : (item.dc_upload || null);
+                    const fileNoLink = firstFile
+                        ? `<a href="${resolveUploadUrl(firstFile)}" target="_blank" class="fw-bold text-decoration-none text-primary font-monospace" style="font-size: 0.95rem;" title="Click to view uploaded workorder copy">${escapeHtml(item.file_number || item.ref_no || '-')}</a>`
+                        : `<span class="fw-bold text-dark font-monospace">${escapeHtml(item.file_number || item.ref_no || '-')}</span>`;
 
-                    const refLink = item.ref_no
-                        ? `<a href="#" class="fw-semibold text-decoration-none text-dark font-monospace" style="cursor: pointer;" onclick="showWorkorderHistoryBreakdownModal('${encodeURIComponent(item.ref_no || '')}', '${encodeURIComponent(item.file_number || '')}', '${groupKeyParam}'); return false;">${escapeHtml(item.ref_no)}</a>`
-                        : '-';
+                    const refText = `<span class="fw-semibold text-dark font-monospace">${escapeHtml(item.ref_no || '-')}</span>`;
+                    const statusBadge = getWorkorderStatusBadge(item.workorder_start_date, item.workorder_end_date);
 
                     tr.innerHTML = `
                         <td class="fw-semibold text-secondary">${globalIdx}</td>
-                        <td>${fileNoLink}${modelsCountBadge}</td>
-                        <td>${refLink}</td>
+                        <td>${fileNoLink}</td>
+                        <td>${refText}</td>
                         <td>${escapeHtml(item.vendor_name || '')}</td>
                         <td class="text-center font-monospace fw-bold text-dark">${item.total_qty_registered || '0'}</td>
-                        <td><small class="text-dark fw-semibold">${item.workorder_start_date || 'N/A'}</small></td>
-                        <td><small class="text-dark fw-semibold">${item.workorder_end_date || 'N/A'}</small></td>
+                        <td><small class="text-dark fw-semibold font-monospace">${formatDateOnly(item.workorder_start_date)}</small></td>
+                        <td><small class="text-dark fw-semibold font-monospace">${formatDateOnly(item.workorder_end_date)}</small></td>
+                        <td class="text-center">${statusBadge}</td>
                         <td class="text-center">${pdfBtn}</td>
                     `;
                     tbody.appendChild(tr);
@@ -4151,7 +4390,6 @@
                     <tr>
                         <th style="width: 60px;">S.No</th>
                         <th>File No.</th>
-                        <th>Workorder Ref</th>
                         <th>Company Name</th>
                         <th>DC Number</th>
                         <th class="text-center">Qty Inward</th>
@@ -4186,16 +4424,11 @@
 
                     const fileNoLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #0f5c78; cursor: pointer; font-size: 0.95rem;" onclick="showInwardHistoryBreakdownModal('${encodeURIComponent(item.file_number || '')}', '${encodeURIComponent(item.ref_no || '')}', '${groupKeyParam}'); return false;" title="Click to view DC toners breakdown">${escapeHtml(item.file_number || item.ref_no || '-')}</a>`;
 
-                    const refLink = item.ref_no
-                        ? `<a href="#" class="fw-semibold text-decoration-none text-dark font-monospace" style="cursor: pointer;" onclick="showInwardHistoryBreakdownModal('${encodeURIComponent(item.file_number || '')}', '${encodeURIComponent(item.ref_no || '')}', '${groupKeyParam}'); return false;" title="Click to view DC toners breakdown">${escapeHtml(item.ref_no)}</a>`
-                        : '-';
-
                     const dcNoDisplay = item.dc_nos && item.dc_nos.length > 0 ? item.dc_nos.join(', ') : (item.dc_no || '-');
 
                     tr.innerHTML = ` 
                         <td class="fw-semibold text-secondary">${globalIdx}</td>
                         <td>${fileNoLink}${modelsCountBadge}</td> 
-                        <td>${refLink}</td>
                         <td class="fw-bold text-dark">${escapeHtml(vendorName)}</td>
                         <td class="font-monospace">${escapeHtml(dcNoDisplay)}</td>
                         <td class="text-center text-primary fw-bold font-monospace">${item.qty_registered}</td>
@@ -4913,8 +5146,8 @@
                         <td>${escapeHtml(item.vendor_name || '')}</td>
                         <td><span class="badge-toner-model">${escapeHtml(item.model_name || 'N/A')}</span></td>
                         <td class="text-center font-monospace fw-bold">${item.total_qty_registered || '0'}</td>
-                        <td><small class="text-dark fw-semibold">${item.workorder_start_date || 'N/A'}</small></td>
-                        <td><small class="text-dark fw-semibold">${item.workorder_end_date || 'N/A'}</small></td>
+                        <td><small class="text-dark fw-semibold font-monospace">${formatDateOnly(item.workorder_start_date)}</small></td>
+                        <td><small class="text-dark fw-semibold font-monospace">${formatDateOnly(item.workorder_end_date)}</small></td>
                         <td class="text-center">${pdfBtn}</td>
                     `;
                     tbody.appendChild(tr);
@@ -5150,6 +5383,7 @@
                     userRequestsCached = data || [];
                     renderUserRequestsTable('user-requests-table-body', userRequestsCached, true);
                     populateReportDepartmentFilters();
+                    populateReportZoneFilters();
                     applyReportFilters();
                 })
                 .catch(err => console.error("Error fetching user requests for report:", err));
@@ -5168,11 +5402,13 @@
                 .then(data => {
                     outwardHistoryCached = data || [];
                     populateReportDepartmentFilters();
+                    populateReportZoneFilters();
                     applyReportFilters();
                 })
                 .catch(err => console.error("Error fetching outward history for report:", err));
 
             fetchDepartmentsList();
+            fetchZonesList();
             fetchWorkorderHistory();
             fetchWorkorderRequestHistory();
         }
@@ -5210,10 +5446,8 @@
 
         function populateReportDepartmentFilters() {
             const select = document.getElementById('report-dept-filter');
-            if (!select) return;
-
-            const currentVal = select.value;
-            select.innerHTML = '<option value="">-- All Departments --</option>';
+            const tableSelect = document.getElementById('table-dept-filter');
+            if (!select && !tableSelect) return;
 
             const deptSet = new Set();
 
@@ -5240,16 +5474,66 @@
             const depts = Array.from(deptSet).filter(Boolean);
             depts.sort((a, b) => a.localeCompare(b));
 
-            depts.forEach(d => {
-                const opt = document.createElement('option');
-                opt.value = d;
-                opt.textContent = d;
-                select.appendChild(opt);
-            });
-
-            if (currentVal && depts.includes(currentVal)) {
-                select.value = currentVal;
+            const populateSelect = (sel) => {
+                if (!sel) return;
+                const currentVal = sel.value;
+                sel.innerHTML = '<option value="">-- All Departments --</option>';
+                depts.forEach(d => {
+                    const opt = document.createElement('option');
+                    opt.value = d;
+                    opt.textContent = d;
+                    sel.appendChild(opt);
+                });
+                if (currentVal && depts.includes(currentVal)) {
+                    sel.value = currentVal;
+                }
+            };
+
+            populateSelect(select);
+            populateSelect(tableSelect);
+        }
+
+        function populateReportZoneFilters() {
+            const select = document.getElementById('report-zone-filter');
+            const tableSelect = document.getElementById('table-zone-filter');
+            if (!select && !tableSelect) return;
+
+            const zoneSet = new Set();
+
+            if (zonesCached && zonesCached.length > 0) {
+                zonesCached.forEach(z => {
+                    if (z && z.zone_name) zoneSet.add(z.zone_name.trim());
+                });
+            }
+
+            if (userRequestsCached && userRequestsCached.length > 0) {
+                userRequestsCached.forEach(r => {
+                    if (r.zone_name && String(r.zone_name).trim() && r.zone_name !== 'N/A' && r.zone_name !== '-') {
+                        zoneSet.add(String(r.zone_name).trim());
+                    }
+                });
             }
+
+            const zones = Array.from(zoneSet).filter(Boolean);
+            zones.sort((a, b) => a.localeCompare(b));
+
+            const populateSelect = (sel) => {
+                if (!sel) return;
+                const currentVal = sel.value;
+                sel.innerHTML = '<option value="">-- All Zones --</option>';
+                zones.forEach(z => {
+                    const opt = document.createElement('option');
+                    opt.value = z;
+                    opt.textContent = z;
+                    sel.appendChild(opt);
+                });
+                if (currentVal && zones.includes(currentVal)) {
+                    sel.value = currentVal;
+                }
+            };
+
+            populateSelect(select);
+            populateSelect(tableSelect);
         }
 
         function onReportPeriodPresetChange() {
@@ -5347,7 +5631,8 @@
         }
 
         function onReportTypeChange() {
-            const reportType = document.getElementById('report-type-select').value;
+            const reportType = activeSelectedReportType || document.getElementById('report-type-select')?.value || 'user_requests';
+            activeSelectedReportType = reportType;
             const statusWrapper = document.getElementById('report-status-filter-wrapper');
             const deptWrapper = document.getElementById('report-dept-filter-wrapper');
             const filenoWrapper = document.getElementById('report-fileno-filter-wrapper');
@@ -5367,8 +5652,17 @@
             applyReportFilters(1);
         }
 
+        let activeSelectedPrinterId = '';
+
+        function getPrinterNameById(pid) {
+            if (!pid) return '';
+            const list = (printersCached && printersCached.length > 0) ? printersCached : (masterPrintersCached || []);
+            const found = list.find(p => String(p.id) === String(pid));
+            return found ? (found.printer_name || '') : '';
+        }
+
         function onReportPrinterFilterChange() {
-            const pid = document.getElementById('report-printer-filter')?.value || '';
+            const pid = activeSelectedPrinterId || document.getElementById('report-printer-filter')?.value || '';
             const tablePrinter = document.getElementById('table-printer-filter');
             if (tablePrinter) tablePrinter.value = pid;
 
@@ -5390,17 +5684,20 @@
                     .then(res => res.json())
                     .then(toners => {
                         (toners || []).forEach(t => {
+                            const partCodeStr = (t.part_code && String(t.part_code).trim() !== '' && String(t.part_code).trim().toLowerCase() !== 'null' && String(t.part_code).trim().toLowerCase() !== 'n/a' && String(t.part_code).trim() !== '-')
+                                ? ` (${t.part_code.trim()})`
+                                : '';
                             if (tonerSelect) {
                                 const opt = document.createElement('option');
                                 opt.value = t.id;
-                                opt.textContent = t.model_name;
+                                opt.textContent = `${t.model_name || ''}${partCodeStr}`;
                                 tonerSelect.appendChild(opt);
                             }
 
                             if (tableTonerSelect) {
                                 const opt2 = document.createElement('option');
                                 opt2.value = t.id;
-                                opt2.textContent = t.model_name;
+                                opt2.textContent = `${t.model_name || ''}${partCodeStr}`;
                                 tableTonerSelect.appendChild(opt2);
                             }
                         });
@@ -5426,14 +5723,30 @@
             applyReportFilters(1);
         }
 
-        function updateDynamicMetrics(selectedPrinter, selectedToner, selectedDept, selectedStatus, searchQuery, selectedFileNo) {
+        function updateDynamicMetrics(selectedPrinter, selectedToner, selectedDept, selectedStatus, searchQuery, selectedFileNo, selectedZone) {
             if (!selectedFileNo) {
                 selectedFileNo = (document.getElementById('report-fileno-filter')?.value || '').trim();
             }
+            if (!selectedDept) {
+                selectedDept = (document.getElementById('table-dept-filter')?.value || document.getElementById('report-dept-filter')?.value || '').trim();
+            }
+            if (!selectedZone) {
+                selectedZone = (document.getElementById('table-zone-filter')?.value || document.getElementById('report-zone-filter')?.value || '').trim();
+            }
             const matchPrinter = (item) => {
                 if (!selectedPrinter) return true;
-                const pid = item.pid !== undefined && item.pid !== null ? item.pid : item.printer_id;
-                return pid !== undefined && pid !== null && String(pid) === String(selectedPrinter);
+                const pid = item.pid !== undefined && item.pid !== null ? item.pid : (item.printer_id !== undefined && item.printer_id !== null ? item.printer_id : '');
+                if (pid !== '' && String(pid) === String(selectedPrinter)) {
+                    return true;
+                }
+                const selectedName = getPrinterNameById(selectedPrinter);
+                if (selectedName && (item.printer_name || item.printer)) {
+                    const itemName = (item.printer_name || item.printer || '').trim().toLowerCase();
+                    if (itemName === selectedName.trim().toLowerCase()) {
+                        return true;
+                    }
+                }
+                return false;
             };
 
             const matchToner = (item) => {
@@ -5471,18 +5784,22 @@
                 return true;
             });
 
-            // 3. Filter User Requests items matching selected filters, department & period
+            // 3. Filter User Requests items matching selected filters, department, zone & period
             const filteredRequests = (userRequestsCached || []).filter(item => {
                 if (!matchPrinter(item)) return false;
                 if (!matchToner(item)) return false;
                 if (selectedDept) {
-                    const dName = (item.dept_name).trim().toLowerCase();
+                    const dName = (item.dept_name || item.dept_id || '').trim().toLowerCase();
                     if (dName !== selectedDept.toLowerCase()) return false;
                 }
+                if (selectedZone) {
+                    const zName = (item.zone_name || item.zone_id || '').trim().toLowerCase();
+                    if (zName !== selectedZone.toLowerCase()) return false;
+                }
                 if (!matchesReportPeriod(item.cdate)) return false;
 
                 if (searchQuery) {
-                    const searchStr = `${item.req_no || ''} ${item.itcell_ref_no || ''} ${item.dept_name || ''} ${item.printer_name || ''} ${item.model_name || ''}`.toLowerCase();
+                    const searchStr = `${item.req_no || ''} ${item.itcell_ref_no || ''} ${item.dept_name || ''} ${item.zone_name || ''} ${item.printer_name || ''} ${item.model_name || ''}`.toLowerCase();
                     if (!searchStr.includes(searchQuery)) return false;
                 }
                 return true;
@@ -5509,6 +5826,213 @@
             if (inwardEl) inwardEl.textContent = totalInward;
             if (distributedEl) distributedEl.textContent = totalDistributed;
             if (stockEl) stockEl.textContent = availableStock;
+
+            // Render/Update individual printer model inward stock cards
+            renderPrinterModelStockCards();
+        }
+
+        const PRINTER_CARD_PALETTES = [
+            { primary: '#0f5c78', light: '#e6f4f8', border: '#99d2e2' },
+            { primary: '#2563eb', light: '#eff6ff', border: '#bfdbfe' },
+            { primary: '#059669', light: '#ecfdf5', border: '#a7f3d0' },
+            { primary: '#7c3aed', light: '#f5f3ff', border: '#ddd6fe' },
+            { primary: '#d97706', light: '#fffbeb', border: '#fde68a' },
+            { primary: '#0891b2', light: '#ecfeff', border: '#a5f3fc' },
+            { primary: '#e11d48', light: '#fff1f2', border: '#fecdd3' },
+            { primary: '#4f46e5', light: '#eef2ff', border: '#c7d2fe' }
+        ];
+
+        function renderPrinterModelStockCards() {
+            const container = document.getElementById('printer-model-cards-grid');
+            if (!container) return;
+
+            const selectedPrinter = activeSelectedPrinterId || (document.getElementById('report-printer-filter')?.value || '').trim();
+            const clearBtn = document.getElementById('btn-clear-printer-card-filter');
+            if (clearBtn) {
+                if (selectedPrinter) {
+                    clearBtn.classList.remove('d-none');
+                } else {
+                    clearBtn.classList.add('d-none');
+                }
+            }
+
+            // Printer list source
+            let printersList = (printersCached && printersCached.length > 0) ? printersCached : (masterPrintersCached || []);
+            printersList = (printersList || []).filter(p => !p.is_delete && (p.is_active === undefined || p.is_active == 1));
+
+            if (!printersList || printersList.length === 0) {
+                container.innerHTML = `
+                    <div class="col-12 text-center py-4 text-muted">
+                        <i class="fa-solid fa-print fa-2x mb-2 opacity-50" style="color: #64748b;"></i>
+                        <p class="mb-0">No printer models found.</p>
+                    </div>`;
+                const totalInwardEl = document.getElementById('printer-cards-total-inward');
+                if (totalInwardEl) totalInwardEl.textContent = '0';
+                return;
+            }
+
+            // Calculate inward, requested, delivered, available per printer
+            let grandTotalInward = 0;
+            const printerStats = {};
+
+            printersList.forEach(p => {
+                printerStats[String(p.id)] = {
+                    id: p.id,
+                    name: p.printer_name || ('Printer #' + p.id),
+                    inward: 0,
+                    requested: 0,
+                    delivered: 0,
+                    tonerCount: 0
+                };
+            });
+
+            // Aggregate Inward stock from inwardHistoryCached with Date Period filter
+            if (inwardHistoryCached && inwardHistoryCached.length > 0) {
+                inwardHistoryCached.forEach(item => {
+                    if (!matchesReportPeriod(item.cdate || item.dc_date)) return;
+                    const pid = String(item.pid !== undefined && item.pid !== null ? item.pid : (item.printer_id || '')).trim();
+                    const qty = parseInt(item.qty_registered || item.inward_qty || 0) || 0;
+                    grandTotalInward += qty;
+                    if (pid && printerStats[pid]) {
+                        printerStats[pid].inward += qty;
+                    }
+                });
+            } else if (stockSummaryCached && stockSummaryCached.length > 0) {
+                stockSummaryCached.forEach(item => {
+                    const pid = String(item.pid !== undefined && item.pid !== null ? item.pid : (item.printer_id || '')).trim();
+                    const qty = parseInt(item.inward_qty || 0) || 0;
+                    const out = parseInt(item.outward_qty || 0) || 0;
+                    if (pid && printerStats[pid]) {
+                        printerStats[pid].inward += qty;
+                        printerStats[pid].delivered += out;
+                    }
+                });
+                grandTotalInward = Object.values(printerStats).reduce((sum, s) => sum + s.inward, 0);
+            }
+
+            // Aggregate Requested & Delivered from userRequestsCached with Date Period filter
+            (userRequestsCached || []).forEach(item => {
+                if (!matchesReportPeriod(item.request_date || item.cdate)) return;
+                const pid = String(item.pid !== undefined && item.pid !== null ? item.pid : (item.printer_id || '')).trim();
+                const qtyReq = parseInt(item.qty_requested || item.request_qty || item.req_qty || 0) || 0;
+                const qtyDelivered = parseInt(item.qty_delivered || item.outward_qty || 0) || 0;
+                if (pid && printerStats[pid]) {
+                    printerStats[pid].requested += qtyReq;
+                    printerStats[pid].delivered += qtyDelivered;
+                }
+            });
+
+            // Fallback for delivered from outwardHistoryCached if not present in userRequests with Date Period filter
+            if (outwardHistoryCached && outwardHistoryCached.length > 0) {
+                const deliveredFromOutward = {};
+                outwardHistoryCached.forEach(item => {
+                    if (!matchesReportPeriod(item.dc_date || item.cdate)) return;
+                    const pid = String(item.pid !== undefined && item.pid !== null ? item.pid : (item.printer_id || '')).trim();
+                    const qtyDel = parseInt(item.qty_delivered || item.qty || 0) || 0;
+                    if (pid) {
+                        deliveredFromOutward[pid] = (deliveredFromOutward[pid] || 0) + qtyDel;
+                    }
+                });
+                Object.keys(deliveredFromOutward).forEach(pid => {
+                    if (printerStats[pid] && printerStats[pid].delivered === 0) {
+                        printerStats[pid].delivered = deliveredFromOutward[pid];
+                    }
+                });
+            }
+
+            // Count toners mapped to printer from stockSummaryCached
+            if (stockSummaryCached && stockSummaryCached.length > 0) {
+                const seenToners = new Set();
+                stockSummaryCached.forEach(item => {
+                    const pid = String(item.pid !== undefined && item.pid !== null ? item.pid : (item.printer_id || '')).trim();
+                    const tid = String(item.tid !== undefined && item.tid !== null ? item.tid : (item.id || '')).trim();
+                    const key = pid + '_' + tid;
+                    if (pid && printerStats[pid] && !seenToners.has(key)) {
+                        seenToners.add(key);
+                        printerStats[pid].tonerCount++;
+                    }
+                });
+            }
+
+            const totalInwardEl = document.getElementById('printer-cards-total-inward');
+            if (totalInwardEl) totalInwardEl.textContent = grandTotalInward;
+
+            // Generate HTML for each printer card
+            let html = '';
+            printersList.forEach((p, index) => {
+                const stat = printerStats[String(p.id)] || { id: p.id, name: p.printer_name, inward: 0, requested: 0, delivered: 0, tonerCount: 0 };
+                const available = Math.max(0, stat.inward - stat.delivered);
+                const isSelected = selectedPrinter && String(selectedPrinter) === String(p.id);
+                const palette = PRINTER_CARD_PALETTES[index % PRINTER_CARD_PALETTES.length];
+
+                html += `
+                    <div class="col-12 col-sm-6 col-md-6 col-lg-4 col-xl-4 col-xxl-3">
+                        <div class="printer-stock-card ${isSelected ? 'active-printer-card' : ''}"
+                            style="--accent-primary: ${palette.primary}; --accent-light: ${palette.light}; --accent-border: ${palette.border}; cursor: pointer;"
+                            onclick="openPrinterDrilldown('${p.id}', '${escapeHtml(stat.name)}')"
+                            title="Click to open detailed drilldown report for ${escapeHtml(stat.name)} in separate page">
+                            
+                            <!-- Header: Large Printer Name & Icon -->
+                            <div class="d-flex align-items-center justify-content-between gap-2 mb-3">
+                                <div class="d-flex align-items-center gap-2 overflow-hidden">
+                                    <div class="printer-card-icon" style="color: ${palette.primary}; background: ${palette.light}; border: 1.5px solid ${palette.border};">
+                                        <i class="fa-solid fa-print"></i>
+                                    </div>
+                                    <div class="overflow-hidden">
+                                        <h4 class="printer-card-title text-truncate m-0" title="${escapeHtml(stat.name)}">
+                                            ${escapeHtml(stat.name)}
+                                        </h4>
+                                        <span class="printer-card-subtitle text-muted d-block mt-0.5">
+                                            <i class="fa-solid fa-droplet me-1" style="color: ${palette.primary};"></i>${stat.tonerCount > 0 ? (stat.tonerCount + ' Toner models') : 'Printer Model'}
+                                        </span>
+                                    </div>
+                                </div>
+                                ${isSelected ? `
+                                    <span class="badge" style="background: #0f5c78; color: #ffffff; font-size: 0.75rem; padding: 5px 10px; border-radius: 8px;">
+                                        <i class="fa-solid fa-check me-1"></i>Filtered
+                                    </span>
+                                ` : ''}
+                            </div>
+
+                            <!-- In-Hand Stock Highlight Box -->
+                            <div class="printer-inhand-box" style="background: ${palette.light}; border: 1.5px solid ${palette.border};">
+                                <span class="printer-inhand-label">
+                                    <i class="fa-solid fa-warehouse me-1" style="color: ${palette.primary};"></i>Total In-Hand Stock
+                                </span>
+                                <div class="printer-inhand-value" style="color: ${palette.primary};">
+                                    ${available}
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>`;
+            });
+
+            container.innerHTML = html;
+        }
+
+        function openPrinterDrilldown(printerId, printerName) {
+            const params = new URLSearchParams();
+            if (printerId) params.append('printerId', printerId);
+            if (printerName) params.append('printerName', printerName);
+            window.location.href = contextPath + 'gcctonermanagement/details?' + params.toString();
+        }
+
+        function selectPrinterCard(printerId) {
+            const targetPid = printerId ? String(printerId).trim() : '';
+            if (activeSelectedPrinterId === targetPid) {
+                activeSelectedPrinterId = '';
+            } else {
+                activeSelectedPrinterId = targetPid;
+            }
+
+            const reportPrinter = document.getElementById('report-printer-filter');
+            if (reportPrinter) reportPrinter.value = activeSelectedPrinterId;
+
+            const tablePrinter = document.getElementById('table-printer-filter');
+            if (tablePrinter) tablePrinter.value = activeSelectedPrinterId;
+
+            onReportPrinterFilterChange();
         }
 
         let reportCurrentPage = 1;
@@ -5536,8 +6060,15 @@
         }
 
         function resetReportFilters() {
-            document.getElementById('report-type-select').value = 'user_requests';
-            document.getElementById('report-printer-filter').value = '';
+            activeSelectedPrinterId = '';
+            activeSelectedReportType = 'user_requests';
+            document.querySelectorAll('.metrics-grid .metric-card').forEach(c => c.style.outline = 'none');
+
+            const reportTypeSelect = document.getElementById('report-type-select');
+            if (reportTypeSelect) reportTypeSelect.value = 'user_requests';
+
+            const reportPrinter = document.getElementById('report-printer-filter');
+            if (reportPrinter) reportPrinter.value = '';
             const tablePrinter = document.getElementById('table-printer-filter');
             if (tablePrinter) tablePrinter.value = '';
 
@@ -5554,6 +6085,13 @@
 
             const deptSelect = document.getElementById('report-dept-filter');
             if (deptSelect) deptSelect.value = '';
+            const tableDept = document.getElementById('table-dept-filter');
+            if (tableDept) tableDept.value = '';
+
+            const zoneSelect = document.getElementById('report-zone-filter');
+            if (zoneSelect) zoneSelect.value = '';
+            const tableZone = document.getElementById('table-zone-filter');
+            if (tableZone) tableZone.value = '';
 
             const filenoSelect = document.getElementById('report-fileno-filter');
             if (filenoSelect) filenoSelect.value = '';
@@ -5573,14 +6111,16 @@
             const toWrapper = document.getElementById('report-to-date-wrapper');
             if (toWrapper) toWrapper.style.display = 'none';
 
-            document.getElementById('report-status-filter').value = '';
+            const statusSelect = document.getElementById('report-status-filter');
+            if (statusSelect) statusSelect.value = '';
             const statusWrapper = document.getElementById('report-status-filter-wrapper');
             if (statusWrapper) statusWrapper.style.display = 'block';
 
             const deptWrapper = document.getElementById('report-dept-filter-wrapper');
             if (deptWrapper) deptWrapper.style.display = 'block';
 
-            document.getElementById('report-search-input').value = '';
+            const searchInput = document.getElementById('report-search-input');
+            if (searchInput) searchInput.value = '';
             const tableSearch = document.getElementById('table-quick-search');
             if (tableSearch) tableSearch.value = '';
 
@@ -5692,16 +6232,17 @@
                 reportCurrentPage = targetPage;
             }
 
-            const reportType = document.getElementById('report-type-select').value;
-            const selectedPrinter = document.getElementById('report-printer-filter').value;
-            const selectedToner = document.getElementById('report-toner-filter').value;
-            const selectedDept = (document.getElementById('report-dept-filter')?.value || '').trim();
+            const reportType = activeSelectedReportType || document.getElementById('report-type-select')?.value || 'user_requests';
+            const selectedPrinter = activeSelectedPrinterId || document.getElementById('report-printer-filter')?.value || document.getElementById('table-printer-filter')?.value || '';
+            const selectedToner = document.getElementById('report-toner-filter')?.value || document.getElementById('table-toner-filter')?.value || '';
+            const selectedDept = (document.getElementById('table-dept-filter')?.value || document.getElementById('report-dept-filter')?.value || '').trim();
+            const selectedZone = (document.getElementById('table-zone-filter')?.value || document.getElementById('report-zone-filter')?.value || '').trim();
             const selectedFileNo = (document.getElementById('report-fileno-filter')?.value || '').trim();
-            const selectedStatus = document.getElementById('report-status-filter').value;
-            const searchQuery = document.getElementById('report-search-input').value.trim().toLowerCase();
+            const selectedStatus = document.getElementById('report-status-filter')?.value || '';
+            const searchQuery = (document.getElementById('report-search-input')?.value || document.getElementById('table-quick-search')?.value || '').trim().toLowerCase();
 
-            // Calculate & update dynamic metrics based on selected filters, department & period
-            updateDynamicMetrics(selectedPrinter, selectedToner, selectedDept, selectedStatus, searchQuery, selectedFileNo);
+            // Calculate & update dynamic metrics based on selected filters, department, zone & period
+            updateDynamicMetrics(selectedPrinter, selectedToner, selectedDept, selectedStatus, searchQuery, selectedFileNo, selectedZone);
 
             const titleEl = document.getElementById('report-dynamic-title');
             const badgeEl = document.getElementById('report-count-badge');
@@ -5712,8 +6253,18 @@
 
             const matchPrinter = (item) => {
                 if (!selectedPrinter) return true;
-                const pid = item.pid !== undefined && item.pid !== null ? item.pid : item.printer_id;
-                return pid !== undefined && pid !== null && String(pid) === String(selectedPrinter);
+                const pid = item.pid !== undefined && item.pid !== null ? item.pid : (item.printer_id !== undefined && item.printer_id !== null ? item.printer_id : '');
+                if (pid !== '' && String(pid) === String(selectedPrinter)) {
+                    return true;
+                }
+                const selectedName = getPrinterNameById(selectedPrinter);
+                if (selectedName && (item.printer_name || item.printer)) {
+                    const itemName = (item.printer_name || item.printer || '').trim().toLowerCase();
+                    if (itemName === selectedName.trim().toLowerCase()) {
+                        return true;
+                    }
+                }
+                return false;
             };
 
             const matchToner = (item) => {
@@ -5745,9 +6296,13 @@
                     if (!matchPrinter(item)) return;
                     if (!matchToner(item)) return;
                     if (selectedDept) {
-                        const dName = (item.dept_name || '').trim().toLowerCase();
+                        const dName = (item.dept_name || item.dept_id || '').trim().toLowerCase();
                         if (dName !== selectedDept.toLowerCase()) return;
                     }
+                    if (selectedZone) {
+                        const zName = (item.zone_name || item.zone_id || '').trim().toLowerCase();
+                        if (zName !== selectedZone.toLowerCase()) return;
+                    }
                     if (!matchesReportPeriod(item.request_date || item.cdate)) return;
 
                     const cleanRef = (item.itcell_ref_no || '').trim();
@@ -5892,11 +6447,11 @@
                     <tr>
                         <th style="width: 60px;">S.No</th> 
                         ${getSortHeader('File No.', 'file_number')}
-                        ${getSortHeader('Workorder Ref', 'ref_no')}
                         ${getSortHeader('Vendor', 'vendor_name')}
                         ${getSortHeader('Registered Qty', 'total_qty_registered', 'text-center')}
                         ${getSortHeader('Start Date', 'workorder_start_date')}
                         ${getSortHeader('End Date', 'workorder_end_date')}
+                        <th class="text-center">Status</th>
                         <th class="text-center">Workorder Copy</th>
                     </tr>`;
 
@@ -5912,14 +6467,12 @@
                     if (!matchesReportPeriod(item.workorder_start_date || item.cdate)) return;
 
                     const cleanFile = (item.file_number || '').trim();
-                    const cleanRef = (item.ref_no || '').trim();
-                    const key = cleanFile || cleanRef || ('wo_' + (item.id || Math.random()));
+                    const key = cleanFile || ('wo_' + (item.id || Math.random()));
 
                     if (!groups[key]) {
                         groups[key] = {
                             key: key,
                             file_number: cleanFile,
-                            ref_no: cleanRef,
                             vendor_name: item.vendor_name || '-',
                             vendor_id: item.vendor_id,
                             total_qty_registered: 0,
@@ -5978,7 +6531,7 @@
                 reportCurrentPage = Math.min(Math.max(1, reportCurrentPage), totalPages);
 
                 if (filtered.length === 0) {
-                    tbody.innerHTML = `<tr><td colspan="8" class="text-center text-muted py-4">No matching workorders found.</td></tr>`;
+                    tbody.innerHTML = `<tr><td colspan="9" class="text-center text-muted py-4">No matching workorders found.</td></tr>`;
                     renderReportPaginationNav(1, 0);
                     return;
                 }
@@ -5997,25 +6550,22 @@
                         }).join(' ');
                     }
 
-                    const groupKeyParam = encodeURIComponent(item.key || item.file_number || item.ref_no || '');
-                    const modelsCountBadge = item.items && item.items.length > 1
-                        ? `<br><span class="badge bg-light text-secondary border mt-1" style="cursor: pointer;" onclick="showWorkorderHistoryBreakdownModal('${encodeURIComponent(item.ref_no || '')}', '${encodeURIComponent(item.file_number || '')}', '${groupKeyParam}');" title="Click to view ${item.items.length} toners"><i class="fa-solid fa-layer-group me-1"></i>${item.items.length} Toners</span>`
-                        : (item.items && item.items.length === 1 ? `<br><small class="text-muted font-monospace">${escapeHtml(item.items[0].model_name || '')}</small>` : '');
-
-                    const fileNoLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #0f5c78; cursor: pointer; font-size: 0.95rem;" onclick="showWorkorderHistoryBreakdownModal('${encodeURIComponent(item.ref_no || '')}', '${encodeURIComponent(item.file_number || '')}', '${groupKeyParam}'); return false;" title="Click to view workorder toners breakdown">${escapeHtml(item.file_number || item.ref_no || '-')}</a>`;
+                    const firstFile = (item.dc_uploads && item.dc_uploads.length > 0) ? item.dc_uploads[0] : null;
+                    const fileNoLink = firstFile
+                        ? `<a href="${resolveUploadUrl(firstFile)}" target="_blank" class="fw-bold text-decoration-none text-primary font-monospace" style="font-size: 0.95rem;" title="Click to view uploaded workorder copy">${escapeHtml(item.file_number || item.ref_no || '-')}</a>`
+                        : `<span class="fw-bold text-dark font-monospace">${escapeHtml(item.file_number || item.ref_no || '-')}</span>`;
 
-                    const refLink = item.ref_no
-                        ? `<a href="#" class="fw-semibold text-decoration-none text-dark font-monospace" style="cursor: pointer;" onclick="showWorkorderHistoryBreakdownModal('${encodeURIComponent(item.ref_no || '')}', '${encodeURIComponent(item.file_number || '')}', '${groupKeyParam}'); return false;">${escapeHtml(item.ref_no)}</a>`
-                        : '-';
+                    const refText = `<span class="fw-semibold text-dark font-monospace">${escapeHtml(item.ref_no || '-')}</span>`;
+                    const statusBadge = getWorkorderStatusBadge(item.workorder_start_date, item.workorder_end_date);
 
                     tr.innerHTML = `
                         <td class="fw-semibold text-secondary">${globalIdx}</td>
-                        <td>${fileNoLink}${modelsCountBadge}</td>
-                        <td>${refLink}</td>
+                        <td>${fileNoLink}</td>
                         <td>${escapeHtml(item.vendor_name || '')}</td>
                         <td class="text-center font-monospace fw-bold text-dark">${item.total_qty_registered || '0'}</td>
-                        <td><small class="text-dark fw-semibold">${item.workorder_start_date || 'N/A'}</small></td>
-                        <td><small class="text-dark fw-semibold">${item.workorder_end_date || 'N/A'}</small></td>
+                        <td><small class="text-dark fw-semibold font-monospace">${formatDateOnly(item.workorder_start_date)}</small></td>
+                        <td><small class="text-dark fw-semibold font-monospace">${formatDateOnly(item.workorder_end_date)}</small></td>
+                        <td class="text-center">${statusBadge}</td>
                         <td class="text-center">${pdfBtn}</td>
                     `;
                     tbody.appendChild(tr);
@@ -6088,24 +6638,24 @@
 
                 renderReportPaginationNav(totalPages, filtered.length);
             }
-            // 2. Inward Register Stock Report (Grouped per DC Delivery Transaction)
+            // 2. Inward Register Stock Report (Grouped per UNIQUE File No)
             else if (reportType === 'inward_stock') {
                 titleEl.innerHTML = `<i class="fa-solid fa-boxes-packing me-2"></i>Inward Register Stock Report`;
                 thead.innerHTML = `
                     <tr>
-                        <th style="width: 60px;">S.No</th>
+                        <th style="width: 50px;">S.No</th>
                         ${getSortHeader('File No.', 'file_number')}
-                        ${getSortHeader('Workorder Ref', 'ref_no')}
                         ${getSortHeader('Company Name', 'company_name')}
-                        <th>DC Number</th>
+                        <th>DC Number(s)</th>
+                        ${getSortHeader('Printer Model', 'printer_name')}
                         ${getSortHeader('Qty Inward', 'qty_registered', 'text-center')}
-                        ${getSortHeader('DC Date', 'dc_date')}
+                        ${getSortHeader('Latest DC Date', 'dc_date')}
                         ${getSortHeader('Created Date', 'cdate')}
-                        <th>Entered By</th>
+                        ${getSortHeader('Entered By', 'order_by')}
                         <th class="text-center">DC Document</th>
                     </tr>`;
 
-                // Group records per distinct DC delivery transaction
+                // Group records strictly per UNIQUE File No
                 const groups = {};
                 (inwardHistoryCached || []).forEach(item => {
                     if (!matchPrinter(item)) return;
@@ -6113,22 +6663,21 @@
                     if (!matchesReportPeriod(item.cdate)) return;
 
                     const cleanFile = (item.file_number || '').trim();
-                    const cleanRef = (item.ref_no || '').trim();
+                    //const cleanRef = (item.ref_no || '').trim();
                     const cleanDcNo = (item.dc_no || '').trim();
                     const cleanDcUpload = (item.dc_upload || item.dc_uploads || '').toString().trim();
                     const cdateKey = item.cdate ? String(item.cdate).substring(0, 19) : '';
+                    const dcDateKey = item.dc_date ? String(item.dc_date).substring(0, 10) : '';
 
-                    const key = `${cleanRef || 'general'}_${cleanDcNo || 'nodc'}_${cleanDcUpload || ('item_' + (item.id || Math.random()))}_${cdateKey}`;
+                    const fileKey = cleanFile || ('inward_' + (item.id || Math.random()));
 
-                    if (!groups[key]) {
-                        groups[key] = {
-                            key: key,
+                    if (!groups[fileKey]) {
+                        groups[fileKey] = {
+                            key: fileKey,
                             file_number: cleanFile,
-                            ref_no: cleanRef,
                             company_name: item.company_name,
                             vendor_name: item.vendor_name || vendorsMap[item.company_name] || item.company_name || '',
-                            dc_no: cleanDcNo || '-',
-                            dc_nos: cleanDcNo ? [cleanDcNo] : [],
+                            qty_workorder_registered: 0,
                             qty_registered: 0,
                             cdate: item.cdate,
                             dc_date: item.dc_date || '',
@@ -6136,43 +6685,72 @@
                             dc_uploads: [],
                             printer_names: [],
                             model_names: [],
+                            dc_entries: [],
                             items: []
                         };
                     }
 
-                    if (cleanFile && !groups[key].file_number) {
-                        groups[key].file_number = cleanFile;
+                    if (cleanFile && !groups[fileKey].file_number) {
+                        groups[fileKey].file_number = cleanFile;
                     }
 
-                    const qty = parseInt(item.qty_registered || item.inward_qty || 0) || 0;
-                    groups[key].qty_registered += qty;
-                    groups[key].items.push(item);
-
-                    if (cleanDcNo && !groups[key].dc_nos.includes(cleanDcNo)) {
-                        groups[key].dc_nos.push(cleanDcNo);
-                    }
-                    if (item.printer_name && !groups[key].printer_names.includes(item.printer_name)) {
-                        groups[key].printer_names.push(item.printer_name);
-                    }
-                    if (item.model_name && !groups[key].model_names.includes(item.model_name)) {
-                        groups[key].model_names.push(item.model_name);
-                    }
-                    if (item.dc_date && !groups[key].dc_date) {
-                        groups[key].dc_date = item.dc_date;
+                    // Sub-group by unique DC under this File No
+                    const subDcKey = cleanDcNo ? cleanDcNo : (cleanDcUpload || dcDateKey || cdateKey || ('dc_' + groups[fileKey].dc_entries.length));
+                    let dcEntry = groups[fileKey].dc_entries.find(d => d.dc_key === subDcKey);
+                    if (!dcEntry) {
+                        dcEntry = {
+                            dc_key: subDcKey,
+                            dc_no: cleanDcNo || '-',
+                            dc_date: item.dc_date || '',
+                            cdate: item.cdate,
+                            order_by: item.order_by || item.updated_by || '',
+                            qty_inward: 0,
+                            dc_uploads: [],
+                            printer_names: [],
+                            model_names: [],
+                            items: []
+                        };
+                        groups[fileKey].dc_entries.push(dcEntry);
                     }
-                    if (item.cdate && (!groups[key].cdate || new Date(item.cdate) > new Date(groups[key].cdate))) {
-                        groups[key].cdate = item.cdate;
+
+                    const qty = parseInt(item.qty_registered || item.inward_qty || 0) || 0;
+                    dcEntry.qty_inward += qty;
+                    dcEntry.items.push(item);
+                    if (item.printer_name && !dcEntry.printer_names.includes(item.printer_name)) {
+                        dcEntry.printer_names.push(item.printer_name);
                     }
-                    if (item.order_by && !groups[key].order_by) {
-                        groups[key].order_by = item.order_by;
+                    if (item.model_name && !dcEntry.model_names.includes(item.model_name)) {
+                        dcEntry.model_names.push(item.model_name);
                     }
+
                     const rawDc = item.dc_upload || item.dc_uploads;
                     if (rawDc) {
                         const files = Array.isArray(rawDc) ? rawDc : String(rawDc).split(',').map(s => s.trim()).filter(Boolean);
                         files.forEach(f => {
-                            if (f && !groups[key].dc_uploads.includes(f)) groups[key].dc_uploads.push(f);
+                            if (f && !dcEntry.dc_uploads.includes(f)) dcEntry.dc_uploads.push(f);
+                            if (f && !groups[fileKey].dc_uploads.includes(f)) groups[fileKey].dc_uploads.push(f);
                         });
                     }
+
+                    // Update File No Group totals
+                    groups[fileKey].qty_registered += qty;
+                    groups[fileKey].items.push(item);
+
+                    if (item.printer_name && !groups[fileKey].printer_names.includes(item.printer_name)) {
+                        groups[fileKey].printer_names.push(item.printer_name);
+                    }
+                    if (item.model_name && !groups[fileKey].model_names.includes(item.model_name)) {
+                        groups[fileKey].model_names.push(item.model_name);
+                    }
+                    if (item.dc_date && (!groups[fileKey].dc_date || new Date(item.dc_date) > new Date(groups[fileKey].dc_date))) {
+                        groups[fileKey].dc_date = item.dc_date;
+                    }
+                    if (item.cdate && (!groups[fileKey].cdate || new Date(item.cdate) > new Date(groups[fileKey].cdate))) {
+                        groups[fileKey].cdate = item.cdate;
+                    }
+                    if (item.order_by && !groups[fileKey].order_by) {
+                        groups[fileKey].order_by = item.order_by;
+                    }
                 });
 
                 reportInwardGroupsCached = groups;
@@ -6182,7 +6760,7 @@
                         const vendorName = vendorsMap[item.company_name] || (!isNaN(item.company_name) ? '' : (item.company_name || ''));
                         const printerNamesStr = (item.printer_names || []).join(' ');
                         const modelNamesStr = (item.model_names || []).join(' ');
-                        const dcNosStr = (item.dc_nos || []).join(' ');
+                        const dcNosStr = (item.dc_entries || []).map(d => d.dc_no).join(' ');
                         const searchStr = `${item.ref_no || ''} ${item.file_number || ''} ${vendorName} ${dcNosStr} ${printerNamesStr} ${modelNamesStr} ${item.order_by || ''}`.toLowerCase();
                         if (!searchStr.includes(searchQuery)) return false;
                     }
@@ -6191,7 +6769,7 @@
 
                 filtered = sortFilteredReportData(filtered);
 
-                if (badgeEl) badgeEl.textContent = `${filtered.length} Records`;
+                if (badgeEl) badgeEl.textContent = `${filtered.length} File Records`;
                 tbody.innerHTML = '';
 
                 const totalPages = Math.ceil(filtered.length / REPORT_PAGE_SIZE) || 1;
@@ -6206,47 +6784,161 @@
                 const pagedData = filtered.slice((reportCurrentPage - 1) * REPORT_PAGE_SIZE, reportCurrentPage * REPORT_PAGE_SIZE);
 
                 pagedData.forEach((item, idx) => {
-                    const tr = document.createElement('tr');
                     const globalIdx = (reportCurrentPage - 1) * REPORT_PAGE_SIZE + idx + 1;
+                    const expandId = 'rep_inw_' + globalIdx;
                     const createdDate = formatTimestamp(item.cdate);
                     const dcDateFormatted = (item.dc_date && String(item.dc_date).trim() !== '' && String(item.dc_date).trim() !== 'null') ? formatDateOnly(item.dc_date) : '-';
-
-                    let docBtn = '-';
-                    if (item.dc_uploads && item.dc_uploads.length > 0) {
-                        docBtn = item.dc_uploads.map((file, i) => {
-                            const label = item.dc_uploads.length > 1 ? `View DC ${i + 1}` : `View DC`;
-                            return `<a href="${resolveUploadUrl(file)}" target="_blank" class="btn-action btn-view-doc m-1" style="font-size: 11px; padding: 4px 8px; white-space: nowrap;"><i class="fa-solid fa-file-pdf"></i> ${label}</a>`;
-                        }).join(' ');
-                    }
-
                     const vendorName = vendorsMap[item.company_name] || (!isNaN(item.company_name) ? 'Unknown Vendor (' + item.company_name + ')' : (item.company_name || ''));
-                    const groupKeyParam = encodeURIComponent(item.key || item.file_number || item.ref_no || '');
+                    const numDcs = item.dc_entries ? item.dc_entries.length : 1;
+
+                    // Collect all uploaded DC document files
+                    let allUploadedDcFiles = [];
+                    if (item.dc_entries && item.dc_entries.length > 0) {
+                        item.dc_entries.forEach(dc => {
+                            if (dc.dc_uploads && Array.isArray(dc.dc_uploads)) {
+                                dc.dc_uploads.forEach(f => {
+                                    if (f && !allUploadedDcFiles.includes(f)) allUploadedDcFiles.push(f);
+                                });
+                            }
+                        });
+                    }
+                    if (allUploadedDcFiles.length === 0 && item.dc_uploads) {
+                        if (Array.isArray(item.dc_uploads)) {
+                            allUploadedDcFiles = item.dc_uploads.filter(Boolean);
+                        } else if (typeof item.dc_uploads === 'string' && item.dc_uploads.trim()) {
+                            allUploadedDcFiles = item.dc_uploads.split(',').map(s => s.trim()).filter(Boolean);
+                        }
+                    }
 
-                    const modelsCountBadge = item.items && item.items.length > 1
-                        ? `<br><span class="badge bg-light text-secondary border mt-1" style="cursor: pointer;" onclick="showInwardHistoryBreakdownModal('${encodeURIComponent(item.file_number || '')}', '${encodeURIComponent(item.ref_no || '')}', '${groupKeyParam}');" title="Click to view ${item.items.length} toners in this DC"><i class="fa-solid fa-layer-group me-1"></i>${item.items.length} Toners</span>`
-                        : (item.items && item.items.length === 1 ? `<br><small class="text-muted font-monospace">${escapeHtml(item.items[0].model_name || '')}</small>` : '');
+                    // Main File No Link directly opens the uploaded DC document file
+                    let fileNoLink = '';
+                    if (allUploadedDcFiles.length > 0) {
+                        fileNoLink = `<a href="${resolveUploadUrl(allUploadedDcFiles[0])}" target="_blank" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #0f5c78; cursor: pointer; font-size: 0.95rem;" title="Click to view uploaded DC document">${escapeHtml(item.file_number || item.ref_no || '-')}</a>`;
+                    } else {
+                        fileNoLink = `<span class="fw-bold text-dark font-monospace" style="font-size: 0.95rem;">${escapeHtml(item.file_number || item.ref_no || '-')}</span>`;
+                    }
 
-                    const fileNoLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #0f5c78; cursor: pointer; font-size: 0.95rem;" onclick="showInwardHistoryBreakdownModal('${encodeURIComponent(item.file_number || '')}', '${encodeURIComponent(item.ref_no || '')}', '${groupKeyParam}'); return false;" title="Click to view DC toners breakdown">${escapeHtml(item.file_number || item.ref_no || '-')}</a>`;
+                    let dcBadgeHtml = '';
+                    if (numDcs > 1) {
+                        dcBadgeHtml = `<div class="mt-1">
+                            <button type="button" class="btn btn-sm btn-outline-primary py-0 px-2 fw-semibold" style="font-size: 11px; border-radius: 6px;" onclick="toggleInwardDcDropdown('${expandId}'); return false;" title="Click to view all ${numDcs} Delivery Challans">
+                                <i class="fa-solid fa-layer-group me-1"></i>${numDcs} Delivery Challans <i class="fa-solid fa-chevron-down ms-1" id="chevron-${expandId}"></i>
+                            </button>
+                        </div>`;
+                    }
 
                     const refLink = item.ref_no
-                        ? `<a href="#" class="fw-semibold text-decoration-none text-dark font-monospace" style="cursor: pointer;" onclick="showInwardHistoryBreakdownModal('${encodeURIComponent(item.file_number || '')}', '${encodeURIComponent(item.ref_no || '')}', '${groupKeyParam}'); return false;" title="Click to view DC toners breakdown">${escapeHtml(item.ref_no)}</a>`
+                        ? `<span class="fw-semibold text-dark font-monospace">${escapeHtml(item.ref_no)}</span>`
                         : '-';
 
-                    const dcNoDisplay = item.dc_nos && item.dc_nos.length > 0 ? item.dc_nos.join(', ') : (item.dc_no || '-');
+                    const printerDisplay = item.printer_names && item.printer_names.length > 1
+                        ? item.printer_names.join(', ')
+                        : (item.printer_name || (item.printer_names && item.printer_names[0]) || 'N/A');
+
+                    // DC Numbers column formatting
+                    let dcNoColHtml = '';
+                    if (item.dc_entries && item.dc_entries.length > 0) {
+                        const dcNums = [...new Set(item.dc_entries.map(dc => (dc.dc_no || '').trim()).filter(d => d && d !== '-'))];
+                        dcNoColHtml = `<span class="fw-semibold text-dark font-monospace">${escapeHtml(dcNums.length > 0 ? dcNums.join(', ') : '-')}</span>`;
+                    } else {
+                        dcNoColHtml = `<span class="fw-semibold text-dark font-monospace">${escapeHtml(item.dc_number || '-')}</span>`;
+                    }
+
+                    // Qty Inward column formatting
+                    const qtyInwardColHtml = `<span class="text-primary fw-bold font-monospace fs-6">${item.qty_registered}</span>`;
+
+                    // DC Dates formatting
+                    const dcDateColHtml = `<small class="text-dark fw-semibold">${dcDateFormatted}</small>`;
 
+                    // DC Documents formatting
+                    let docColHtml = '-';
+                    if (allUploadedDcFiles.length > 0) {
+                        docColHtml = `<a href="${resolveUploadUrl(allUploadedDcFiles[0])}" target="_blank" class="btn-action btn-view-doc" style="font-size: 11px; padding: 4px 8px; white-space: nowrap;" title="View DC Document"><i class="fa-solid fa-file-pdf"></i> View DC</a>`;
+                    }
+
+                    const tr = document.createElement('tr');
                     tr.innerHTML = ` 
                         <td class="fw-semibold text-secondary">${globalIdx}</td>
-                        <td>${fileNoLink}${modelsCountBadge}</td> 
-                        <td>${refLink}</td>
+                        <td>${fileNoLink}${dcBadgeHtml}</td> 
                         <td class="fw-bold text-dark">${escapeHtml(vendorName)}</td>
-                        <td class="font-monospace">${escapeHtml(dcNoDisplay)}</td>
-                        <td class="text-center text-primary fw-bold font-monospace">${item.qty_registered}</td>
-                        <td><small class="text-dark fw-semibold">${dcDateFormatted}</small></td>
+                        <td>${dcNoColHtml}</td>
+                        <td>${escapeHtml(printerDisplay)}</td>
+                        <td class="text-center">${qtyInwardColHtml}</td>
+                        <td>${dcDateColHtml}</td>
                         <td><small class="text-muted fw-semibold">${createdDate}</small></td>
                         <td><small class="text-muted">${escapeHtml(item.order_by || '-')}</small></td>
-                        <td class="text-center">${docBtn}</td>
+                        <td class="text-center">${docColHtml}</td>
                     `;
                     tbody.appendChild(tr);
+
+                    // Expandable Dropdown Child Row
+                    if (numDcs > 1) {
+                        const expandTr = document.createElement('tr');
+                        expandTr.id = `inward-dc-expand-${expandId}`;
+                        expandTr.className = 'inward-expand-row';
+                        expandTr.style.display = 'none';
+                        expandTr.style.background = '#f8fafc';
+
+                        expandTr.innerHTML = `
+                            <td colspan="10" class="p-3 border-bottom">
+                                <div class="p-3 bg-white rounded border shadow-sm">
+                                    <div class="d-flex justify-content-between align-items-center mb-3 pb-2 border-bottom flex-wrap gap-2">
+                                        <div class="d-flex align-items-center gap-2">
+                                            <div class="rounded-circle p-2 d-flex align-items-center justify-content-center" style="background: #e6f4f8; color: #0f5c78; width: 32px; height: 32px;">
+                                                <i class="fa-solid fa-boxes-packing"></i>
+                                            </div>
+                                            <div>
+                                                <h6 class="fw-bold m-0" style="color: #0f5c78;">
+                                                    Delivery Challans Breakdown for File No: <span class="font-monospace text-dark">${escapeHtml(item.file_number || item.ref_no || '-')}</span>
+                                                </h6>
+                                                <span class="text-muted small">Vendor: <strong>${escapeHtml(vendorName)}</strong></span>
+                                            </div>
+                                        </div>
+                                        <span class="badge" style="background: #0f5c78; color: #ffffff; font-size: 0.85rem; padding: 6px 12px; border-radius: 8px;">
+                                            Total Inward: ${item.qty_registered} Nos (${numDcs} DCs)
+                                        </span>
+                                    </div>
+                                    <div class="table-responsive">
+                                        <table class="table table-sm table-bordered table-hover align-middle mb-0" style="font-size: 0.88rem;">
+                                            <thead class="table-light">
+                                                <tr>
+                                                    <th style="width: 60px;" class="text-center">S.No</th>
+                                                    <th>DC Number</th>
+                                                    <th>DC Date</th>
+                                                    <th class="text-center">Qty Inward</th> 
+                                                    <th>Created Date</th>
+                                                    <th>Entered By</th>
+                                                    <th class="text-center">DC Copy</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                ${item.dc_entries.map((dc, i) => {
+                            const letter = String.fromCharCode(97 + i);
+                            const dDate = dc.dc_date ? formatDateOnly(dc.dc_date) : '-';
+                            const cDate = formatTimestamp(dc.cdate);
+                            let docLink = `<span class="text-muted small">N/A</span>`;
+                            if (dc.dc_uploads && dc.dc_uploads.length > 0) {
+                                docLink = `<a href="${resolveUploadUrl(dc.dc_uploads[0])}" target="_blank" class="btn btn-sm btn-outline-danger py-0 px-2 fw-semibold" style="font-size: 11px;"><i class="fa-solid fa-file-pdf me-1"></i>View PDF</a>`;
+                            }
+                            return `
+                                                    <tr>
+                                                        <td class="fw-bold text-primary font-monospace text-center">(${letter})</td>
+                                                        <td class="fw-bold text-dark font-monospace">${escapeHtml(dc.dc_no)}</td>
+                                                        <td><small class="fw-semibold text-dark">${dDate}</small></td>
+                                                        <td class="text-center fw-bold text-primary font-monospace fs-6">${dc.qty_inward}</td>
+                                                        <td><small class="text-muted">${cDate}</small></td>
+                                                        <td><small class="text-muted">${escapeHtml(dc.order_by || '-')}</small></td>
+                                                        <td class="text-center">${docLink}</td>
+                                                    </tr>`;
+                        }).join('')}
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </td>
+                        `;
+                        tbody.appendChild(expandTr);
+                    }
                 });
 
                 renderReportPaginationNav(totalPages, filtered.length);
@@ -6378,9 +7070,13 @@
                     if (!matchPrinter(item)) return;
                     if (!matchToner(item)) return;
                     if (selectedDept) {
-                        const dName = (item.dept_name || '').trim().toLowerCase();
+                        const dName = (item.dept_name || item.dept_id || '').trim().toLowerCase();
                         if (dName !== selectedDept.toLowerCase()) return;
                     }
+                    if (selectedZone) {
+                        const zName = (item.zone_name || item.zone_id || '').trim().toLowerCase();
+                        if (zName !== selectedZone.toLowerCase()) return;
+                    }
                     if (!matchesReportPeriod(item.updated_date || item.cdate)) return;
 
                     const cleanRef = (item.itcell_ref_no || '').trim();
@@ -6675,6 +7371,280 @@
                 });
         }
 
+        let inwardTableItemsMap = {};
+
+        function toggleInwardDcDropdown(expandId) {
+            const row = document.getElementById('inward-dc-expand-' + expandId);
+            const chevron = document.getElementById('chevron-' + expandId);
+            if (!row) return;
+            if (row.style.display === 'none' || !row.style.display) {
+                row.style.display = 'table-row';
+                if (chevron) {
+                    chevron.classList.remove('fa-chevron-down');
+                    chevron.classList.add('fa-chevron-up');
+                }
+            } else {
+                row.style.display = 'none';
+                if (chevron) {
+                    chevron.classList.remove('fa-chevron-up');
+                    chevron.classList.add('fa-chevron-down');
+                }
+            }
+        }
+
+        function openEditInwardDcModal(expandId, dcIndex) {
+            const item = inwardTableItemsMap[expandId];
+            if (!item || !item.dc_entries || !item.dc_entries[dcIndex]) {
+                console.error("DC record not found for expandId:", expandId, "index:", dcIndex);
+                return;
+            }
+            const dc = item.dc_entries[dcIndex];
+            const itemIds = (dc.items || []).map(it => it.id).filter(Boolean).join(',');
+
+            document.getElementById('edit-inward-dc-ids').value = itemIds;
+            document.getElementById('edit-inward-dc-fileno').textContent = item.file_number || item.ref_no || '-';
+            document.getElementById('edit-inward-dc-qty').textContent = (dc.qty_inward || 0) + ' Nos';
+
+            // Set DC number
+            document.getElementById('edit-inward-dc-no').value = (dc.dc_no && dc.dc_no !== '-') ? dc.dc_no : '';
+
+            // Set DC date (format YYYY-MM-DD)
+            let dateVal = '';
+            if (dc.dc_date) {
+                const rawDateStr = String(dc.dc_date).trim();
+                if (rawDateStr && rawDateStr !== 'null' && rawDateStr !== '-') {
+                    if (/^\d{4}-\d{2}-\d{2}/.test(rawDateStr)) {
+                        dateVal = rawDateStr.substring(0, 10);
+                    } else {
+                        const parsed = new Date(rawDateStr);
+                        if (!isNaN(parsed.getTime())) {
+                            dateVal = parsed.toISOString().substring(0, 10);
+                        }
+                    }
+                }
+            }
+            document.getElementById('edit-inward-dc-date').value = dateVal;
+
+            // DC current file preview
+            const fileDiv = document.getElementById('edit-inward-dc-current-file');
+            if (fileDiv) {
+                if (dc.dc_uploads && dc.dc_uploads.length > 0) {
+                    const f = dc.dc_uploads[0];
+                    fileDiv.innerHTML = `<div class="d-flex align-items-center justify-content-between p-2 bg-light rounded border">
+                        <div class="d-flex align-items-center gap-2 text-truncate me-2">
+                            <i class="fa-solid fa-file-pdf text-danger fs-5"></i>
+                            <span class="small fw-semibold text-dark text-truncate" style="max-width: 250px;">${escapeHtml(f)}</span>
+                        </div>
+                        <a href="${resolveUploadUrl(f)}" target="_blank" class="btn btn-sm btn-outline-danger py-0 px-2 fw-semibold" style="font-size: 11px; white-space: nowrap;">
+                            <i class="fa-solid fa-eye me-1"></i> View Copy
+                        </a>
+                    </div>`;
+                } else {
+                    fileDiv.innerHTML = `<span class="text-muted small"><i class="fa-regular fa-circle-question me-1"></i> No DC file currently attached</span>`;
+                }
+            }
+
+            // Clear file input
+            const fileInput = document.getElementById('edit-inward-dc-file');
+            if (fileInput) fileInput.value = '';
+
+            // Reset submit button state
+            const submitBtn = document.getElementById('edit-inward-dc-submit-btn');
+            if (submitBtn) {
+                submitBtn.disabled = false;
+                submitBtn.innerHTML = `<i class="fa-solid fa-floppy-disk me-1"></i> Update DC`;
+            }
+
+            const modalEl = document.getElementById('editInwardDcModal');
+            if (modalEl) {
+                const modal = bootstrap.Modal.getOrCreateInstance(modalEl);
+                modal.show();
+            }
+        }
+
+        function saveEditInwardDc(e) {
+            if (e && e.preventDefault) e.preventDefault();
+
+            const ids = (document.getElementById('edit-inward-dc-ids').value || '').trim();
+            const dcNo = (document.getElementById('edit-inward-dc-no').value || '').trim();
+            const dcDate = (document.getElementById('edit-inward-dc-date').value || '').trim();
+            const fileInput = document.getElementById('edit-inward-dc-file');
+            const dcFile = fileInput && fileInput.files ? fileInput.files[0] : null;
+
+            if (!ids) {
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Error',
+                    text: 'Unable to identify record IDs for this Delivery Challan.'
+                });
+                return;
+            }
+
+            if (!dcNo) {
+                Swal.fire({
+                    icon: 'warning',
+                    title: 'Required Field',
+                    text: 'Please enter the Delivery Challan (DC) Number.'
+                });
+                return;
+            }
+
+            if (!dcDate) {
+                Swal.fire({
+                    icon: 'warning',
+                    title: 'Required Field',
+                    text: 'Please select the Delivery Challan (DC) Date.'
+                });
+                return;
+            }
+
+            const submitBtn = document.getElementById('edit-inward-dc-submit-btn');
+            if (submitBtn) {
+                submitBtn.disabled = true;
+                submitBtn.innerHTML = `<span class="spinner-border spinner-border-sm me-1"></span> Saving...`;
+            }
+
+            const formData = new FormData();
+            formData.append('ids', ids);
+            formData.append('dcNo', dcNo);
+            formData.append('dcDate', dcDate);
+            if (dcFile) {
+                formData.append('dcFile', dcFile);
+            }
+
+            fetch(contextPath + 'gcctonermanagement/api/inward/update-dc', {
+                method: 'POST',
+                body: formData
+            })
+                .then(res => res.json())
+                .then(data => {
+                    if (submitBtn) {
+                        submitBtn.disabled = false;
+                        submitBtn.innerHTML = `<i class="fa-solid fa-floppy-disk me-1"></i> Update DC`;
+                    }
+                    if (data.success) {
+                        const modalEl = document.getElementById('editInwardDcModal');
+                        if (modalEl) {
+                            const modal = bootstrap.Modal.getInstance(modalEl);
+                            if (modal) modal.hide();
+                        }
+                        Swal.fire({
+                            icon: 'success',
+                            title: 'Updated Successfully',
+                            text: data.message || 'Delivery Challan details updated successfully.',
+                            timer: 2000,
+                            showConfirmButton: false
+                        });
+                        fetchInwardHistory();
+                        if (typeof loadDashboardData === 'function') loadDashboardData();
+                    } else {
+                        Swal.fire({
+                            icon: 'error',
+                            title: 'Update Failed',
+                            text: data.error || 'Failed to update Delivery Challan details.'
+                        });
+                    }
+                })
+                .catch(err => {
+                    console.error("Error updating DC:", err);
+                    if (submitBtn) {
+                        submitBtn.disabled = false;
+                        submitBtn.innerHTML = `<i class="fa-solid fa-floppy-disk me-1"></i> Update DC`;
+                    }
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Error',
+                        text: 'An error occurred while updating Delivery Challan details.'
+                    });
+                });
+        }
+
+        function deleteInwardDcConfirm(expandId, dcIndex) {
+            const item = inwardTableItemsMap[expandId];
+            if (!item || !item.dc_entries || !item.dc_entries[dcIndex]) {
+                console.error("DC record not found for expandId:", expandId, "index:", dcIndex);
+                return;
+            }
+            const dc = item.dc_entries[dcIndex];
+            const itemIds = (dc.items || []).map(it => it.id).filter(Boolean).join(',');
+            const dcNo = dc.dc_no || '-';
+            const qtyInward = dc.qty_inward || 0;
+            const fileNo = item.file_number || item.ref_no || '-';
+
+            if (!itemIds) {
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Error',
+                    text: 'Unable to identify record IDs for this Delivery Challan.'
+                });
+                return;
+            }
+
+            Swal.fire({
+                title: 'Delete Delivery Challan?',
+                html: `<div class="text-start">
+                    <p>Are you sure you want to delete Delivery Challan <strong>${escapeHtml(dcNo)}</strong> for File No: <strong>${escapeHtml(fileNo)}</strong>?</p>
+                    <div class="alert alert-danger py-2 px-3 mb-0" style="font-size: 0.9rem;">
+                        <i class="fa-solid fa-triangle-exclamation me-1"></i>
+                        <strong>Warning:</strong> Deleting this DC will remove the uploaded DC copy and deduct <strong>${qtyInward} Nos</strong> from the inward & available stock records!
+                    </div>
+                </div>`,
+                icon: 'warning',
+                showCancelButton: true,
+                confirmButtonColor: '#dc3545',
+                cancelButtonColor: '#6c757d',
+                confirmButtonText: '<i class="fa-solid fa-trash-can me-1"></i> Yes, Delete DC & Stock',
+                cancelButtonText: 'Cancel'
+            }).then((result) => {
+                if (result.isConfirmed) {
+                    Swal.fire({
+                        title: 'Deleting...',
+                        text: 'Please wait while removing Delivery Challan and adjusting stock...',
+                        allowOutsideClick: false,
+                        didOpen: () => {
+                            Swal.showLoading();
+                        }
+                    });
+
+                    const formData = new FormData();
+                    formData.append('ids', itemIds);
+
+                    fetch(contextPath + 'gcctonermanagement/api/inward/delete-dc', {
+                        method: 'POST',
+                        body: formData
+                    })
+                        .then(res => res.json())
+                        .then(data => {
+                            if (data.success) {
+                                Swal.fire({
+                                    icon: 'success',
+                                    title: 'Deleted!',
+                                    text: data.message || 'Delivery Challan and corresponding inward stock removed successfully.',
+                                    timer: 2000,
+                                    showConfirmButton: false
+                                });
+                                fetchInwardHistory();
+                                if (typeof loadDashboardData === 'function') loadDashboardData();
+                            } else {
+                                Swal.fire({
+                                    icon: 'error',
+                                    title: 'Delete Failed',
+                                    text: data.error || 'Failed to delete Delivery Challan.'
+                                });
+                            }
+                        })
+                        .catch(err => {
+                            console.error("Error deleting DC:", err);
+                            Swal.fire({
+                                icon: 'error',
+                                title: 'Error',
+                                text: 'An error occurred while deleting Delivery Challan.'
+                            });
+                        });
+                }
+            });
+        }
+
         function renderInwardTable(tbodyId, data, showDoc, targetPage) {
             const tbody = document.getElementById(tbodyId);
             if (!tbody) return;
@@ -6684,22 +7654,22 @@
             if (thead) {
                 thead.innerHTML = `
                     <tr>
-                        <th>Sr. No.</th>
+                        <th style="width: 50px;">Sr. No.</th>
                         ${getInwardSortHeader('File No.', 'file_number')}
-                        ${getInwardSortHeader('Workorder Ref', 'ref_no')}
                         ${getInwardSortHeader('Company Name', 'company_name')}
-                        ${getInwardSortHeader('DC No.', 'dc_no')}
+                        <th>DC Number(s)</th>
                         ${getInwardSortHeader('Printer Model', 'printer_name')}
                         ${getInwardSortHeader('Qty Registered', 'qty_workorder_registered', 'text-center')}
                         ${getInwardSortHeader('Qty Inward', 'qty_registered', 'text-center')}
-                        ${getInwardSortHeader('DC Date', 'dc_date')}
+                        ${getInwardSortHeader('Latest DC Date', 'dc_date')}
                         ${getInwardSortHeader('Created Date', 'cdate')}
                         ${getInwardSortHeader('Entered By', 'order_by')}
                         ${showDoc ? '<th class="text-center">DC Document</th>' : ''}
+                        <th class="text-center" style="width: 120px;">Action</th>
                     </tr>`;
             }
 
-            // Group records by distinct DC delivery transaction
+            // Group records strictly per UNIQUE File No / Workorder Ref
             const groups = {};
             (data || []).forEach(item => {
                 const cleanRef = (item.ref_no || '').trim();
@@ -6707,13 +7677,14 @@
                 const cleanDcNo = (item.dc_no || '').trim();
                 const cleanDcUpload = (item.dc_upload || item.dc_uploads || '').toString().trim();
                 const cdateKey = item.cdate ? String(item.cdate).substring(0, 19) : '';
+                const dcDateKey = item.dc_date ? String(item.dc_date).substring(0, 10) : '';
 
-                // Unique group key per DC delivery upload transaction:
-                const key = `${cleanRef || 'general'}_${cleanDcNo || 'nodc'}_${cleanDcUpload || ('item_' + (item.id || Math.random()))}_${cdateKey}`;
+                // Group key per unique File Number (fallback to Workorder Ref)
+                const fileKey = cleanFile || cleanRef || ('inward_' + (item.id || Math.random()));
 
-                if (!groups[key]) {
-                    groups[key] = {
-                        key: key,
+                if (!groups[fileKey]) {
+                    groups[fileKey] = {
+                        key: fileKey,
                         ref_no: cleanRef,
                         file_number: cleanFile,
                         company_name: item.company_name,
@@ -6724,49 +7695,81 @@
                         model_names: [],
                         qty_workorder_registered: 0,
                         qty_registered: 0,
-                        dc_no: cleanDcNo || '-',
                         dc_date: item.dc_date || '',
                         cdate: item.cdate,
                         order_by: item.order_by || item.updated_by || '',
                         dc_uploads: [],
+                        dc_entries: [],
                         items: []
                     };
                 }
 
-                if (cleanFile && !groups[key].file_number) {
-                    groups[key].file_number = cleanFile;
+                if (cleanFile && !groups[fileKey].file_number) {
+                    groups[fileKey].file_number = cleanFile;
                 }
 
-                const qty = parseInt(item.qty_registered || item.inward_qty || 0) || 0;
-                groups[key].qty_registered += qty;
-                groups[key].qty_workorder_registered += parseInt(item.qty_workorder_registered || 0) || 0;
-                groups[key].items.push(item);
-
-                if (item.printer_name && !groups[key].printer_names.includes(item.printer_name)) {
-                    groups[key].printer_names.push(item.printer_name);
-                }
-                if (item.model_name && !groups[key].model_names.includes(item.model_name)) {
-                    groups[key].model_names.push(item.model_name);
-                }
-                if (item.dc_date && !groups[key].dc_date) {
-                    groups[key].dc_date = item.dc_date;
+                // Sub-group by unique DC under this File No
+                const subDcKey = cleanDcNo ? cleanDcNo : (cleanDcUpload || dcDateKey || cdateKey || ('dc_' + groups[fileKey].dc_entries.length));
+                let dcEntry = groups[fileKey].dc_entries.find(d => d.dc_key === subDcKey);
+                if (!dcEntry) {
+                    dcEntry = {
+                        dc_key: subDcKey,
+                        dc_no: cleanDcNo || '-',
+                        dc_date: item.dc_date || '',
+                        cdate: item.cdate,
+                        order_by: item.order_by || item.updated_by || '',
+                        qty_inward: 0,
+                        dc_uploads: [],
+                        printer_names: [],
+                        model_names: [],
+                        items: []
+                    };
+                    groups[fileKey].dc_entries.push(dcEntry);
                 }
-                if (item.cdate && (!groups[key].cdate || new Date(item.cdate) > new Date(groups[key].cdate))) {
-                    groups[key].cdate = item.cdate;
+
+                const qty = parseInt(item.qty_registered || item.inward_qty || 0) || 0;
+                dcEntry.qty_inward += qty;
+                dcEntry.items.push(item);
+                if (item.printer_name && !dcEntry.printer_names.includes(item.printer_name)) {
+                    dcEntry.printer_names.push(item.printer_name);
                 }
-                if (item.order_by && !groups[key].order_by) {
-                    groups[key].order_by = item.order_by;
+                if (item.model_name && !dcEntry.model_names.includes(item.model_name)) {
+                    dcEntry.model_names.push(item.model_name);
                 }
 
                 const rawDc = item.dc_upload || item.dc_uploads;
                 if (rawDc) {
                     const files = Array.isArray(rawDc) ? rawDc : String(rawDc).split(',').map(s => s.trim()).filter(Boolean);
                     files.forEach(f => {
-                        if (f && !groups[key].dc_uploads.includes(f)) {
-                            groups[key].dc_uploads.push(f);
-                        }
+                        if (f && !dcEntry.dc_uploads.includes(f)) dcEntry.dc_uploads.push(f);
+                        if (f && !groups[fileKey].dc_uploads.includes(f)) groups[fileKey].dc_uploads.push(f);
                     });
                 }
+
+                // Update File No Group totals
+                groups[fileKey].qty_registered += qty;
+                groups[fileKey].items.push(item);
+
+                const woRegQty = parseInt(item.qty_workorder_registered || 0) || 0;
+                if (woRegQty > groups[fileKey].qty_workorder_registered) {
+                    groups[fileKey].qty_workorder_registered = woRegQty;
+                }
+
+                if (item.printer_name && !groups[fileKey].printer_names.includes(item.printer_name)) {
+                    groups[fileKey].printer_names.push(item.printer_name);
+                }
+                if (item.model_name && !groups[fileKey].model_names.includes(item.model_name)) {
+                    groups[fileKey].model_names.push(item.model_name);
+                }
+                if (item.dc_date && (!groups[fileKey].dc_date || new Date(item.dc_date) > new Date(groups[fileKey].dc_date))) {
+                    groups[fileKey].dc_date = item.dc_date;
+                }
+                if (item.cdate && (!groups[fileKey].cdate || new Date(item.cdate) > new Date(groups[fileKey].cdate))) {
+                    groups[fileKey].cdate = item.cdate;
+                }
+                if (item.order_by && !groups[fileKey].order_by) {
+                    groups[fileKey].order_by = item.order_by;
+                }
             });
 
             inwardTableGroupsCached = groups;
@@ -6775,7 +7778,10 @@
             let filtered = groupedList.filter(item => {
                 if (!inwardSearchQuery) return true;
                 const vendorName = vendorsMap[item.company_name] || (!isNaN(item.company_name) ? '' : (item.company_name || ''));
-                const searchStr = `${item.ref_no || ''} ${item.file_number || ''} ${vendorName} ${item.dc_no || ''} ${item.printer_name || ''} ${item.order_by || ''}`.toLowerCase();
+                const dcNosStr = (item.dc_entries || []).map(d => d.dc_no).join(' ');
+                const printerNamesStr = (item.printer_names || []).join(' ');
+                const modelNamesStr = (item.model_names || []).join(' ');
+                const searchStr = `${item.ref_no || ''} ${item.file_number || ''} ${vendorName} ${dcNosStr} ${printerNamesStr} ${modelNamesStr} ${item.order_by || ''}`.toLowerCase();
                 return searchStr.includes(inwardSearchQuery);
             });
 
@@ -6786,7 +7792,7 @@
                     if (inwardSortColumn === 'qty_registered' || inwardSortColumn === 'qty_workorder_registered') {
                         valA = parseInt(valA || 0);
                         valB = parseInt(valB || 0);
-                    } else if (inwardSortColumn === 'cdate') {
+                    } else if (inwardSortColumn === 'cdate' || inwardSortColumn === 'dc_date') {
                         valA = valA ? new Date(valA).getTime() : 0;
                         valB = valB ? new Date(valB).getTime() : 0;
                     } else if (inwardSortColumn === 'company_name') {
@@ -6805,69 +7811,216 @@
             }
 
             const countBadge = document.getElementById('inward-count-badge');
-            if (countBadge) countBadge.textContent = `${filtered.length} Records`;
+            if (countBadge) countBadge.textContent = `${filtered.length} File Records`;
 
             tbody.innerHTML = '';
             const totalPages = Math.ceil(filtered.length / inwardPageSize) || 1;
             inwardCurrentPage = Math.min(Math.max(1, inwardCurrentPage), totalPages);
 
-            const colSpan = showDoc ? 12 : 11;
+            const colSpan = (showDoc ? 11 : 10) + 1;
             if (filtered.length === 0) {
                 tbody.innerHTML = `<tr><td colspan="${colSpan}" class="text-center text-muted py-4">No inward records found.</td></tr>`;
                 renderTablePaginationNav('inward-pagination-info', 'inward-pagination-nav', inwardCurrentPage, inwardPageSize, 1, 0, (p) => renderInwardTable(tbodyId, data, showDoc, p));
                 return;
             }
 
+            inwardTableItemsMap = {};
             const pagedData = filtered.slice((inwardCurrentPage - 1) * inwardPageSize, inwardCurrentPage * inwardPageSize);
 
             pagedData.forEach((item, index) => {
-                const tr = document.createElement('tr');
                 const globalIdx = (inwardCurrentPage - 1) * inwardPageSize + index + 1;
+                const expandId = 'inw_' + globalIdx;
+                inwardTableItemsMap[expandId] = item;
+
                 const createdDate = formatTimestamp(item.cdate);
                 const dcDateFormatted = (item.dc_date && String(item.dc_date).trim() !== '' && String(item.dc_date).trim() !== 'null') ? formatDateOnly(item.dc_date) : '-';
-                let docBtn = '-';
-                if (showDoc && item.dc_uploads && item.dc_uploads.length > 0) {
-                    docBtn = item.dc_uploads.map((file, i) => {
-                        const label = item.dc_uploads.length > 1 ? `View DC ${i + 1}` : `View DC`;
-                        return `<a href="${resolveUploadUrl(file)}" target="_blank" class="btn-action btn-view-doc m-1" style="font-size: 10px; padding: 4px 8px; white-space: nowrap;"><i class="fa-solid fa-file-pdf"></i> ${label}</a>`;
-                    }).join(' ');
-                }
-
                 const vendorName = vendorsMap[item.company_name] || (!isNaN(item.company_name) ? 'Unknown Vendor (' + item.company_name + ')' : (item.company_name || ''));
-                const groupKeyParam = encodeURIComponent(item.key || '');
-
-                const modelsCountBadge = item.items && item.items.length > 1
-                    ? `<br><span class="badge bg-light text-secondary border mt-1" style="cursor: pointer;" onclick="showInwardHistoryBreakdownModal('${encodeURIComponent(item.file_number || '')}', '${encodeURIComponent(item.ref_no || '')}', '${groupKeyParam}');" title="Click to view ${item.items.length} toners in this DC"><i class="fa-solid fa-layer-group me-1"></i>${item.items.length} Toners</span>`
-                    : (item.items && item.items.length === 1 ? `<br><small class="text-muted font-monospace">${escapeHtml(item.items[0].model_name || '')}</small>` : '');
+                const numDcs = item.dc_entries ? item.dc_entries.length : 1;
+
+                // Collect all uploaded DC document files
+                let allUploadedDcFiles = [];
+                if (item.dc_entries && item.dc_entries.length > 0) {
+                    item.dc_entries.forEach(dc => {
+                        if (dc.dc_uploads && Array.isArray(dc.dc_uploads)) {
+                            dc.dc_uploads.forEach(f => {
+                                if (f && !allUploadedDcFiles.includes(f)) allUploadedDcFiles.push(f);
+                            });
+                        }
+                    });
+                }
+                if (allUploadedDcFiles.length === 0 && item.dc_uploads) {
+                    if (Array.isArray(item.dc_uploads)) {
+                        allUploadedDcFiles = item.dc_uploads.filter(Boolean);
+                    } else if (typeof item.dc_uploads === 'string' && item.dc_uploads.trim()) {
+                        allUploadedDcFiles = item.dc_uploads.split(',').map(s => s.trim()).filter(Boolean);
+                    }
+                }
 
-                const fileNoLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #0f5c78; cursor: pointer; font-size: 0.95rem;" onclick="showInwardHistoryBreakdownModal('${encodeURIComponent(item.file_number || '')}', '${encodeURIComponent(item.ref_no || '')}', '${groupKeyParam}'); return false;" title="Click to view DC toners breakdown">${escapeHtml(item.file_number || item.ref_no || '-')}</a>`;
+                // Main File No Link directly opens the uploaded DC document file
+                let fileNoLink = '';
+                if (allUploadedDcFiles.length > 0) {
+                    fileNoLink = `<a href="${resolveUploadUrl(allUploadedDcFiles[0])}" target="_blank" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #0f5c78; cursor: pointer; font-size: 0.95rem;" title="Click to view uploaded DC document">${escapeHtml(item.file_number || item.ref_no || '-')}</a>`;
+                } else {
+                    fileNoLink = `<span class="fw-bold text-dark font-monospace" style="font-size: 0.95rem;">${escapeHtml(item.file_number || item.ref_no || '-')}</span>`;
+                }
 
-                const refLink = item.ref_no
-                    ? `<a href="#" class="fw-semibold text-decoration-none text-dark font-monospace" style="cursor: pointer;" onclick="showInwardHistoryBreakdownModal('${encodeURIComponent(item.file_number || '')}', '${encodeURIComponent(item.ref_no || '')}', '${groupKeyParam}'); return false;" title="Click to view DC toners breakdown">${escapeHtml(item.ref_no)}</a>`
-                    : '-';
+                // Main File No Link with Dropdown Toggle
+                let dcBadgeHtml = '';
+                if (numDcs > 1) {
+                    dcBadgeHtml = `<div class="mt-1">
+                        <button type="button" class="btn btn-sm btn-outline-primary py-0 px-2 fw-semibold" style="font-size: 11px; border-radius: 6px;" onclick="toggleInwardDcDropdown('${expandId}'); return false;" title="Click to view all ${numDcs} Delivery Challans">
+                            <i class="fa-solid fa-layer-group me-1"></i>${numDcs} Delivery Challans <i class="fa-solid fa-chevron-down ms-1" id="chevron-${expandId}"></i>
+                        </button>
+                    </div>`;
+                }
 
                 const printerDisplay = item.printer_names && item.printer_names.length > 1
                     ? item.printer_names.join(', ')
                     : (item.printer_name || (item.printer_names && item.printer_names[0]) || 'N/A');
 
+                // DC Numbers column formatting
+                let dcNoColHtml = '';
+                if (item.dc_entries && item.dc_entries.length > 0) {
+                    const dcNums = [...new Set(item.dc_entries.map(dc => (dc.dc_no || '').trim()).filter(d => d && d !== '-'))];
+                    dcNoColHtml = `<span class="fw-semibold text-dark font-monospace">${escapeHtml(dcNums.length > 0 ? dcNums.join(', ') : '-')}</span>`;
+                } else {
+                    dcNoColHtml = `<span class="fw-semibold text-dark font-monospace">${escapeHtml(item.dc_number || '-')}</span>`;
+                }
+
+                // Qty Inward column formatting
+                const qtyInwardColHtml = `<span class="text-primary fw-bold font-monospace fs-6">${item.qty_registered}</span>`;
+
+                // DC Dates formatting
+                const dcDateColHtml = `<small class="text-dark fw-semibold">${dcDateFormatted}</small>`;
+
+                // DC Documents formatting
+                let docColHtml = '-';
+                if (showDoc) {
+                    if (allUploadedDcFiles.length > 0) {
+                        docColHtml = `<a href="${resolveUploadUrl(allUploadedDcFiles[0])}" target="_blank" class="btn-action btn-view-doc" style="font-size: 11px; padding: 4px 8px; white-space: nowrap;" title="View DC Document"><i class="fa-solid fa-file-pdf"></i> View DC</a>`;
+                    }
+                }
+
+                // Parent Action Column HTML
+                let parentActionColHtml = '';
+                if (numDcs === 1) {
+                    parentActionColHtml = `
+                        <div class="d-flex justify-content-center align-items-center gap-1">
+                            <button type="button" class="btn btn-sm btn-outline-primary py-0 px-2 fw-semibold" style="font-size: 11px; border-radius: 6px;" onclick="openEditInwardDcModal('${expandId}', 0)" title="Edit Delivery Challan (No, Date, Copy)">
+                                <i class="fa-solid fa-pen-to-square"></i> Edit
+                            </button>
+                            <button type="button" class="btn btn-sm btn-outline-danger py-0 px-2 fw-semibold" style="font-size: 11px; border-radius: 6px;" onclick="deleteInwardDcConfirm('${expandId}', 0)" title="Delete DC and Inward Stock">
+                                <i class="fa-solid fa-trash-can"></i>
+                            </button>
+                        </div>`;
+                } else {
+                    parentActionColHtml = `
+                        <div class="d-flex justify-content-center align-items-center">
+                            <button type="button" class="btn btn-sm btn-outline-secondary py-0 px-2 fw-semibold" style="font-size: 11px; border-radius: 6px;" onclick="toggleInwardDcDropdown('${expandId}'); return false;" title="Manage ${numDcs} Delivery Challans">
+                                <i class="fa-solid fa-list-check me-1"></i>${numDcs} DCs
+                            </button>
+                        </div>`;
+                }
+
+                const tr = document.createElement('tr');
                 let rowHtml = `
                     <td class="fw-semibold text-secondary">${globalIdx}</td>
-                    <td>${fileNoLink}${modelsCountBadge}</td>
-                    <td>${refLink}</td>
+                    <td>${fileNoLink}${dcBadgeHtml}</td>
                     <td class="fw-bold text-dark">${escapeHtml(vendorName)}</td>
-                    <td class="fw-semibold text-dark font-monospace">${escapeHtml(item.dc_no || '-')}</td>
+                    <td>${dcNoColHtml}</td>
                     <td>${escapeHtml(printerDisplay)}</td>
                     <td class="text-center text-secondary font-monospace">${item.qty_workorder_registered > 0 ? item.qty_workorder_registered : '-'}</td>
-                    <td class="text-center text-primary fw-bold font-monospace">${item.qty_registered}</td>
-                    <td><small class="text-dark fw-semibold">${dcDateFormatted}</small></td>
+                    <td class="text-center">${qtyInwardColHtml}</td>
+                    <td>${dcDateColHtml}</td>
                     <td><small class="text-muted fw-semibold">${createdDate}</small></td>
                     <td><small class="text-muted">${escapeHtml(item.order_by || '-')}</small></td>
                 `;
                 if (showDoc) {
-                    rowHtml += `<td class="text-center">${docBtn}</td>`;
+                    rowHtml += `<td class="text-center">${docColHtml}</td>`;
                 }
+                rowHtml += `<td class="text-center">${parentActionColHtml}</td>`;
                 tr.innerHTML = rowHtml;
                 tbody.appendChild(tr);
+
+                // Expandable Dropdown Child Row
+                if (numDcs > 1) {
+                    const expandTr = document.createElement('tr');
+                    expandTr.id = `inward-dc-expand-${expandId}`;
+                    expandTr.className = 'inward-expand-row';
+                    expandTr.style.display = 'none';
+                    expandTr.style.background = '#f8fafc';
+
+                    expandTr.innerHTML = `
+                        <td colspan="${colSpan}" class="p-3 border-bottom">
+                            <div class="p-3 bg-white rounded border shadow-sm">
+                                <div class="d-flex justify-content-between align-items-center mb-3 pb-2 border-bottom flex-wrap gap-2">
+                                    <div class="d-flex align-items-center gap-2">
+                                        <div class="rounded-circle p-2 d-flex align-items-center justify-content-center" style="background: #e6f4f8; color: #0f5c78; width: 32px; height: 32px;">
+                                            <i class="fa-solid fa-boxes-packing"></i>
+                                        </div>
+                                        <div>
+                                            <h6 class="fw-bold m-0" style="color: #0f5c78;">
+                                                Delivery Challans Breakdown for File No: <span class="font-monospace text-dark">${escapeHtml(item.file_number || item.ref_no || '-')}</span>
+                                            </h6>
+                                            <span class="text-muted small">Vendor: <strong>${escapeHtml(vendorName)}</strong></span>
+                                        </div>
+                                    </div>
+                                    <span class="badge" style="background: #0f5c78; color: #ffffff; font-size: 0.85rem; padding: 6px 12px; border-radius: 8px;">
+                                        Total Inward: ${item.qty_registered} Nos (${numDcs} DCs)
+                                    </span>
+                                </div>
+                                <div class="table-responsive">
+                                    <table class="table table-sm table-bordered table-hover align-middle mb-0" style="font-size: 0.88rem;">
+                                        <thead class="table-light">
+                                            <tr>
+                                                <th style="width: 50px;" class="text-center">S.No</th>
+                                                <th>DC Number</th>
+                                                <th>DC Date</th>
+                                                <th class="text-center">Qty Inward</th>
+                                                <th>Created Date</th>
+                                                <th>Entered By</th>
+                                                <th class="text-center">DC Copy</th>
+                                                <th class="text-center" style="width: 120px;">Action</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            ${item.dc_entries.map((dc, i) => {
+                        const letter = String.fromCharCode(97 + i);
+                        const dDate = dc.dc_date ? formatDateOnly(dc.dc_date) : '-';
+                        const cDate = formatTimestamp(dc.cdate);
+                        let docLink = `<span class="text-muted small">N/A</span>`;
+                        if (dc.dc_uploads && dc.dc_uploads.length > 0) {
+                            docLink = `<a href="${resolveUploadUrl(dc.dc_uploads[0])}" target="_blank" class="btn btn-sm btn-outline-danger py-0 px-2 fw-semibold" style="font-size: 11px;"><i class="fa-solid fa-file-pdf me-1"></i>View PDF</a>`;
+                        }
+                        return `
+                                                <tr>
+                                                    <td class="fw-bold text-primary font-monospace text-center">(${letter})</td>
+                                                    <td class="fw-bold text-dark font-monospace">${escapeHtml(dc.dc_no)}</td>
+                                                    <td><small class="fw-semibold text-dark">${dDate}</small></td>
+                                                    <td class="text-center fw-bold text-primary font-monospace fs-6">${dc.qty_inward}</td>
+                                                    <td><small class="text-muted">${cDate}</small></td>
+                                                    <td><small class="text-muted">${escapeHtml(dc.order_by || '-')}</small></td>
+                                                    <td class="text-center">${docLink}</td>
+                                                    <td class="text-center">
+                                                        <div class="d-flex justify-content-center align-items-center gap-1">
+                                                            <button type="button" class="btn btn-sm btn-outline-primary py-0 px-2 fw-semibold" style="font-size: 11px; border-radius: 6px;" onclick="openEditInwardDcModal('${expandId}', ${i})" title="Edit DC Number, Date, or Copy">
+                                                                <i class="fa-solid fa-pen-to-square"></i> Edit
+                                                            </button>
+                                                            <button type="button" class="btn btn-sm btn-outline-danger py-0 px-2 fw-semibold" style="font-size: 11px; border-radius: 6px;" onclick="deleteInwardDcConfirm('${expandId}', ${i})" title="Delete DC and Inward Stock">
+                                                                <i class="fa-solid fa-trash-can"></i>
+                                                            </button>
+                                                        </div>
+                                                    </td>
+                                                </tr>`;
+                    }).join('')}
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </td>
+                    `;
+                    tbody.appendChild(expandTr);
+                }
             });
 
             renderTablePaginationNav('inward-pagination-info', 'inward-pagination-nav', inwardCurrentPage, inwardPageSize, totalPages, filtered.length, (p) => renderInwardTable(tbodyId, data, showDoc, p));
@@ -7933,7 +9086,7 @@
                 cmpInput.removeAttribute('data-vendor-id');
             }
             if (tbody) {
-                tbody.innerHTML = '<tr><td colspan="6" class="text-center text-muted py-4">Please select a File No. to view registered models.</td></tr>';
+                tbody.innerHTML = '<tr><td colspan="7" class="text-center text-muted py-4">Please select a File No. to view registered models.</td></tr>';
             }
 
             inwardRequestItems = [];
@@ -7960,7 +9113,7 @@
                     if (tbody) {
                         tbody.innerHTML = '';
                         if (!data || data.length === 0) {
-                            tbody.innerHTML = '<tr><td colspan="6" class="text-center text-muted py-4">No registered models found for this workorder.</td></tr>';
+                            tbody.innerHTML = '<tr><td colspan="7" class="text-center text-muted py-4">No registered models found for this workorder.</td></tr>';
                             return;
                         }
 
@@ -7969,13 +9122,18 @@
                             const rcvQty = parseInt(item.qty_inward_received || 0);
                             const remaining = Math.max(0, regQty - rcvQty);
 
+                            const partCodeStr = (item.part_code && String(item.part_code).trim() !== '' && String(item.part_code).trim().toLowerCase() !== 'null' && String(item.part_code).trim().toLowerCase() !== 'n/a' && String(item.part_code).trim() !== '-')
+                                ? escapeHtml(item.part_code)
+                                : '-';
+
                             const tr = document.createElement('tr');
                             tr.innerHTML = `
+                                <td class="text-center fw-semibold text-secondary font-monospace">${idx + 1}</td>
                                 <td class="fw-semibold text-dark">${escapeHtml(item.printer_name || '-')}</td>
                                 <td>
                                     <span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span>
                                     <br>
-                                    <small class="text-secondary">Part: ${escapeHtml(item.part_code || 'N/A')}</small>
+                                    <small class="text-secondary">Part: ${partCodeStr}</small>
                                 </td>
                                 <td class="text-center">
                                     <span class="badge bg-secondary font-monospace px-2 py-1" style="font-size: 0.82rem;">${regQty}</span>
@@ -8026,6 +9184,18 @@
                 return;
             }
 
+            if (!dcNo) {
+                showNotification('warning', 'Missing Fields', 'Please enter Delivery Challan (DC) Number.');
+                if (dcNoInput) dcNoInput.focus();
+                return;
+            }
+
+            if (!dcDate) {
+                showNotification('warning', 'Missing Fields', 'Please select Delivery Challan (DC) Date.');
+                if (dcDateInput) dcDateInput.focus();
+                return;
+            }
+
             const items = [];
             let overBalance = false;
             let invalidQty = false;
@@ -8130,7 +9300,7 @@
                                 resetForm('inward');
                                 const tbody = document.getElementById('inward-items-tbody');
                                 if (tbody) {
-                                    tbody.innerHTML = '<tr><td colspan="6" class="text-center text-muted py-4">Please select a File No. to view registered models.</td></tr>';
+                                    tbody.innerHTML = '<tr><td colspan="7" class="text-center text-muted py-4">Please select a File No. to view registered models.</td></tr>';
                                 }
                                 fetchInwardHistory();
                                 switchView('inward');
@@ -8169,7 +9339,9 @@
             const pid = printerSelect.value;
             const printerName = printerSelect.options[printerSelect.selectedIndex]?.textContent || '';
             const tid = tonerSelect.value;
-            const tonerName = tonerSelect.options[tonerSelect.selectedIndex]?.textContent || '';
+            const selectedOpt = tonerSelect.options[tonerSelect.selectedIndex];
+            const tonerName = selectedOpt?.getAttribute('data-model-name') || selectedOpt?.textContent || '';
+            const partCode = selectedOpt?.getAttribute('data-part-code') || '';
             const qtyVal = qtyInput.value.trim();
 
             if (!pid || !tid || !qtyVal) {
@@ -8195,6 +9367,7 @@
                 printer_name: printerName,
                 tid: tid,
                 model_name: tonerName,
+                part_code: partCode,
                 qty: qty
             });
 
@@ -8216,17 +9389,21 @@
             let total = 0;
 
             if (requestItems.length === 0) {
-                tbody.innerHTML = `<tr><td colspan="4" class="text-center text-muted py-4">No items added to request yet.</td></tr>`;
+                tbody.innerHTML = `<tr><td colspan="5" class="text-center text-muted py-4">No items added to request yet.</td></tr>`;
                 if (totalQtyInput) totalQtyInput.value = 0;
                 return;
             }
 
             requestItems.forEach((item, idx) => {
                 total += item.qty;
+                const partCodeBadge = (item.part_code && item.part_code !== 'N/A' && item.part_code !== '-')
+                    ? ` <small class="text-secondary font-monospace">(${escapeHtml(item.part_code)})</small>`
+                    : '';
                 const tr = document.createElement('tr');
                 tr.innerHTML = `
+                    <td class="text-center font-monospace fw-semibold text-secondary">${idx + 1}</td>
                     <td>${escapeHtml(item.printer_name)}</td>
-                    <td><span class="badge-toner-model">${escapeHtml(item.model_name)}</span></td>
+                    <td><span class="badge-toner-model">${escapeHtml(item.model_name)}</span>${partCodeBadge}</td>
                     <td class="text-center font-monospace fw-bold">${item.qty}</td>
                     <td class="text-center">
                         <button type="button" class="btn btn-sm btn-outline-danger" onclick="removeRequestItem(${idx})" style="border-radius: 8px; padding: 4px 8px;">
@@ -8627,7 +9804,12 @@
                     (toners || []).forEach(t => {
                         const opt = document.createElement('option');
                         opt.value = t.id;
-                        opt.textContent = `${t.model_name} (${t.part_code || 'N/A'})`;
+                        const partCodeStr = (t.part_code && String(t.part_code).trim() !== '' && String(t.part_code).trim().toLowerCase() !== 'null' && String(t.part_code).trim().toLowerCase() !== 'n/a' && String(t.part_code).trim() !== '-')
+                            ? ` (${t.part_code.trim()})`
+                            : '';
+                        opt.textContent = `${t.model_name || ''}${partCodeStr}`;
+                        opt.setAttribute('data-model-name', t.model_name || '');
+                        if (t.part_code) opt.setAttribute('data-part-code', t.part_code);
                         if (String(t.id) === String(selectedTid)) {
                             opt.selected = true;
                         }
@@ -8784,8 +9966,8 @@
             const printerName = printerSelect.options[printerSelect.selectedIndex]?.textContent || '';
             const tid = tonerSelect.value;
             const selectedTonerOpt = tonerSelect.options[tonerSelect.selectedIndex];
-            const tonerName = selectedTonerOpt?.textContent || '';
-            const partCode = selectedTonerOpt?.getAttribute('data-part-code') || 'N/A';
+            const tonerName = selectedTonerOpt?.getAttribute('data-model-name') || selectedTonerOpt?.textContent || '';
+            const partCode = selectedTonerOpt?.getAttribute('data-part-code') || '-';
             const qty = qtyInput.value.trim();
 
             if (!pid) {
@@ -8838,7 +10020,7 @@
             if (workorderItems.length === 0) {
                 tbody.innerHTML = `
                     <tr>
-                        <td colspan="5" class="text-center text-muted py-4">No models added yet. Configure and click "Add".</td>
+                        <td colspan="6" class="text-center text-muted py-4">No models added yet. Configure and click "Add".</td>
                     </tr>
                 `;
                 return;
@@ -8848,6 +10030,7 @@
             workorderItems.forEach((item, index) => {
                 const tr = document.createElement('tr');
                 tr.innerHTML = `
+                    <td class="text-center font-monospace fw-semibold text-secondary">${index + 1}</td>
                     <td class="fw-semibold text-secondary">${escapeHtml(item.printerName)}</td>
                     <td><span class="badge-toner-model">${escapeHtml(item.tonerName)}</span></td>
                     <td class="text-secondary font-monospace fw-semibold">${escapeHtml(item.partCode)}</td>
@@ -9197,9 +10380,13 @@
                         ? `<span class="badge bg-secondary ms-2" style="font-size: 0.72rem; vertical-align: middle;">${escapeHtml(t.printer_name || '')}</span>`
                         : '';
 
+                    const partCodeDisplay = (t.part_code && String(t.part_code).trim() !== '' && String(t.part_code).trim().toLowerCase() !== 'null' && String(t.part_code).trim().toLowerCase() !== 'n/a' && String(t.part_code).trim() !== '-')
+                        ? ` (Part: ${escapeHtml(t.part_code)})`
+                        : '';
+
                     infoCol.innerHTML = `
                         <div class="fw-semibold text-dark d-flex align-items-center flex-wrap gap-1">
-                            <span>${escapeHtml(t.model_name || '')} (Part: ${escapeHtml(t.part_code || 'N/A')})</span>
+                            <span>${escapeHtml(t.model_name || '')}${partCodeDisplay}</span>
                             ${printerBadge}
                         </div>
                         <div style="font-size: 0.82rem; color: #475569;" class="mt-1">
@@ -9700,13 +10887,17 @@
             const outwardDateInput = document.getElementById('outward-date');
             const tbody = document.getElementById('outward-items-tbody');
             const saveBtn = document.getElementById('outward-save-btn');
+            const letterWrapper = document.getElementById('outward-request-letter-wrapper');
+            const letterContainer = document.getElementById('outward-request-letter-container');
 
             // Reset
             if (deptDisp) deptDisp.value = '';
+            if (letterWrapper) letterWrapper.style.display = 'none';
+            if (letterContainer) letterContainer.innerHTML = '';
             if (tbody) {
                 tbody.innerHTML = `
                     <tr>
-                        <td colspan="7" class="text-center text-muted py-4">
+                        <td colspan="9" class="text-center text-muted py-4">
                             Please select an Active Request to view requested toner models.
                         </td>
                     </tr>
@@ -9724,22 +10915,65 @@
             const first = items[0];
             if (deptDisp) deptDisp.value = first.dept_name || first.dept_id || '-';
 
-            // Pre-fill today's date if outward date input is empty
-            if (outwardDateInput && !outwardDateInput.value) {
-                const today = new Date().toISOString().split('T')[0];
-                outwardDateInput.value = today;
+            // Always set to today's date
+            if (outwardDateInput) {
+                outwardDateInput.value = new Date().toISOString().split('T')[0];
+            }
+
+            // Display User Request Letter Copy if available
+            let requestLetterFile = null;
+            for (let it of items) {
+                if (it.user_request_upload && String(it.user_request_upload).trim() !== '' && String(it.user_request_upload).trim() !== 'null') {
+                    const parts = String(it.user_request_upload).split(',').map(s => s.trim()).filter(Boolean);
+                    if (parts.length > 0) {
+                        requestLetterFile = parts[0];
+                        break;
+                    }
+                }
+                if (it.user_request_uploads && Array.isArray(it.user_request_uploads) && it.user_request_uploads.length > 0) {
+                    const valid = it.user_request_uploads.map(s => (s || '').trim()).filter(Boolean);
+                    if (valid.length > 0) {
+                        requestLetterFile = valid[0];
+                        break;
+                    }
+                }
+            }
+
+            if (letterWrapper && letterContainer) {
+                letterWrapper.style.display = 'block';
+                if (requestLetterFile) {
+                    letterContainer.innerHTML = `
+                        <div class="d-flex align-items-center justify-content-between w-100 flex-wrap gap-2">
+                            <span class="small fw-semibold text-dark">
+                                <i class="fa-solid fa-file-lines text-primary me-1"></i> Request Letter Document
+                            </span>
+                            <a href="${resolveUploadUrl(requestLetterFile)}" target="_blank" 
+                               class="btn btn-sm btn-outline-danger fw-semibold px-3 py-1 d-inline-flex align-items-center gap-1 shadow-sm" 
+                               style="font-size: 0.85rem; border-radius: 6px;" title="Click to view uploaded request letter copy">
+                                <i class="fa-solid fa-file-pdf"></i> View Request Letter <i class="fa-solid fa-arrow-up-right-from-square ms-1" style="font-size: 0.75rem;"></i>
+                            </a>
+                        </div>
+                    `;
+                } else {
+                    letterContainer.innerHTML = `
+                        <span class="text-muted small fw-semibold">
+                            <i class="fa-solid fa-circle-info me-1"></i> No letter copy uploaded for this request
+                        </span>
+                    `;
+                }
             }
 
             if (tbody) {
                 tbody.innerHTML = '';
                 let totalIssuable = 0;
 
-                items.forEach(item => {
+                items.forEach((item, index) => {
                     const reqQty = parseInt(item.qty_requested || 0);
                     const delQty = parseInt(item.qty_delivered || 0);
                     const pendingQty = Math.max(0, reqQty - delQty);
                     const availStock = parseInt(item.available_stock !== undefined ? item.available_stock : 0);
                     const maxIssuable = Math.min(pendingQty, Math.max(0, availStock));
+                    const woQty = parseInt(item.qty_workorder_registered || item.workorder_qty || 0);
 
                     let stockBadge = '';
                     if (availStock <= 0) {
@@ -9766,11 +11000,13 @@
 
                     const tr = document.createElement('tr');
                     tr.innerHTML = ` 
+                        <td class="text-center fw-semibold text-secondary font-monospace">${index + 1}</td>
                         <td class="fw-semibold text-secondary">${escapeHtml(item.printer_name || '-')}</td>
                         <td>
                             <span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span>
                             ${item.part_code ? `<small class="text-muted d-block font-monospace">${escapeHtml(item.part_code)}</small>` : ''}
                         </td>
+                        <td class="text-center font-monospace fw-bold text-primary">${woQty > 0 ? woQty : '-'}</td>
                         <td class="text-center font-monospace fw-bold text-dark">${reqQty}</td>
                         <td class="text-center text-success font-monospace fw-bold">${delQty}</td>
                         <td class="text-center font-monospace fw-bold" style="color: #d97706;">${pendingQty}</td>
@@ -9805,18 +11041,17 @@
 
             const selectedKey = document.getElementById('outward-request-select')?.value;
             const outwardDateInput = document.getElementById('outward-date');
-            const outwardDate = outwardDateInput ? outwardDateInput.value.trim() : '';
+            let outwardDate = outwardDateInput ? outwardDateInput.value.trim() : '';
+            if (!outwardDate) {
+                outwardDate = new Date().toISOString().split('T')[0];
+                if (outwardDateInput) outwardDateInput.value = outwardDate;
+            }
 
             if (!selectedKey) {
                 showNotification('warning', 'Missing Selection', 'Please select an Active Request.');
                 return;
             }
 
-            if (!outwardDate) {
-                showNotification('warning', 'Missing Date', 'Please select Outward Date.');
-                return;
-            }
-
             const itemsToIssue = [];
             const inputs = document.querySelectorAll('#outward-items-tbody .outward-qty-input');
             inputs.forEach(inp => {
@@ -10207,34 +11442,41 @@
 
                 const finalY = doc.lastAutoTable ? doc.lastAutoTable.finalY + 15 : 150;
 
-                // Signatures row
-                const sigY = Math.max(finalY + 20, 225);
+                // Signatures section
+                // Row 1: Left = Issuer's Signature (IT Cell), Right = Receiver's Signature
+                const sigY = Math.max(finalY + 15, 190);
+
+                doc.setDrawColor(203, 213, 225);
+                doc.setLineWidth(0.25);
+
+                // 1. Left Side: Issuer's Signature (IT Cell)
+                doc.line(15, sigY, 80, sigY);
 
-                // Left Side: Issued By (IT Cell)
-                // doc.setDrawColor(203, 213, 225);
-                // doc.setLineWidth(0.25);
-                // doc.line(15, sigY, 75, sigY);
+                doc.setFont('Helvetica', 'bold');
+                doc.setFontSize(9);
+                doc.setTextColor(71, 85, 105);
+                doc.text("Issuer's Signature (IT Cell)", 47.5, sigY + 5, null, null, "center");
 
-                // doc.setFont('Helvetica', 'bold');
-                // doc.setFontSize(9);
-                // doc.setTextColor(71, 85, 105);
-                // doc.text("Issued By (IT Cell)", 45, sigY + 5, null, null, "center");
+                doc.setFont('Helvetica', 'normal');
+                doc.setFontSize(8);
+                doc.text("Greater Chennai Corporation", 47.5, sigY + 9, null, null, "center");
 
-                // doc.setFont('Helvetica', 'normal');
-                // doc.setFontSize(8);
-                // doc.text("Greater Chennai Corporation", 45, sigY + 9, null, null, "center");
+                doc.setFontSize(8.5);
+                doc.text("Name: ______________________", 15, sigY + 18);
+                doc.text("Mobile Number: _____________", 15, sigY + 25);
+                doc.text("Designation: ________________", 15, sigY + 32);
 
-                // Right Side: Receiver's Signature
-                doc.line(135, sigY, 195, sigY);
+                // 2. Right Side: Receiver's Signature
+                doc.line(130, sigY, 195, sigY);
 
                 doc.setFont('Helvetica', 'bold');
                 doc.setFontSize(9);
                 doc.setTextColor(71, 85, 105);
-                doc.text("Receiver's Signature", 165, sigY + 5, null, null, "center");
+                doc.text("Receiver's Signature", 162.5, sigY + 5, null, null, "center");
 
                 doc.setFont('Helvetica', 'normal');
                 doc.setFontSize(8);
-                doc.text("Greater Chennai Corporation", 165, sigY + 9, null, null, "center");
+                doc.text("Department / Office", 162.5, sigY + 9, null, null, "center");
 
                 doc.setFontSize(8.5);
                 doc.text("Name: ______________________", 130, sigY + 18);
@@ -10242,9 +11484,30 @@
                 doc.text("Designation: ________________", 130, sigY + 32);
 
                 if (signatureDataUrl) {
-                    doc.addImage(signatureDataUrl, 'PNG', 15, sigY - 20, 40, 18);
+                    doc.addImage(signatureDataUrl, 'PNG', 135, sigY - 20, 50, 18);
                 }
 
+                // Row 2 (Below Down): Verifier's Signature (IT Cell)
+                const verifierY = sigY + 42;
+
+                doc.setDrawColor(203, 213, 225);
+                doc.setLineWidth(0.25);
+                doc.line(130, verifierY, 195, verifierY);
+
+                doc.setFont('Helvetica', 'bold');
+                doc.setFontSize(9);
+                doc.setTextColor(71, 85, 105);
+                doc.text("Verifier's Signature (IT Cell)", 162.5, verifierY + 5, null, null, "center");
+
+                doc.setFont('Helvetica', 'normal');
+                doc.setFontSize(8);
+                doc.text("Greater Chennai Corporation", 162.5, verifierY + 9, null, null, "center");
+
+                doc.setFontSize(8.5);
+                doc.text("Name: ______________________", 130, verifierY + 18);
+                doc.text("Mobile Number: _____________", 130, verifierY + 25);
+                doc.text("Designation: ________________", 130, verifierY + 32);
+
                 callback(doc);
             };
 
@@ -10305,37 +11568,53 @@
                 thead.innerHTML = `
                     <tr>
                         <th style="width: 60px;">S.No</th>
-                        <th>Ref No.</th>
                         <th>File No.</th>
                         <th>Vendor</th>
                         <th class="text-center">Total Qty</th>
                         <th>Start Date</th>
                         <th>End Date</th>
+                        <th class="text-center">Status</th>
                         <th class="text-center">Workorder Copy</th>
                         <th class="text-center">Action</th>
                     </tr>
                 `;
             }
 
-            // Group records by ref_no
+            // Group records by File No or ref_no
             const groups = {};
             (data || []).forEach(item => {
+                const cleanFile = (item.file_number || '').trim();
                 const cleanRef = (item.ref_no || '').trim();
-                const key = cleanRef || 'general';
+                const key = cleanFile || cleanRef || ('wo_' + (item.id || Math.random()));
                 if (!groups[key]) {
                     groups[key] = {
+                        key: key,
                         ref_no: cleanRef,
-                        file_number: item.file_number || '',
+                        file_number: cleanFile,
                         vendor_name: item.vendor_name || '',
+                        vendor_id: item.vendor_id,
                         total_qty_registered: 0,
                         workorder_start_date: item.workorder_start_date || 'N/A',
                         workorder_end_date: item.workorder_end_date || 'N/A',
-                        dc_uploads: []
+                        dc_uploads: [],
+                        items: []
                     };
                 }
-                groups[key].total_qty_registered += parseInt(item.total_qty_registered || 0);
+                groups[key].total_qty_registered += parseInt(item.total_qty_registered || item.qty_registered || 0);
+                groups[key].items.push(item);
+
+                if (item.workorder_start_date && (!groups[key].workorder_start_date || groups[key].workorder_start_date === 'N/A')) {
+                    groups[key].workorder_start_date = item.workorder_start_date;
+                }
+                if (item.workorder_end_date && (!groups[key].workorder_end_date || groups[key].workorder_end_date === 'N/A')) {
+                    groups[key].workorder_end_date = item.workorder_end_date;
+                }
 
-                if (item.dc_upload) {
+                if (item.dc_uploads && Array.isArray(item.dc_uploads)) {
+                    item.dc_uploads.forEach(f => {
+                        if (f && !groups[key].dc_uploads.includes(f)) groups[key].dc_uploads.push(f);
+                    });
+                } else if (item.dc_upload) {
                     const files = item.dc_upload.split(',').filter(Boolean);
                     files.forEach(f => {
                         if (!groups[key].dc_uploads.includes(f)) {
@@ -10373,31 +11652,36 @@
 
             pageData.forEach((item, index) => {
                 const globalIdx = startIdx + index + 1;
-                let docBtn = '-';
+                let docBtn = `<span class="text-muted"><i class="fa-solid fa-ban"></i> N/A</span>`;
                 if (item.dc_uploads && item.dc_uploads.length > 0) {
                     docBtn = item.dc_uploads.map((file, i) => {
-                        const label = item.dc_uploads.length > 1 ? `View DC ${i + 1}` : `View DC`;
-                        return `<a href="${resolveUploadUrl(file)}" target="_blank" class="btn-action btn-view-doc m-1" style="font-size: 10px; padding: 4px 8px; white-space: nowrap;"><i class="fa-solid fa-file-pdf"></i> ${label}</a>`;
+                        const label = item.dc_uploads.length > 1 ? `View ${i + 1}` : `View`;
+                        return `<a href="${resolveUploadUrl(file)}" target="_blank" class="btn-action btn-view-doc m-1" style="font-size: 11px; padding: 4px 8px; white-space: nowrap;"><i class="fa-solid fa-file-pdf"></i> ${label}</a>`;
                     }).join(' ');
                 }
 
-                const refLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-secondary" style="border-bottom: 1px dashed #64748b;" onclick="showWorkorderHistoryBreakdownModal('${escapeHtml(item.ref_no)}'); return false;">${escapeHtml(item.ref_no || '')}</a>`;
+                const firstFile = (item.dc_uploads && item.dc_uploads.length > 0) ? item.dc_uploads[0] : null;
+                const fileNoLink = firstFile
+                    ? `<a href="${resolveUploadUrl(firstFile)}" target="_blank" class="fw-bold text-decoration-none text-primary font-monospace" style="font-size: 0.95rem;" title="Click to view uploaded workorder copy">${escapeHtml(item.file_number || item.ref_no || '-')}</a>`
+                    : `<span class="fw-bold text-dark font-monospace">${escapeHtml(item.file_number || item.ref_no || '-')}</span>`;
+
+                const statusBadge = getWorkorderStatusBadge(item.workorder_start_date, item.workorder_end_date);
 
                 const tr = document.createElement('tr');
                 tr.innerHTML = `
                     <td class="fw-semibold text-secondary">${globalIdx}</td>
-                    <td class="fw-bold text-dark">${refLink}</td>
-                    <td>${escapeHtml(item.file_number || '')}</td>
+                    <td>${fileNoLink}</td>
                     <td>${escapeHtml(item.vendor_name || '')}</td>
-                    <td class="text-center font-monospace fw-bold">${item.total_qty_registered || '0'}</td>
-                    <td><small class="text-dark fw-semibold">${item.workorder_start_date || 'N/A'}</small></td>
-                    <td><small class="text-dark fw-semibold">${item.workorder_end_date || 'N/A'}</small></td>
+                    <td class="text-center font-monospace fw-bold text-dark">${item.total_qty_registered || '0'}</td>
+                    <td><small class="text-dark fw-semibold font-monospace">${formatDateOnly(item.workorder_start_date)}</small></td>
+                    <td><small class="text-dark fw-semibold font-monospace">${formatDateOnly(item.workorder_end_date)}</small></td>
+                    <td class="text-center">${statusBadge}</td>
                     <td class="text-center">${docBtn}</td>
                     <td class="text-center">
                         <button type="button" class="btn btn-sm btn-primary fw-bold px-3 py-1" 
                                 style="border-radius: 20px; font-size: 11px; background-color: #0f5c78; border-color: #0f5c78; box-shadow: 0 2px 4px rgba(15, 92, 120, 0.15);"
-                                onclick="showWorkorderHistoryBreakdownModal('${escapeHtml(item.ref_no)}')"
-                                title="Click to view all items for this reference">
+                                onclick="showWorkorderHistoryBreakdownModal('${escapeHtml(item.ref_no)}', '${escapeHtml(item.file_number || '')}', '${escapeHtml(item.key || '')}')"
+                                title="Click to view all items for this workorder">
                             <i class="fa-solid fa-eye"></i> View
                         </button>
                     </td>
@@ -10501,8 +11785,8 @@
                             <td>${escapeHtml(item.printer_name || '-')}</td>
                             <td><span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span></td>
                             <td class="text-center font-monospace fw-bold">${item.total_qty_registered || item.qty_registered || '0'}</td>
-                            <td><small class="text-dark fw-semibold">${item.workorder_start_date || 'N/A'}</small></td>
-                            <td><small class="text-dark fw-semibold">${item.workorder_end_date || 'N/A'}</small></td>
+                            <td><small class="text-dark fw-semibold font-monospace">${formatDateOnly(item.workorder_start_date)}</small></td>
+                            <td><small class="text-dark fw-semibold font-monospace">${formatDateOnly(item.workorder_end_date)}</small></td>
                             
                         `;
                         // <td class="text-center">${pdfBtn}</td>
@@ -10603,8 +11887,46 @@
                 const vendorEl = document.getElementById('inward-breakdown-vendor');
                 if (vendorEl) vendorEl.textContent = vendorName;
 
+                // Group items by unique DC
+                const dcMap = {};
+                filtered.forEach(item => {
+                    const cleanDcNo = (item.dc_no || '').trim();
+                    const cleanDcUpload = (item.dc_upload || item.dc_uploads || '').toString().trim();
+                    const dcDateKey = item.dc_date ? String(item.dc_date).substring(0, 10) : '';
+                    const cdateKey = item.cdate ? String(item.cdate).substring(0, 19) : '';
+                    const dcKey = cleanDcNo ? cleanDcNo : (cleanDcUpload || dcDateKey || cdateKey || 'dc_general');
+
+                    if (!dcMap[dcKey]) {
+                        dcMap[dcKey] = {
+                            dc_no: cleanDcNo || '-',
+                            dc_date: item.dc_date || '',
+                            cdate: item.cdate,
+                            order_by: item.order_by || item.updated_by || '',
+                            dc_uploads: [],
+                            items: []
+                        };
+                    }
+                    dcMap[dcKey].items.push(item);
+                    const rawDc = item.dc_upload || item.dc_uploads;
+                    if (rawDc) {
+                        const files = Array.isArray(rawDc) ? rawDc : String(rawDc).split(',').map(s => s.trim()).filter(Boolean);
+                        files.forEach(f => {
+                            if (f && !dcMap[dcKey].dc_uploads.includes(f)) dcMap[dcKey].dc_uploads.push(f);
+                        });
+                    }
+                });
+
+                const dcList = Object.values(dcMap);
+                const allDcNos = dcList.map(d => d.dc_no).filter(Boolean);
+
                 const dcNoEl = document.getElementById('inward-breakdown-dcno');
-                if (dcNoEl) dcNoEl.textContent = first.dc_no || (groupMeta && groupMeta.dc_no) || '-';
+                if (dcNoEl) {
+                    if (dcList.length > 1) {
+                        dcNoEl.innerHTML = dcList.map((d, i) => `(${String.fromCharCode(97 + i)}) ${escapeHtml(d.dc_no)}`).join(', ');
+                    } else {
+                        dcNoEl.textContent = first.dc_no || (groupMeta && groupMeta.dc_no) || '-';
+                    }
+                }
                 const dcDateEl = document.getElementById('inward-breakdown-dcdate');
                 const rawDcDate = first.dc_date || (groupMeta && groupMeta.dc_date);
                 if (dcDateEl) dcDateEl.textContent = (rawDcDate && String(rawDcDate).trim() !== '' && String(rawDcDate).trim() !== 'null') ? formatDateOnly(rawDcDate) : '-';
@@ -10612,42 +11934,70 @@
                 const tbody = document.getElementById('inward-breakdown-table-body');
                 if (tbody) {
                     tbody.innerHTML = '';
-
-                    filtered.forEach((item, index) => {
-                        const tr = document.createElement('tr');
-                        const createdDate = formatTimestamp(item.cdate);
-                        const dcDateFormatted = (item.dc_date && String(item.dc_date).trim() !== '' && String(item.dc_date).trim() !== 'null') ? formatDateOnly(item.dc_date) : '-';
-
-                        let docFiles = [];
-                        if (Array.isArray(item.dc_uploads)) {
-                            docFiles = item.dc_uploads.filter(Boolean);
-                        } else if (typeof item.dc_uploads === 'string' && item.dc_uploads.trim()) {
-                            docFiles = item.dc_uploads.split(',').map(s => s.trim()).filter(Boolean);
-                        } else if (typeof item.dc_upload === 'string' && item.dc_upload.trim()) {
-                            docFiles = item.dc_upload.split(',').map(s => s.trim()).filter(Boolean);
+                    let runningIdx = 1;
+
+                    dcList.forEach((dc, dcIdx) => {
+                        const dcLetter = String.fromCharCode(97 + dcIdx);
+                        const dcDateFormatted = (dc.dc_date && String(dc.dc_date).trim() !== '' && String(dc.dc_date).trim() !== 'null') ? formatDateOnly(dc.dc_date) : '-';
+                        const createdDate = formatTimestamp(dc.cdate);
+                        let dcTotal = dc.items.reduce((sum, it) => sum + (parseInt(it.qty_registered || it.inward_qty || 0) || 0), 0);
+
+                        let docBtn = '';
+                        if (dc.dc_uploads && dc.dc_uploads.length > 0) {
+                            docBtn = dc.dc_uploads.map((file, i) => {
+                                const label = dc.dc_uploads.length > 1 ? `View Doc ${i + 1}` : `View DC Document`;
+                                return `<a href="${resolveUploadUrl(file)}" target="_blank" class="btn btn-sm btn-outline-danger py-0 px-2 fw-semibold ms-2" style="font-size: 11px;"><i class="fa-solid fa-file-pdf me-1"></i>${label}</a>`;
+                            }).join(' ');
                         }
 
-                        let docBtn = '-';
-                        if (docFiles.length > 0) {
-                            docBtn = docFiles.map((file, i) => {
-                                const label = docFiles.length > 1 ? `View DC ${i + 1}` : `View DC`;
-                                return `<a href="${resolveUploadUrl(file)}" target="_blank" class="btn-action btn-view-doc m-1" style="font-size: 10px; padding: 4px 8px; white-space: nowrap;"><i class="fa-solid fa-file-pdf"></i> ${label}</a>`;
-                            }).join(' ');
+                        // Header separator row for each Delivery Challan if multiple DCs exist
+                        if (dcList.length > 1) {
+                            const headerTr = document.createElement('tr');
+                            headerTr.className = 'table-primary bg-opacity-25';
+                            headerTr.style.background = '#e0f2fe';
+                            headerTr.innerHTML = `
+                                <td colspan="8" class="fw-bold py-2" style="color: #0369a1;">
+                                    <div class="d-flex justify-content-between align-items-center flex-wrap gap-2">
+                                        <span>
+                                            <strong class="font-monospace text-dark fs-6">(${dcLetter}) Delivery Challan: ${escapeHtml(dc.dc_no)}</strong>
+                                            <span class="text-muted small ms-2">| Date: <strong>${dcDateFormatted}</strong></span>
+                                            <span class="text-muted small ms-2">| Entered By: <strong>${escapeHtml(dc.order_by || '-')}</strong></span>
+                                        </span>
+                                        <div class="d-flex align-items-center gap-2">
+                                            <span class="badge bg-primary text-white font-monospace">Inward: ${dcTotal} Nos</span>
+                                            ${docBtn}
+                                        </div>
+                                    </div>
+                                </td>
+                            `;
+                            tbody.appendChild(headerTr);
                         }
 
-                        tr.innerHTML = `
-                            <td class="fw-semibold text-secondary">${index + 1}</td>
-                            <td class="fw-semibold text-dark font-monospace">${escapeHtml(item.dc_no || '-')}</td>
-                            <td>${escapeHtml(item.printer_name || '-')}</td>
-                            <td><span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span></td>
-                            <td class="text-center text-primary font-monospace fw-bold">${item.qty_registered || item.inward_qty || '0'}</td>
-                            <td><small class="text-dark fw-semibold">${dcDateFormatted}</small></td>
-                            <td><small class="text-muted fw-semibold">${createdDate}</small></td>
-                            <td><small class="text-muted">${escapeHtml(item.order_by || '-')}</small></td>
-                            
-                        `;
-                        // <td class="text-center">${docBtn}</td>
-                        tbody.appendChild(tr);
+                        dc.items.forEach((item, index) => {
+                            const tr = document.createElement('tr');
+                            const itemDateFormatted = (item.dc_date && String(item.dc_date).trim() !== '' && String(item.dc_date).trim() !== 'null') ? formatDateOnly(item.dc_date) : '-';
+                            const itemCreatedDate = formatTimestamp(item.cdate);
+
+                            let itemDocBtn = '-';
+                            if (dcList.length === 1 && dc.dc_uploads && dc.dc_uploads.length > 0) {
+                                itemDocBtn = dc.dc_uploads.map((file, i) => {
+                                    const label = dc.dc_uploads.length > 1 ? `View DC ${i + 1}` : `View DC`;
+                                    return `<a href="${resolveUploadUrl(file)}" target="_blank" class="btn-action btn-view-doc m-1" style="font-size: 10px; padding: 4px 8px; white-space: nowrap;"><i class="fa-solid fa-file-pdf"></i> ${label}</a>`;
+                                }).join(' ');
+                            }
+
+                            tr.innerHTML = `
+                                <td class="fw-semibold text-secondary text-center">${runningIdx++}</td>
+                                <td class="fw-semibold text-dark font-monospace">${dcList.length > 1 ? `(${dcLetter}) ` : ''}${escapeHtml(item.dc_no || '-')}</td>
+                                <td>${escapeHtml(item.printer_name || '-')}</td>
+                                <td><span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span></td>
+                                <td class="text-center text-primary font-monospace fw-bold fs-6">${item.qty_registered || item.inward_qty || '0'}</td>
+                                <td><small class="text-dark fw-semibold">${itemDateFormatted}</small></td>
+                                <td><small class="text-muted fw-semibold">${itemCreatedDate}</small></td>
+                                <td><small class="text-muted">${escapeHtml(item.order_by || '-')}</small></td>
+                            `;
+                            tbody.appendChild(tr);
+                        });
                     });
                 }
 
@@ -12072,16 +13422,29 @@
         }
 
         function formatDateOnly(ts) {
-            if (!ts) return '-';
+            if (!ts || String(ts).trim() === '' || String(ts).trim() === 'null' || String(ts).trim() === 'N/A') return '-';
+            const str = String(ts).trim();
+            const matchYMD = str.match(/^(\d{4})-(\d{2})-(\d{2})/);
+            if (matchYMD) {
+                return `${matchYMD[3]}-${matchYMD[2]}-${matchYMD[1]}`;
+            }
+            const matchDMY = str.match(/^(\d{2})-(\d{2})-(\d{4})/);
+            if (matchDMY) {
+                return str;
+            }
+            const matchSlash = str.match(/^(\d{2})\/(\d{2})\/(\d{4})/);
+            if (matchSlash) {
+                return `${matchSlash[1]}-${matchSlash[2]}-${matchSlash[3]}`;
+            }
             try {
                 const date = new Date(ts);
-                if (isNaN(date.getTime())) return ts;
+                if (isNaN(date.getTime())) return str;
                 const dd = String(date.getDate()).padStart(2, '0');
                 const mm = String(date.getMonth() + 1).padStart(2, '0');
                 const yyyy = date.getFullYear();
-                return `${dd}/${mm}/${yyyy}`;
+                return `${dd}-${mm}-${yyyy}`;
             } catch (e) {
-                return ts;
+                return str;
             }
         }
 
@@ -12100,6 +13463,49 @@
                 return ts;
             }
         }
+
+        function getWorkorderStatusBadge(startDateStr, endDateStr) {
+            if (!endDateStr || String(endDateStr).trim() === '' || String(endDateStr).trim() === 'null' || String(endDateStr).trim() === 'N/A' || String(endDateStr).trim() === '-') {
+                return `<span class="badge bg-secondary px-2 py-1" style="font-size: 0.78rem;">-</span>`;
+            }
+
+            const str = String(endDateStr).trim();
+            let endYear, endMonth, endDay;
+
+            const matchYMD = str.match(/^(\d{4})-(\d{2})-(\d{2})/);
+            if (matchYMD) {
+                endYear = parseInt(matchYMD[1], 10);
+                endMonth = parseInt(matchYMD[2], 10) - 1;
+                endDay = parseInt(matchYMD[3], 10);
+            } else {
+                const matchDMY = str.match(/^(\d{2})[-/](\d{2})[-/](\d{4})/);
+                if (matchDMY) {
+                    endDay = parseInt(matchDMY[1], 10);
+                    endMonth = parseInt(matchDMY[2], 10) - 1;
+                    endYear = parseInt(matchDMY[3], 10);
+                } else {
+                    const parsed = new Date(str);
+                    if (!isNaN(parsed.getTime())) {
+                        endYear = parsed.getFullYear();
+                        endMonth = parsed.getMonth();
+                        endDay = parsed.getDate();
+                    }
+                }
+            }
+
+            if (!endYear) {
+                return `<span class="badge bg-secondary px-2 py-1" style="font-size: 0.78rem;">-</span>`;
+            }
+
+            const now = new Date();
+            const endOfExpiryDay = new Date(endYear, endMonth, endDay, 23, 59, 59, 999);
+
+            if (now > endOfExpiryDay) {
+                return `<span class="badge" style="background-color: #fee2e2; color: #dc2626; border: 1px solid #fca5a5; font-weight: 700; font-size: 0.78rem; padding: 4px 8px; border-radius: 6px;"><i class="fa-solid fa-clock-rotate-left me-1"></i>Expired</span>`;
+            } else {
+                return `<span class="badge" style="background-color: #dcfce7; color: #16a34a; border: 1px solid #86efac; font-weight: 700; font-size: 0.78rem; padding: 4px 8px; border-radius: 6px;"><i class="fa-solid fa-circle-check me-1"></i>Active</span>`;
+            }
+        }
     </script>
     <!-- Workorder Requests Breakdown Modal -->
     <div class="modal fade" id="workorderRequestsBreakdownModal" tabindex="-1"
@@ -12269,6 +13675,86 @@
             </div>
         </div>
     </div>
+
+    <!-- Edit Inward Delivery Challan Modal -->
+    <div class="modal fade" id="editInwardDcModal" tabindex="-1" aria-labelledby="editInwardDcModalLabel"
+        aria-hidden="true">
+        <div class="modal-dialog modal-md modal-dialog-centered">
+            <div class="modal-content shadow-lg border-0" style="border-radius: 15px;">
+                <div class="modal-header text-white"
+                    style="background: #0f5c78; border-top-left-radius: 15px; border-top-right-radius: 15px;">
+                    <h5 class="modal-title fw-bold" id="editInwardDcModalLabel">
+                        <i class="fa-solid fa-pen-to-square me-2"></i> Edit Delivery Challan (DC)
+                    </h5>
+                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"
+                        aria-label="Close"></button>
+                </div>
+                <form id="edit-inward-dc-form" onsubmit="event.preventDefault(); saveEditInwardDc(event);">
+                    <div class="modal-body p-4">
+                        <input type="hidden" id="edit-inward-dc-ids">
+
+                        <!-- Meta Info Banner -->
+                        <div class="p-3 bg-light rounded border mb-3">
+                            <div class="d-flex justify-content-between align-items-center flex-wrap gap-2">
+                                <div>
+                                    <small class="text-muted d-block">File No / Ref No:</small>
+                                    <strong id="edit-inward-dc-fileno" class="text-primary font-monospace"></strong>
+                                </div>
+                                <div class="text-end">
+                                    <small class="text-muted d-block">Inward Qty:</small>
+                                    <span id="edit-inward-dc-qty" class="badge bg-primary fs-6 font-monospace"></span>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- 1. DC Number -->
+                        <div class="mb-3">
+                            <label class="form-label fw-semibold text-secondary" for="edit-inward-dc-no">
+                                <i class="fa-solid fa-hashtag text-primary me-1"></i> Delivery Challan (DC) Number *
+                            </label>
+                            <input type="text" id="edit-inward-dc-no" required class="form-control"
+                                placeholder="Enter DC Number (e.g. DC-101)"
+                                style="border-radius: 8px; font-weight: 600;">
+                        </div>
+
+                        <!-- 2. DC Date -->
+                        <div class="mb-3">
+                            <label class="form-label fw-semibold text-secondary" for="edit-inward-dc-date">
+                                <i class="fa-solid fa-calendar-days text-primary me-1"></i> Delivery Challan (DC) Date *
+                            </label>
+                            <input type="date" id="edit-inward-dc-date" required class="form-control"
+                                style="border-radius: 8px; font-weight: 600;">
+                        </div>
+
+                        <!-- 3. DC Copy (PDF) -->
+                        <div class="mb-3">
+                            <label class="form-label fw-semibold text-secondary">
+                                <i class="fa-solid fa-file-pdf text-danger me-1"></i> Delivery Challan Copy (PDF)
+                            </label>
+
+                            <!-- Current DC File Link -->
+                            <div id="edit-inward-dc-current-file" class="mb-2">
+                                <!-- Populated dynamically -->
+                            </div>
+
+                            <input type="file" id="edit-inward-dc-file" accept=".pdf"
+                                class="form-control form-control-sm" style="border-radius: 8px;">
+                            <small class="text-muted d-block mt-1">Upload a new PDF to replace the current DC copy
+                                (Optional)</small>
+                        </div>
+                    </div>
+                    <div class="modal-footer border-0 pt-0">
+                        <button type="button" class="btn btn-light px-4 fw-semibold border" data-bs-dismiss="modal"
+                            style="border-radius: 8px;">Cancel</button>
+                        <button type="submit" class="btn btn-primary px-4 fw-bold" id="edit-inward-dc-submit-btn"
+                            style="background-color: #0f5c78; border-color: #0f5c78; border-radius: 8px;">
+                            <i class="fa-solid fa-floppy-disk me-1"></i> Update DC
+                        </button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
     <!-- Outward Delivery Breakdown Modal -->
     <div class="modal fade" id="outwardBreakdownModal" tabindex="-1" aria-labelledby="outwardBreakdownModalLabel"
         aria-hidden="true">