diff --git a/src/main/java/com/no1/wms/planin/PlanInController.java b/src/main/java/com/no1/wms/planin/PlanInController.java index 280b117..9eebad7 100644 --- a/src/main/java/com/no1/wms/planin/PlanInController.java +++ b/src/main/java/com/no1/wms/planin/PlanInController.java @@ -33,9 +33,9 @@ public class PlanInController { @GetMapping("/list") public ModelAndView list(ModelAndView mav,@RequestParam(defaultValue = "0") int searchn, @RequestParam(defaultValue = "") String search, @RequestParam(defaultValue = "1") int page){ - int perPage = 10; + int perPage = 15; int startRow = (page - 1) * perPage; - int count = planinservice.count(searchn, search, startRow, perPage); + int count = planinservice.count(searchn, search); @@ -44,8 +44,6 @@ public class PlanInController { - - //스톡서비스로 재고 리스트 출력 메서트 작성 List list = planinservice.selectAll(searchn, search, startRow, perPage); HashMap map = new HashMap<>(); for( int i = 0 ; i < list.size(); ++i){ diff --git a/src/main/java/com/no1/wms/planin/PlanInService.java b/src/main/java/com/no1/wms/planin/PlanInService.java index 2431a51..b816bab 100644 --- a/src/main/java/com/no1/wms/planin/PlanInService.java +++ b/src/main/java/com/no1/wms/planin/PlanInService.java @@ -21,12 +21,10 @@ public class PlanInService { } - int count(int searchn, String search, int start, int perPage){ + int count(int searchn, String search){ HashMap m = new HashMap<>(); m.put("searchn", searchn); m.put("search", search); - m.put("start", start); - m.put("perPage", perPage); return mapper.count(m); } diff --git a/src/main/resources/mappers/PlainInMapper.xml b/src/main/resources/mappers/PlainInMapper.xml index 3e41af4..4ddb5d2 100644 --- a/src/main/resources/mappers/PlainInMapper.xml +++ b/src/main/resources/mappers/PlainInMapper.xml @@ -66,8 +66,9 @@ and plan.warehouse_id = warehouse.id and product.kan_code = product_category.kan_code - plan.activation = 1 and pn like concat('%',#{search},'%') - plan.activation = 1 and plan.group_number like concat('%',#{search},'%') + plan.activation = 1 and plan.view_group_number like concat('%',#{search},'%') + plan.activation = 1 and product.name like concat('%',#{search},'%') + plan.activation = 1 and plan.quantity like concat(#{search}) order by plan.view_group_number desc limit #{start}, #{perPage} diff --git a/src/main/webapp/WEB-INF/views/planin/list.jsp b/src/main/webapp/WEB-INF/views/planin/list.jsp index 4ceb2a0..46b7e05 100644 --- a/src/main/webapp/WEB-INF/views/planin/list.jsp +++ b/src/main/webapp/WEB-INF/views/planin/list.jsp @@ -41,11 +41,21 @@

-
- - + + +
+
+ + + + +