|
|
|
@@ -100,7 +100,7 @@ open class MailTemplateService( |
|
|
|
val itemName: String = "", |
|
|
|
val itemQty: String = "", |
|
|
|
val uom: String = "", |
|
|
|
val planDnDate: String = "", |
|
|
|
val dnDate: String = "", |
|
|
|
val unitPrice: String = "", |
|
|
|
val receivedCompany: String = "", |
|
|
|
val lotNo: String = "", |
|
|
|
@@ -122,7 +122,7 @@ open class MailTemplateService( |
|
|
|
"\${itemName}" to itemName, |
|
|
|
"\${itemQty}" to itemQty, |
|
|
|
"\${uom}" to uom, |
|
|
|
"\${planDnDate}" to planDnDate, |
|
|
|
"\${dnDate}" to dnDate, |
|
|
|
"\${unitPrice}" to unitPrice, |
|
|
|
"\${receivedCompany}" to receivedCompany, |
|
|
|
"\${lotNo}" to lotNo, |
|
|
|
@@ -156,7 +156,8 @@ open class MailTemplateService( |
|
|
|
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" |
|
|
|
// val planDnDate = po?.estimatedArrivalDate?.let { formatter.format(it) } ?: "N/A" |
|
|
|
val dnDate = stockInLine.dnDate?.let { formatter.format(it) } ?: "N/A" |
|
|
|
val unitPrice = (pol?.up ?: zero).toString() |
|
|
|
val receivedCompany = po?.shop?.name ?: "N/A" |
|
|
|
val lotNo = stockInLine.productLotNo ?: "N/A" |
|
|
|
@@ -200,7 +201,8 @@ open class MailTemplateService( |
|
|
|
itemName = itemName, |
|
|
|
itemQty = itemQty, |
|
|
|
uom = uom, |
|
|
|
planDnDate = planDnDate, |
|
|
|
// planDnDate = planDnDate, |
|
|
|
dnDate = dnDate, |
|
|
|
unitPrice = unitPrice, |
|
|
|
receivedCompany = receivedCompany, |
|
|
|
lotNo = lotNo, |
|
|
|
|