diff --git a/src/main/kotlin/com/restapi/controllers/Excel.kt b/src/main/kotlin/com/restapi/controllers/Excel.kt index 3915b83..04e7401 100644 --- a/src/main/kotlin/com/restapi/controllers/Excel.kt +++ b/src/main/kotlin/com/restapi/controllers/Excel.kt @@ -358,7 +358,8 @@ fun exportIncomingInventory(tickets: List) { val headers: List = listOf( "MRN", - "Date", + "Inward Date", + "Entry Date", "Vendor Name", "Vendor Bill Number", "Vendor Bill Amount", @@ -383,6 +384,7 @@ fun exportIncomingInventory(tickets: List) { var i = 0 row.createCell(i++).setCellValue(ticket.mrn) row.createCell(i++).setCellValue(ticket.date?.format(DateTimeFormatter.ofPattern("dd/MM/yyyy ")) ?: "") + row.createCell(i++).setCellValue(ticket.createdAt?.format(DateTimeFormatter.ofPattern("dd/MM/yyyy ")) ?: "") row.createCell(i++).setCellValue(ticket.vendor?.name) row.createCell(i++).setCellValue(ticket.vendorBillNum) row.createCell(i++).setCellValue(ticket.vendorBillAmount) @@ -416,7 +418,8 @@ fun exportOutgoingInventory(tickets: List) { val headers: List = listOf( "Plant", "MDN", - "Date", + "Outward Date", + "Entry Date", "Out Mode", "Purpose", "Person", @@ -437,6 +440,7 @@ fun exportOutgoingInventory(tickets: List) { row.createCell(i++).setCellValue(ticket.unloading) row.createCell(i++).setCellValue(ticket.mdn) row.createCell(i++).setCellValue(ticket.date?.format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) ?: "") + row.createCell(i++).setCellValue(ticket.createdAt?.format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) ?: "") row.createCell(i++).setCellValue(ticket.outMode?.name ?: "") row.createCell(i++).setCellValue(ticket.purpose) row.createCell(i++).setCellValue(ticket.person)