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

add vendor po fix and edits

Browse Source
This commit is contained in:
gowthaman
2024-05-31 16:47:45 +05:30
parent 444648178a
commit a9961027d1
5 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@ data class CommonFilters(
interface CustomFilters {}
data class POFilters(
val poNumLike: String = IGNORE,
val poNumLike: String = "",
val totalAmountExceeds: Long = Long.MIN_VALUE,
val totalAmountLessThan: Long = Long.MAX_VALUE,
val validAfter: LocalDate = baseDate,
@@ -134,7 +134,7 @@ fun <T> applySortHelper(q: io.ebean.ExpressionList<T>, sortBy: String, asc: Bool
fun <T> applyFromToHelper(q: io.ebean.ExpressionList<T>, fromDate: LocalDate, toDate: LocalDate, colName: String) {
q.ge(colName, fromDate)
.le(colName, toDate)
.lt(colName, toDate.plusDays(1))
}
fun <T> applyCommonFilters(q: io.ebean.ExpressionList<T>, commonFilters: CommonFilters) {
@@ -161,12 +161,8 @@ fun searchQuotes(commonFilters: CommonFilters, quoteFilters: QuoteFilters): List
fun searchVendors(commonFilters: CommonFilters, vendorFilters: VendorFilters): List<Vendor> {
val q = database.find(Vendor::class.java)
.where()
.ge("rating", vendorFilters.ratingExceeds)
.le("rating", vendorFilters.ratingLessThan)
.ilike("name", "%" + vendorFilters.nameLike + "%")
.ilike("msme", "%" + vendorFilters.msmeLike + "%")
.ilike("gstNumber", "%" + vendorFilters.gstNumLike + "%")
.ilike("address", "%" + vendorFilters.addressLike + "%")
applySortHelper(q, commonFilters.sortBy, commonFilters.sortAsc)
return q.findList()
}
@@ -208,8 +204,11 @@ fun searchPos(commonFilters: CommonFilters, poFilters0: POFilters?): List<Purcha
val poFilters = poFilters0 ?: POFilters()
val q = database.find(PurchaseOrder::class.java)
.where()
.ilike("poNum", "%" + poFilters.poNumLike + "%")
.ilike("referenceQuotation", "%" + poFilters.refQuotation + "%")
.apply {
if (poFilters.poNumLike.isNotEmpty()) {
ilike("poNum", "%" + poFilters.poNumLike + "%")
}
}
applyFromToHelper(q, commonFilters.from, commonFilters.to, "poDate")
applyVendorHelper(q, commonFilters.vendor)
applySortHelper(q, commonFilters.sortBy, commonFilters.sortAsc)

11
src/main/kotlin/com/restapi/domain/Vendors.kt
View File

@@ -66,11 +66,14 @@ open class PurchaseOrder : BaseTenantModel() {
this.vendor = updatedPo.vendor
this.documents = updatedPo.documents
this.totalAmount = updatedPo.totalAmount
this.allLoadingSite = updatedPo.allLoadingSite
this.allUnloadingSite = updatedPo.allUnloadingSite
this.unloadingPlantId = updatedPo.unloadingPlantId
this.loadingSiteId = updatedPo.loadingSiteId
}
@DbJsonB
var products: MutableList<POProducts> = mutableListOf()
@ManyToOne
var vendor: Vendor? = null
var referenceQuotation: String? = ""
@@ -79,6 +82,12 @@ open class PurchaseOrder : BaseTenantModel() {
var poDate: LocalDate? = null
var validTill: LocalDate? = null
var allLoadingSite: Boolean = true
var allUnloadingSite: Boolean = true
var unloadingPlantId: String? = null
var loadingSiteId: UUID? = null
@DbArray
var tnc: List<String>? = arrayListOf()