From bbb8ae36b533813873586fec4a63b91d30200ab3 Mon Sep 17 00:00:00 2001 From: gowthaman Date: Fri, 12 Jul 2024 09:46:52 +0530 Subject: [PATCH] add po to download of inward and fix date format --- app-sample.yaml | 2 +- app_conf.yaml | 61 ------------------- .../kotlin/com/restapi/controllers/Excel.kt | 25 ++++++-- 3 files changed, 20 insertions(+), 68 deletions(-) delete mode 100644 app_conf.yaml diff --git a/app-sample.yaml b/app-sample.yaml index 003a25b..73fbb9f 100644 --- a/app-sample.yaml +++ b/app-sample.yaml @@ -1,4 +1,4 @@ -#DO Not edit this file, copy to your HOME Directory and then rename it to app.yaml and then edit it +#DO Not edit this file, copy to your HOME or Current Directory and then rename it to app.yaml and then edit it app: db: pass: postgres diff --git a/app_conf.yaml b/app_conf.yaml deleted file mode 100644 index 72c1c97..0000000 --- a/app_conf.yaml +++ /dev/null @@ -1,61 +0,0 @@ -#DO Not edit this file, copy to your HOME Directory and then rename it to app.yaml and then edit it -app: - db: - pass: password - url: jdbc:postgresql://10.10.10.211/arsalan_rmc_module_app - user: arsalan - name: arsalan_rmc_module_app - run_migration: 'true' - cors: - enabled: 'true' - hosts: www.readymixerp.com,app.readymixerp.com - port: '9001' - cache: - redis_uri: redis://10.10.10.112:6379/ - iam: - url: https://auth.readymixerp.com - realm: rmc-dev - client_redirect_uri: http://localhost:9001/auth/code - client: rmc - scripts: - path: /Users/gowthaman.b/IdeaProjects/rmc_modules_api/src/main/resources/scripts - security: - private_key: |- - -----BEGIN PRIVATE KEY----- - MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD4ba8OhlyB9MUx - MFmT8c9sOKqXOG6ZM6qLxr5SnY1au47rYsHXt8Hb+tTUxpkf+5bndaZYGVgQ1mtw - eEVj3qZq9A+FnxxwZ9uIIdbOUPvsZLzNYnK3bFFRsmWMf30gDs6ZdS63b2tnXXE0 - aoItwVguElUKVXKUymS0VlBB0ZLCYTlD6Q4sDm7HGXJZj5kVNVbBCBe42yLx8Y1F - TyNL8nPSS+SAdLUaPJ/6j+741+exAIOc0rSBJOMF0XNOwBZ85EuOiPa0e1sUz0qj - VfmZyeRFxkSWJBnqum1jrVFp55bMb37DYtZa0aFIcPdDfY42frDlPLcI4zzRwCn3 - ggHL/nL9AgMBAAECggEAJ85sxu8zl8/l4EsG3M8EdVWidrGgUyRgDElFCiLcWVta - prqVJIt5YNYRJU5J5Jc2fRGxHPEOrJVW84IUsvskVQM/ZiHyd3ZvdaGKdFZYpO5t - VvGSlR53l0IhGxal24L+isCn7X+ec5pu6b8JQJX4RbBConHCTDdz/yDMzQcXiiqj - ezzSovZ1Xy/2dn7sOTFtEZi47d3AhBnjh8Xqk3Dc9UChooxuIU6WEbqWFxEkbzJS - sXIv9xADVDqFqjHGv6Tk1W+y7y8M2EHosJfhO0LmWFL7nUdw0WSJV+UqQxHrUSJs - SnYHkKRTYl2ljpjkuECp/YqUqdlNq/5T5jBE6cyopwKBgQD6+XGZfssdAqfnaEK2 - nHdUAdklUFAFQpSmwIUwTZEHDC/CD+ErVjfbEfZ2mFOvWAIMwLmiLFuDT7E5sHaT - K4A2DQ8KyU3iJkH4nhxdYepLc7MSYElkn6fHNrXcJ9vPACmrtoa9rVW/LpAjsRq6 - fDxLo12/+EmFvpZ0oEAIQXk6ZwKBgQD9ZzBgPapI8m7cjcdojqq0dJ2M5Sw7Bx5n - VFOC3H4Cx0xWTdwwZ9CZQ4v/XiiHiUGzwhfkNJ2x3DdpUCkPDD8o3cFXPRW4GsjD - kv/D0kL/JJAesG9XB9yMTMBoe2yGMudDVc7SYgUI2YXhmHYkpcjSzM0DftLL2Z47 - GY1h385Q+wKBgGTRxe/Kfp+lzHtqZ7ph+pG1uFyD+dFTINIn7pkr38G8BIdpx6OY - HBIWEjMsGBoNOa2T0j6yoQSMA/7Pw6J1TCjqcAt+OJpLkh7krTJaPjuXO+163qDc - fhLKCJ5rKKLsRtEjHtedhR+q/d5IrBsUA0jDVMrkW+ytVlV9dpuaaa+rAoGASON8 - m8JBD/iEAPbbK+0VlxCQHO3ymgwDJ8+usc6AhIYVJCIDOv0xmFRAmbTYzZuihXVH - 8AFedsGUQrunA8gPBs86hMByVeGGbBMFdKsvUDqRJfK0JAGD4+tT0PnnjnZn5Qty - kTtWnWQMSYbUPNhe+pukQOQi+DXheLhx3XxF2S8CgYEAopLjGIR/xeuV7QkGJfCO - d2wEJROBPd3pbDlR4fLDO8RCw3irFYQgQd9WgGJY5KgyfjKLHkK7DMQKn+/yfUp5 - UKeesBDXATpyQQrpfoKIhhZKtYphOwvIzugtLsd5sza++sjC9RwkRmYr0rzlHdUl - vtr3fru0Bzven2MeiQnqmCM= - -----END PRIVATE KEY----- - public_key: |- - -----BEGIN PUBLIC KEY----- - MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+G2vDoZcgfTFMTBZk/HP - bDiqlzhumTOqi8a+Up2NWruO62LB17fB2/rU1MaZH/uW53WmWBlYENZrcHhFY96m - avQPhZ8ccGfbiCHWzlD77GS8zWJyt2xRUbJljH99IA7OmXUut29rZ11xNGqCLcFY - LhJVClVylMpktFZQQdGSwmE5Q+kOLA5uxxlyWY+ZFTVWwQgXuNsi8fGNRU8jS/Jz - 0kvkgHS1Gjyf+o/u+NfnsQCDnNK0gSTjBdFzTsAWfORLjoj2tHtbFM9Ko1X5mcnk - RcZEliQZ6rptY61RaeeWzG9+w2LWWtGhSHD3Q32ONn6w5Ty3COM80cAp94IBy/5y - /QIDAQAB - -----END PUBLIC KEY----- \ No newline at end of file diff --git a/src/main/kotlin/com/restapi/controllers/Excel.kt b/src/main/kotlin/com/restapi/controllers/Excel.kt index f7819b3..6d8a553 100644 --- a/src/main/kotlin/com/restapi/controllers/Excel.kt +++ b/src/main/kotlin/com/restapi/controllers/Excel.kt @@ -14,6 +14,7 @@ import java.io.FileOutputStream import java.text.SimpleDateFormat import java.time.LocalDate import java.time.ZoneId +import java.time.format.DateTimeFormatter import java.util.* import java.util.concurrent.ConcurrentHashMap @@ -367,18 +368,21 @@ fun exportIncomingInventory(tickets: List) { "Product Name", "Unit Price", "Quantity", + "PO Number", + "PO Date", ) createHeaderRow(headers, sh, wb) var rowCnt = 1 for (ticket in tickets) { - val prodCnt = ticket.products?.size + val products = ticket.products ?: continue + val prodCnt = products.size - for (j in 0..) { row.createCell(i++).setCellValue(ticket.unloading) //6 would be repeated - row.createCell(i++).setCellValue(ticket.products!![j].productName) - row.createCell(i++).setCellValue(ticket.products!![j].unitPrice) - row.createCell(i++).setCellValue(ticket.products!![j].quantity) + val poProduct = products[j] + row.createCell(i++).setCellValue(poProduct.productName) + row.createCell(i++).setCellValue(poProduct.unitPrice) + row.createCell(i++).setCellValue(poProduct.quantity) + if (poProduct.poId != null) { + val po = database.find(PurchaseOrder::class.java, poProduct.poId) + row.createCell(i++).setCellValue(po?.poNum ?: "") + row.createCell(i++).setCellValue(po?.poDate?.format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) ?: "") + } else { + row.createCell(i++).setCellValue("") + row.createCell(i++).setCellValue("") + } } } saveExcelFileLocally("IncomingInventory.xls", wb)