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