diff --git a/src/main/kotlin/com/restapi/controllers/Excel.kt b/src/main/kotlin/com/restapi/controllers/Excel.kt index 068e78c..3ea741a 100644 --- a/src/main/kotlin/com/restapi/controllers/Excel.kt +++ b/src/main/kotlin/com/restapi/controllers/Excel.kt @@ -333,12 +333,11 @@ fun exportIncomingInventory(tickets: List) { "MRN", "Date", "Vendor Name", + "Vendor Bill Number", + "Vendor Bill Amount", "Vehicle No", "Loading Site", "Unloading Site", - "Vendor Bill Number", - "Vendor Bill Amount", - "Product Id", "Product Name", "Unit Price", "Quantity", @@ -356,13 +355,12 @@ fun exportIncomingInventory(tickets: List) { row.createCell(i++).setCellValue(ticket.date) row.createCell(i++).setCellValue(ticket.vendor?.name) row.createCell(i++).setCellValue(ticket.vendorBillNum) + row.createCell(i++).setCellValue(ticket.vendorBillAmount) row.createCell(i++).setCellValue(ticket.vehicle) row.createCell(i++).setCellValue(ticket.loading) row.createCell(i++).setCellValue(ticket.unloading) - row.createCell(i++).setCellValue(ticket.vendorBillAmount) //6 would be repeated - row.createCell(i++).setCellValue(ticket.products!![j].productId.toString()) row.createCell(i++).setCellValue(ticket.products!![j].productName) row.createCell(i++).setCellValue(ticket.products!![j].unitPrice) row.createCell(i++).setCellValue(ticket.products!![j].quantity)