gowthaman/readymixerp_modules_api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add mdn/mrn filter

Browse Source
This commit is contained in:
gowthaman 2024-08-12 09:10:24 +05:30
parent dcf8d176b7
commit d7097733e0
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/kotlin/com/restapi/controllers/Filters.kt
View File

@ -2,6 +2,7 @@ package com.restapi.controllers
import com.restapi.domain.* import com.restapi.domain.*
import com.restapi.domain.Session.database import com.restapi.domain.Session.database
import io.ebean.ExpressionList
import net.jodah.expiringmap.ExpiringMap import net.jodah.expiringmap.ExpiringMap
import java.time.LocalDate import java.time.LocalDate
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
@ -210,7 +211,7 @@ fun searchPos(commonFilters: CommonFilters, poFilters0: POFilters?): List<Purcha
ilike("poNum", "%" + poFilters.poNumLike + "%") ilike("poNum", "%" + poFilters.poNumLike + "%")
} }
} }
if(poFilters.onlyActive){ if (poFilters.onlyActive) {
q.gt("validTill", LocalDate.now().minusDays(1)) q.gt("validTill", LocalDate.now().minusDays(1))
} }
applyFromToHelper(q, commonFilters.from, commonFilters.to, "poDate") applyFromToHelper(q, commonFilters.from, commonFilters.to, "poDate")
@ -239,19 +240,25 @@ fun searchIncomingInventory(
applyVendorHelper(q, commonFilters.vendor) applyVendorHelper(q, commonFilters.vendor)
applyPlantFilter(q, commonFilters.plant) applyPlantFilter(q, commonFilters.plant)
applySortHelper(q, commonFilters.sortBy, commonFilters.sortAsc) applySortHelper(q, commonFilters.sortBy, commonFilters.sortAsc)
applyInwardFilter(q, incomingInventoryFilters)
return q.findList() return q.findList()
} }
fun applyInwardFilter(q: ExpressionList<IncomingInventory>, incomingInventoryFilters: IncomingInventoryFilters) {
if (incomingInventoryFilters.mrnLike.isNotEmpty() && incomingInventoryFilters.mrnLike != "%") {
q.eq("mrn", incomingInventoryFilters.mrnLike)
}
}
fun searchOutgoingInventory( fun searchOutgoingInventory(
commonFilters: CommonFilters, commonFilters: CommonFilters,
outgoingInventoryFilters: OutgoingInventoryFilters outgoingInventoryFilters: OutgoingInventoryFilters
): List<OutgoingInventory> { ): List<OutgoingInventory> {
val q = database.find(OutgoingInventory::class.java) val q = database.find(OutgoingInventory::class.java).where()
.where()
// .ilike("mdn", "%" + outgoingInventoryFilters.mdnLike + "%") if (outgoingInventoryFilters.mdnLike.isNotEmpty() && outgoingInventoryFilters.mdnLike != "%") {
// .ilike("purpose", "%" + outgoingInventoryFilters.purposeLike + "%") q.eq("mdn", outgoingInventoryFilters.mdnLike)
// .ilike("person", "%" + outgoingInventoryFilters.personLike + "%") }
//.ilike("vehicle", "%" + outgoingInventoryFilters.vehicleLike + "%")
if (outgoingInventoryFilters.outMode != OutMode.ALL) { if (outgoingInventoryFilters.outMode != OutMode.ALL) {
q.eq("outMode", outgoingInventoryFilters.outMode) q.eq("outMode", outgoingInventoryFilters.outMode)
} }