diff --git a/src/main/java/com/utopiaindustries/dao/uind/ItemDAO.java b/src/main/java/com/utopiaindustries/dao/uind/ItemDAO.java index a0d9aeb..cd83385 100644 --- a/src/main/java/com/utopiaindustries/dao/uind/ItemDAO.java +++ b/src/main/java/com/utopiaindustries/dao/uind/ItemDAO.java @@ -42,7 +42,7 @@ public class ItemDAO { TABLE_NAME); private final String SELECT_BY_IDS = String.format("SELECT * FROM %s WHERE id IN (:ids)", TABLE_NAME); private final String SELECT_BY_IDS_AND_ACTIVE = String.format("SELECT * FROM %s WHERE id IN (:ids) AND is_active = 1 ", TABLE_NAME); - private final String SELECT_LIKE_TITLE_AND_STATUS_QUERY = String.format("SELECT * FROM %s WHERE is_active = :is_active AND title LIKE :title ORDER BY title ASC limit 100 offset 0", TABLE_NAME); + private final String SELECT_LIKE_TITLE_AND_STATUS_QUERY_OR_SKU = String.format("SELECT * FROM %s WHERE is_active = :is_active AND title LIKE :title OR sku LIKE :sku ORDER BY title ASC limit 100 offset 0", TABLE_NAME); private final String SELECT_LIKE_TITLE_BY_DEPARTMENT_QUERY = String.format("SELECT * FROM %s WHERE department_id = :department_id AND title LIKE :title ORDER BY title ASC", TABLE_NAME); private final String SELECT_LIKE_TITLE = String.format("SELECT * FROM %s WHERE title LIKE :item_title", TABLE_NAME); @@ -232,11 +232,12 @@ public class ItemDAO { } // find all like title (active only) - public List findLikeTitleAndStatus(String title, boolean active) { + public List findLikeTitleAndStatusORSKU(String title, boolean active) { MapSqlParameterSource params = new MapSqlParameterSource(); params.addValue("title", "%" + title + "%"); params.addValue("is_active", active); - return namedParameterJdbcTemplate.query(SELECT_LIKE_TITLE_AND_STATUS_QUERY, params, new ItemRowMapper()); + params.addValue("sku", "%" + title + "%"); + return namedParameterJdbcTemplate.query(SELECT_LIKE_TITLE_AND_STATUS_QUERY_OR_SKU, params, new ItemRowMapper()); } // find all like title and department diff --git a/src/main/java/com/utopiaindustries/restcontroller/ItemRestController.java b/src/main/java/com/utopiaindustries/restcontroller/ItemRestController.java index a693a75..0bc88bb 100644 --- a/src/main/java/com/utopiaindustries/restcontroller/ItemRestController.java +++ b/src/main/java/com/utopiaindustries/restcontroller/ItemRestController.java @@ -31,7 +31,7 @@ public class ItemRestController { items = itemDAO.findBySkuOrTitleAndTypeIdAndActive(term, Arrays.stream(typeIds).collect(Collectors.toList()), "1" ); } else { // else return all results - items = itemDAO.findLikeTitleAndStatus(term, true ); + items = itemDAO.findLikeTitleAndStatusORSKU(term, true ); } return items; } diff --git a/src/main/resources/static/js/vue-components.js b/src/main/resources/static/js/vue-components.js index 7adb546..a1c4a29 100644 --- a/src/main/resources/static/js/vue-components.js +++ b/src/main/resources/static/js/vue-components.js @@ -1151,7 +1151,7 @@ if ( typeof Vue !== 'undefined' ) { } // else format item title with code if ( typeof item.code !== 'undefined' ) { - return `${item.title} (${item.code})`; + return `${item.title} (${item.sku}) (${item.code})`; } // item title only return item.title;