From c94cebdd133ae5accba04600c13c2109dfdb3f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=80=E1=85=B5=E1=86=B7=E1=84=86=E1=85=B5=E1=86=AB?=
 =?UTF-8?q?=E1=84=80=E1=85=AE?= <mcutegs2@me.com>
Date: Tue, 23 Jan 2024 21:30:32 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9E=85=EA=B3=A0=EC=98=88=EC=A0=95=20?=
 =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EA=B2=80=EC=83=89=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/no1/wms/planin/PlanInController.java     |  6 ++----
 .../java/com/no1/wms/planin/PlanInService.java   |  4 +---
 src/main/resources/mappers/PlainInMapper.xml     |  5 +++--
 src/main/webapp/WEB-INF/views/planin/list.jsp    | 16 +++++++++++++---
 4 files changed, 19 insertions(+), 12 deletions(-)

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<PlanInDto> list = planinservice.selectAll(searchn, search, startRow, perPage);
         HashMap<String, Integer> 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<String, Object> 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
         <where>
             <choose>
-                <when test="searchn == 1"> plan.activation = 1 and pn like concat('%',#{search},'%')</when>
-                <when test="searchn == 0"> plan.activation = 1 and plan.group_number like concat('%',#{search},'%') </when>
+                <when test="searchn == 0"> plan.activation = 1 and plan.view_group_number like concat('%',#{search},'%') </when>
+                <when test="searchn == 1"> plan.activation = 1 and product.name like concat('%',#{search},'%')</when>
+                <when test="searchn == 2"> plan.activation = 1 and plan.quantity like concat(#{search})</when>
             </choose>
         </where>
         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 @@
             </div>
             <div>
                 <hr>
-            </div>
-        </div>
-    </div>
+	        </div>
+	    </div>
+	</div>
     <div class="row">
         <div class="col-12 att">
+        	<form class="d-inline" id="search_form">
+	            <select name="searchn">
+	                <option <c:if test="${searchn == 0}">selected="selected"</c:if> value="0">그룹번호</option>
+	                <option <c:if test="${searchn == 1}">selected="selected"</c:if> value="1">제품명</option>
+                    <option <c:if test="${searchn == 2}">selected="selected"</c:if> value="2">수량</option>
+	            </select>
+	            <input type="text" name="search" maxlength="50" value="${search}"/>
+	            <button type="submit" class="btn btn-primary" >검색</button>
+	            <input id="pPage" hidden type="text" name="page">
+            </form>
             <button style="float: right;"  class="btn btn-primary" type="submit" id="btn_create" onclick="goCreate() ">생성</button>
         </div>
         <div class="col-12 m-0">