입고예정 상세페이지 구현 중

src/main/java/com/no1/wms/planin/PlanInController.java

@@ -60,7 +60,6 @@ public class PlanInController {
         mav.addObject("list", list);
 
         mav.setViewName("planin/read");
-
         return mav;
     }
 	

src/main/java/com/no1/wms/planin/PlanInDto.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.type.Alias;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import com.no1.wms.account.AccountDto;
+import com.no1.wms.category.CategoryDto;
 import com.no1.wms.product.ProductDto;
 import com.no1.wms.vendor.VendorDto;
 import com.no1.wms.warehouse.WarehouseDto;
@@ -38,6 +39,7 @@ public class PlanInDto {
 	private Boolean activation;
 	private Integer viewGroupNumber;
 	private String oldProductId;
+	private String cName;
 	
 	private ProductDto productDto;
 	private VendorDto vendorDto;

src/main/java/com/no1/wms/planin/PlanInService.java

@@ -17,9 +17,6 @@ public class PlanInService {
         map.put("start", start);
         map.put("perPage", perPage);
         map.put("searchn", searchn);
-
-
-
         return mapper.selectAll(map);
     }
 	

src/main/resources/mappers/PlainInMapper.xml

@@ -17,6 +17,7 @@
         <result column="other" property="other" />
         <result column="activation" property="activation" />
         <result column="view_group_number" property="viewGroupNumber" />
+        <result column="c_name" property="cName" />
         <association property="productDto"  javaType="productDto">
             <id column="p_id" property="id" />
             <result column="p_name" property="name" />
@@ -38,20 +39,22 @@
         SELECT
             plan.group_number, plan.product_id, plan.quantity, plan.date, plan.vendor_id, plan.manager_id,
             plan.warehouse_id, plan.qr_hash, plan.url, plan.clear, plan.vendor_date, plan.other, plan.activation, plan.view_group_number,
-            product.id p_id, product.name p_name, acc.id acc_id, acc.name acc_name, vendor.id v_id, vendor.name v_name, warehouse.id w_id, warehouse.name w_name
-        from plan_In plan join account acc join vendor join warehouse join product
+            product.id p_id, product.name p_name, acc.id acc_id, acc.name acc_name, vendor.id v_id, vendor.name v_name, 
+            warehouse.id w_id, warehouse.name w_name, product_category.kan_code p_kan, product_category.cls_Nm_4 c_name
+        from plan_In plan join account acc join vendor join warehouse join product join product_category
                     on plan.product_id = product.id and plan.vendor_id = vendor.id and plan.manager_id = acc.id
-                        and plan.warehouse_id = warehouse.id
+                        and plan.warehouse_id = warehouse.id and product.kan_code = product_category.kan_code 
         where plan.group_number = #{groupNumber}
     </select>
     <select id="selectAll" resultMap="planInResultMap" parameterType="map">
         SELECT
-        plan.group_number, plan.product_id, plan.quantity, plan.date, plan.vendor_id, plan.manager_id,
-        plan.warehouse_id, plan.qr_hash, plan.url, plan.clear, plan.vendor_date, plan.other, plan.activation, plan.view_group_number,
-        product.id p_id, product.name p_name, acc.id acc_id, acc.name acc_name, vendor.id v_id, vendor.name v_name, warehouse.id w_id, warehouse.name w_name
-        from plan_In plan join account acc join vendor join warehouse join product
-        on plan.product_id = product.id and plan.vendor_id = vendor.id and plan.manager_id = acc.id
-        and plan.warehouse_id = warehouse.id
+            plan.group_number, plan.product_id, plan.quantity, plan.date, plan.vendor_id, plan.manager_id,
+            plan.warehouse_id, plan.qr_hash, plan.url, plan.clear, plan.vendor_date, plan.other, plan.activation, plan.view_group_number,
+            product.id p_id, product.name p_name, acc.id acc_id, acc.name acc_name, vendor.id v_id, vendor.name v_name, 
+            warehouse.id w_id, warehouse.name w_name, product_category.kan_code p_kan, product_category.cls_Nm_4 c_name
+            from plan_In plan join account acc join vendor join warehouse join product join product_category
+                on plan.product_id = product.id and plan.vendor_id = vendor.id and plan.manager_id = acc.id
+                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>

src/main/webapp/WEB-INF/views/planin/list.jsp

@@ -1,5 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <!-- 이 안에 내용 복사해서 jsp에 붙여넣기 -->
 <link rel="stylesheet" href="/resources/static/css/account.css">
 <script>

src/main/webapp/WEB-INF/views/planin/read.jsp

@@ -1,5 +1,78 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<c:forEach items="${list }" var="dto" varStatus="status">
-    ${dto.productDto.name}<br>
-</c:forEach>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+
+<script>
+	<c:forEach items="${list }" var="dto" varStatus="status">
+	    ${dto.productDto.name}<br>
+	</c:forEach>
+</script>
+
+<div class="container">
+    <div class="row">
+        <div class="col-12">
+            <div class="mt-5 mb-5 text-center">
+                <h1>입고 예정 상세페이지</h1>
+            </div>
+            <div>
+                <hr>
+            </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>
+            </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="row p-0 m-0">
+            <div class="col-12 m-0">
+                <table class="table" >
+                    <thead class="table-dark">
+                    <tr><th>제품 카테고리</th><th>제품명</th><th>수량</th><th>공급업체</th><th>날짜</th><th>수정/삭제</th></tr>
+                    </thead>
+                    <tbody>
+                        <c:forEach items="${list }" var="dto" varStatus="status">
+                        <tr class="group_tr"  data-groupn="${dto.groupNumber}" data-productid="${dto.productId}">
+                            <td>${dto.cName}</td>
+                            <td>${dto.productDto.name}</td>
+                            <td>${dto.quantity}</td>
+                            <td>${dto.vendorDto.name}</td>
+                            <td><fmt:formatDate value="${dto.date}" pattern="yyyy-MM-dd" type="date"/></td>
+                            <td><button type="submit" class="btn btn-update" >수정</button><button type="submit" class="btn btn-delete" >삭제</button><td>
+                        </tr>
+                    </c:forEach>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-12">
+                <div id="page">
+                    <ul class="pagination justify-content-center">
+                    <c:if test="${begin > pageNum }">
+                        <li class="page-item"><a class="page-link" data-p='${begin-1 }' href="#" onclick="onPaging(this)">[<]</a></li>
+                    </c:if>
+                    <c:forEach begin="${begin }" end="${end}" var="i" varStatus="status">
+                        <li class="page-item <c:if test="${page eq status.count}">active</c:if> "><a class="page-link"  data-p='${i}' href="#" onclick="onPaging(this)" >${i}</a></li>
+                    </c:forEach>
+                    <c:if test="${end < totalPages }">
+                        <li class="page-item"><a class="page-link" data-p='${end+1}' href="#" onclick="onPaging(this)">[>]</a></li>
+                    </c:if>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<form id="form" action='/plan_in/read' method="post">
+    <input name="groupNumber" id="groupId" hidden>
+    <input name="productId" id="productId" hidden>
+</form>