From 062365ed5192ef4d3554b7c296b323f9f5078133 Mon Sep 17 00:00:00 2001 From: gowthaman Date: Tue, 25 Jun 2024 10:38:59 +0530 Subject: [PATCH] partial issue of job card --- src/main/kotlin/com/restapi/controllers/Filters.kt | 6 ++++-- src/main/kotlin/com/restapi/domain/models.kt | 3 ++- src/main/resources/logback.xml | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/com/restapi/controllers/Filters.kt b/src/main/kotlin/com/restapi/controllers/Filters.kt index a063955..b79f479 100644 --- a/src/main/kotlin/com/restapi/controllers/Filters.kt +++ b/src/main/kotlin/com/restapi/controllers/Filters.kt @@ -244,13 +244,15 @@ fun searchOutgoingInventory( ): List { val q = database.find(OutgoingInventory::class.java) .where() - .ilike("mdn", "%" + outgoingInventoryFilters.mdnLike + "%") - .ilike("purpose", "%" + outgoingInventoryFilters.purposeLike + "%") + // .ilike("mdn", "%" + outgoingInventoryFilters.mdnLike + "%") + // .ilike("purpose", "%" + outgoingInventoryFilters.purposeLike + "%") // .ilike("person", "%" + outgoingInventoryFilters.personLike + "%") //.ilike("vehicle", "%" + outgoingInventoryFilters.vehicleLike + "%") if (outgoingInventoryFilters.outMode != OutMode.ALL) { q.eq("outMode", outgoingInventoryFilters.outMode) } + applyPlantFilter(q, commonFilters.plant) + applyFromToHelper(q, commonFilters.from, commonFilters.to, "date") applySortHelper(q, commonFilters.sortBy, commonFilters.sortAsc) diff --git a/src/main/kotlin/com/restapi/domain/models.kt b/src/main/kotlin/com/restapi/domain/models.kt index 12c875a..b72828f 100644 --- a/src/main/kotlin/com/restapi/domain/models.kt +++ b/src/main/kotlin/com/restapi/domain/models.kt @@ -27,7 +27,8 @@ data class POProducts( val totalValue: Double = 0.0, val description: String = "", val uom: String = "", - val poId: Long? = null + val poId: Long? = null, + val isAvailable: Boolean? = false ) diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index a1b4376..c338f0b 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -21,7 +21,7 @@ - +