Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitea0f480

Browse files
authored
OBPIH-7544 Add searchTerm to expiration history filter (#5593)
1 parentc4e31f0 commitea0f480

File tree

2 files changed

+20
-7
lines changed

2 files changed

+20
-7
lines changed

‎grails-app/services/org/pih/warehouse/inventory/InventoryService.groovy‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import grails.gorm.transactions.Transactional
1313
importgrails.plugins.csv.CSVWriter
1414
importgrails.validation.ValidationException
1515
importorg.hibernate.criterion.CriteriaSpecification
16-
16+
importorg.hibernate.sql.JoinType
1717
importorg.pih.warehouse.PaginatedList
1818
importorg.pih.warehouse.api.AvailableItem
1919
importorg.pih.warehouse.auth.AuthService
@@ -3457,13 +3457,21 @@ class InventoryService implements ApplicationContextAware {
34573457

34583458
PaginatedList<ExpirationHistoryReportRow>getExpirationHistoryReport(ExpirationHistoryReportFilterCommandcommand) {
34593459
List<TransactionEntry> entries=TransactionEntry.createCriteria().list(offset: command.paginationParams.offset,max: command.paginationParams.max) {
3460-
transaction {
3461-
// Expired transaction type is hardcoded with id = "4"
3462-
eq("transactionType",TransactionType.read(Constants.EXPIRATION_TRANSACTION_TYPE_ID))
3463-
eq("inventory",AuthService.currentLocation.inventory)
3464-
between("transactionDate", command.startDate, command.endDate)
3465-
order("transactionDate","desc")
3460+
createAlias("transaction","t",JoinType.INNER_JOIN)
3461+
if (command.searchTerm) {
3462+
createAlias("inventoryItem","ii",JoinType.INNER_JOIN)
3463+
createAlias("ii.product","p",JoinType.INNER_JOIN)
3464+
or {
3465+
ilike("t.transactionNumber","%"+ command.searchTerm+"%")
3466+
ilike("p.productCode","%"+ command.searchTerm+"%")
3467+
ilike("t.id","%"+ command.searchTerm+"%")
3468+
}
34663469
}
3470+
// Expired transaction type is hardcoded with id = "4"
3471+
eq("t.transactionType",TransactionType.read(Constants.EXPIRATION_TRANSACTION_TYPE_ID))
3472+
eq("t.inventory",AuthService.currentLocation.inventory)
3473+
between("t.transactionDate", command.startDate, command.endDate)
3474+
order("t.transactionDate","desc")
34673475
}
34683476
returnnewPaginatedList<ExpirationHistoryReportRow>(entries.collect {ExpirationHistoryReportRow.fromTransactionEntry(it) }, entries.totalCount)
34693477
}

‎src/main/groovy/org/pih/warehouse/inventory/ExpirationHistoryReportFilterCommand.groovy‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,9 @@ class ExpirationHistoryReportFilterCommand implements Validateable {
99
PaginationParams paginationParams=newPaginationParams()
1010
Date startDate
1111
Date endDate
12+
String searchTerm
13+
14+
static constraints= {
15+
searchTerm(nullable:true,blank:true)
16+
}
1217
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp