diff --git a/src/main/java/com/divudi/bean/common/SearchController.java b/src/main/java/com/divudi/bean/common/SearchController.java index e3e5634b3b..e166ce36e6 100644 --- a/src/main/java/com/divudi/bean/common/SearchController.java +++ b/src/main/java/com/divudi/bean/common/SearchController.java @@ -4179,6 +4179,12 @@ private String createKeySqlSearchForPoCancel(HashMap tmp) { private String createKeySql(HashMap tmp) { String sql = ""; + + if (getSearchKeyword().getRequestNo()!= null && !getSearchKeyword().getRequestNo().trim().equals("")) { + sql += " and ((b.qutationNumber) like :qutNo )"; + tmp.put("qutNo", "%" + getSearchKeyword().getRequestNo().trim().toUpperCase() + "%"); + } + if (getSearchKeyword().getToInstitution() != null && !getSearchKeyword().getToInstitution().trim().equals("")) { sql += " and ((b.toInstitution.name) like :toIns )"; tmp.put("toIns", "%" + getSearchKeyword().getToInstitution().trim().toUpperCase() + "%"); diff --git a/src/main/webapp/store/store_purhcase_order_list_to_approve.xhtml b/src/main/webapp/store/store_purhcase_order_list_to_approve.xhtml index 5c138e328e..5b8d0a20e3 100644 --- a/src/main/webapp/store/store_purhcase_order_list_to_approve.xhtml +++ b/src/main/webapp/store/store_purhcase_order_list_to_approve.xhtml @@ -63,6 +63,8 @@ class="w-100 ui-button-warning my-2"> + + @@ -82,23 +84,23 @@
- + - - - + + + + + +
- - - - - - - + + + +
@@ -119,26 +121,17 @@
- - #{b.department.name} - - + - - - - - - + + + - - + - -