update

src/main/java/com/ffii/fpsms/modules/report/service/ReportService.kt

@@ -144,7 +144,7 @@ open class ReportService(
         IFNULL(it.code, '')                           AS itemNo,
         IFNULL(it.name, '')                           AS itemName,
         IFNULL(uc.udfudesc, '')                       AS unitOfMeasure,
-        IFNULL(sil.dnNo, '')                          AS dnNo,
+        IFNULL(dpor.deliveryNoteCode, '')             AS dnNo,
         CAST(IFNULL(sp.id, 0) AS CHAR)                AS customerId,
         IFNULL(sp.name, '')                           AS customerName,
    CAST(
@@ -192,10 +192,10 @@ CAST(ROUND(IFNULL(IFNULL(sol.qty, dol.qty), 0), 2) AS CHAR) AS qty,
         IFNULL(do.code, '')                           AS deliveryOrderNo,
         IFNULL(qc.name, '')                            AS stockSubCategory
     FROM do_pick_order_line_record dpolr
-        LEFT JOIN do_pick_order_record dpor
-            ON dpolr.do_pick_order_id = dpor.id
-           AND dpor.deleted = 0
-           AND dpor.ticket_status = 'completed'
+    LEFT JOIN do_pick_order_record dpor
+        ON dpolr.do_pick_order_id = dpor.record_id
+       AND dpor.deleted = 0
+       AND dpor.ticket_status = 'completed'
         INNER JOIN delivery_order do
             ON dpolr.do_order_id = do.id
            AND do.deleted = 0
@@ -267,6 +267,7 @@ result.take(50).forEachIndexed { index, row ->
     println("  qty: ${row["qty"]}")
     println("  qtyNumeric: ${row["qtyNumeric"]}")
     println("  deliveryOrderNo: ${row["deliveryOrderNo"]}")
+    println("  dnNo: ${row["dnNo"]}")
     println("  stockSubCategory: ${row["stockSubCategory"]}")
     println("  ---")
 }