From 0d203a880f217f7acff9487f2d9132bc80476a82 Mon Sep 17 00:00:00 2001
From: gowthaman <gowthaman.b@m2pfintech.com>
Date: Tue, 11 Jun 2024 08:30:29 +0530
Subject: [PATCH] fix excel

---
 src/main/kotlin/com/restapi/controllers/Excel.kt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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<IncomingInventory>) {
         "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<IncomingInventory>) {
             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)