ソースを参照

quick update

master
cyril.tsui 3ヶ月前
コミット
a4a5551db4
2個のファイルの変更6行の追加2行の削除
  1. +5
    -1
      src/main/java/com/ffii/fpsms/modules/common/mail/service/MailTemplateService.kt
  2. +1
    -1
      src/main/java/com/ffii/fpsms/modules/common/scheduler/service/SchedulerService.kt

+ 5
- 1
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
);
}
}

+ 1
- 1
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();


読み込み中…
キャンセル
保存