|
|
@@ -91,10 +91,12 @@ open class MailTemplateService( |
|
|
val item = stockInLine.item |
|
|
val item = stockInLine.item |
|
|
val supplierName = po?.supplier?.name ?: "N/A" |
|
|
val supplierName = po?.supplier?.name ?: "N/A" |
|
|
val supplierEmail = if((po?.supplier?.contactEmail).isNullOrEmpty()) "N/A" else po?.supplier?.contactEmail |
|
|
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 dnDate = formatter.format(stockInLine.dnDate) ?: "N/A" |
|
|
val poNo = po?.code ?: "N/A" |
|
|
val poNo = po?.code ?: "N/A" |
|
|
val supplierId = po?.supplier?.code ?: "N/A" // Id? |
|
|
val supplierId = po?.supplier?.code ?: "N/A" // Id? |
|
|
val itemNo = item?.code ?: "N/A" |
|
|
val itemNo = item?.code ?: "N/A" |
|
|
|
|
|
val itemName = item?.name ?: "N/A" |
|
|
val itemQty = (pol?.qty ?: zero).toString() |
|
|
val itemQty = (pol?.qty ?: zero).toString() |
|
|
val uom = pol?.uom?.udfudesc ?: "N/A" |
|
|
val uom = pol?.uom?.udfudesc ?: "N/A" |
|
|
val planDnDate = po?.estimatedArrivalDate?.let { formatter.format(it) } ?: "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") |
|
|
val content = (emailTemplate.contentCht ?: "N/A") |
|
|
.replace("{supplierName}", supplierName) |
|
|
.replace("{supplierName}", supplierName) |
|
|
|
|
|
.replace("{dnNo}", dnNo) |
|
|
.replace("{dnDate}", dnDate) |
|
|
.replace("{dnDate}", dnDate) |
|
|
.replace("{poNo}", poNo) |
|
|
.replace("{poNo}", poNo) |
|
|
.replace("{supplierId}", supplierId) |
|
|
.replace("{supplierId}", supplierId) |
|
|
.replace("{itemNo}", itemNo) |
|
|
.replace("{itemNo}", itemNo) |
|
|
|
|
|
.replace("{itemName}", itemName) |
|
|
.replace("{itemQty}", itemQty) |
|
|
.replace("{itemQty}", itemQty) |
|
|
.replace("{uom}", uom) |
|
|
.replace("{uom}", uom) |
|
|
.replace("{planDnDate}", planDnDate) |
|
|
.replace("{planDnDate}", planDnDate) |
|
|
@@ -174,7 +178,7 @@ open class MailTemplateService( |
|
|
|
|
|
|
|
|
return DownloadMailTemplateResponse( |
|
|
return DownloadMailTemplateResponse( |
|
|
file = resultPdf.toByteArray(), |
|
|
file = resultPdf.toByteArray(), |
|
|
fileName = subject ?: "N/A" |
|
|
|
|
|
|
|
|
fileName = subject |
|
|
); |
|
|
); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |