From a4a5551db4da0f6a3ec7e04692137c38f8598555 Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Mon, 1 Sep 2025 11:50:12 +0800
Subject: [PATCH] quick update

---
 .../modules/common/mail/service/MailTemplateService.kt      | 6 +++++-
 .../modules/common/scheduler/service/SchedulerService.kt    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailTemplateService.kt b/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailTemplateService.kt
index 1102b28..f4348da 100644
--- a/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailTemplateService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailTemplateService.kt
@@ -91,10 +91,12 @@ open class MailTemplateService(
         val item = stockInLine.item
         val supplierName = po?.supplier?.name ?: "N/A"
         val supplierEmail = if((po?.supplier?.contactEmail).isNullOrEmpty()) "N/A" else po?.supplier?.contactEmail
+        val dnNo = stockInLine.dnNo ?: "N/A"
         val dnDate = formatter.format(stockInLine.dnDate) ?: "N/A"
         val poNo = po?.code ?: "N/A"
         val supplierId = po?.supplier?.code ?: "N/A" // Id?
         val itemNo = item?.code ?: "N/A"
+        val itemName = item?.name ?: "N/A"
         val itemQty = (pol?.qty ?: zero).toString()
         val uom = pol?.uom?.udfudesc ?: "N/A"
         val planDnDate = po?.estimatedArrivalDate?.let { formatter.format(it) } ?: "N/A"
@@ -141,10 +143,12 @@ open class MailTemplateService(
 
         val content = (emailTemplate.contentCht ?: "N/A")
             .replace("{supplierName}", supplierName)
+            .replace("{dnNo}", dnNo)
             .replace("{dnDate}", dnDate)
             .replace("{poNo}", poNo)
             .replace("{supplierId}", supplierId)
             .replace("{itemNo}", itemNo)
+            .replace("{itemName}", itemName)
             .replace("{itemQty}", itemQty)
             .replace("{uom}", uom)
             .replace("{planDnDate}", planDnDate)
@@ -174,7 +178,7 @@ open class MailTemplateService(
 
         return DownloadMailTemplateResponse(
             file = resultPdf.toByteArray(),
-            fileName = subject ?: "N/A"
+            fileName = subject
         );
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/ffii/fpsms/modules/common/scheduler/service/SchedulerService.kt b/src/main/java/com/ffii/fpsms/modules/common/scheduler/service/SchedulerService.kt
index 8825219..74dfb0d 100644
--- a/src/main/java/com/ffii/fpsms/modules/common/scheduler/service/SchedulerService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/common/scheduler/service/SchedulerService.kt
@@ -72,7 +72,7 @@ open class SchedulerService(
     }
 
     // Init Scheduler
-    @PostConstruct
+//    @PostConstruct
     fun init() {
         scheduleM18PoTask();
         scheduleM18MasterData();