diff --git a/src/main/java/com/ffii/fpsms/modules/report/service/FGStockOutTraceabilityReportService.kt b/src/main/java/com/ffii/fpsms/modules/report/service/FGStockOutTraceabilityReportService.kt
index 10e625e..7023b2f 100644
--- a/src/main/java/com/ffii/fpsms/modules/report/service/FGStockOutTraceabilityReportService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/report/service/FGStockOutTraceabilityReportService.kt
@@ -147,13 +147,13 @@ class FGStockOutTraceabilityReportService(
         LEFT JOIN pick_order_line pol
             ON pol.poId = po.id
            AND pol.deleted = 0
+        LEFT JOIN items it
+            ON pol.itemId = it.id
+           AND it.deleted = 0
         LEFT JOIN delivery_order_line dol
             ON dol.deliveryOrderId = do.id
            AND dol.itemId = pol.itemId
            AND dol.deleted = 0
-        LEFT JOIN items it
-            ON dol.itemId = it.id
-           AND it.deleted = 0
         LEFT JOIN item_uom iu
             ON it.id = iu.itemId
            AND iu.stockUnit = 1
diff --git a/src/main/java/com/ffii/fpsms/modules/report/service/ReportService.kt b/src/main/java/com/ffii/fpsms/modules/report/service/ReportService.kt
index 26ea397..be1ebab 100644
--- a/src/main/java/com/ffii/fpsms/modules/report/service/ReportService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/report/service/ReportService.kt
@@ -174,7 +174,14 @@ FORMAT(ROUND(IFNULL(IFNULL(sol.qty, dol.qty), 0), 0), 0) AS qty,
         )                                             AS truckNo,
         ''                                            AS driver,
         IFNULL(do.code, '')                           AS deliveryOrderNo,
-        IFNULL(qc.name, '')                            AS stockSubCategory
+        IFNULL((
+            SELECT MIN(qc.name)
+            FROM items_qc_category_mapping iqcm
+            INNER JOIN qc_category qc
+                ON iqcm.qcCategoryId = qc.id
+               AND qc.deleted = 0
+            WHERE iqcm.itemId = it.id
+        ), '')                                        AS stockSubCategory
     FROM delivery_order_pick_order dopo
         INNER JOIN pick_order po
             ON po.deliveryOrderPickOrderId = dopo.id
@@ -191,20 +198,13 @@ FORMAT(ROUND(IFNULL(IFNULL(sol.qty, dol.qty), 0), 0), 0) AS qty,
         LEFT JOIN pick_order_line pol
             ON pol.poId = po.id
            AND pol.deleted = 0
+        LEFT JOIN items it
+            ON pol.itemId = it.id
+           AND it.deleted = 0
         LEFT JOIN delivery_order_line dol
             ON dol.deliveryOrderId = do.id
            AND dol.itemId = pol.itemId
            AND dol.deleted = 0
-        LEFT JOIN items it
-            ON dol.itemId = it.id
-           AND it.deleted = 0
-        LEFT JOIN items_qc_category_mapping iqcm
-            ON it.id = iqcm.itemId
-        LEFT JOIN qc_category qc
-            ON iqcm.qcCategoryId = qc.id
-           AND qc.deleted = 0
-        LEFT JOIN item_category ic
-            ON it.categoryId = ic.id
         LEFT JOIN item_uom iu
             ON it.id = iu.itemId
            AND iu.stockUnit = 1
@@ -237,7 +237,7 @@ FORMAT(ROUND(IFNULL(IFNULL(sol.qty, dol.qty), 0), 0), 0) AS qty,
      ORDER BY
         it.code,
         deliveryDate,
-        qc.name,
+        stockSubCategory,
         IFNULL(sil.lotNo, '')
 """.trimIndent()