diff --git a/src/main/java/com/no1/wms/warehouse/WarehouseController.java b/src/main/java/com/no1/wms/warehouse/WarehouseController.java index 653621c..c5edbab 100644 --- a/src/main/java/com/no1/wms/warehouse/WarehouseController.java +++ b/src/main/java/com/no1/wms/warehouse/WarehouseController.java @@ -24,7 +24,7 @@ public class WarehouseController { int count = service.count(searchn, search); - int perPage = 5; // 한 페이지에 보일 글의 갯수 + int perPage = 10; // 한 페이지에 보일 글의 갯수 int startRow = (page - 1) * perPage; //스톡서비스로 재고 리스트 출력 메서트 작성 @@ -97,10 +97,10 @@ public class WarehouseController { // 수정 - 폼 - @GetMapping("/warehouse/update/{id}") - public String update(@PathVariable String id, Model m) { + @PostMapping("/warehouse/update") + public String update(String id, Model m) { WarehouseDto dto = service.One(id); - m.addAttribute("One", dto); + m.addAttribute("dto", dto); return "warehouse/update"; } @@ -108,9 +108,14 @@ public class WarehouseController { // 수정 프로세스 @PutMapping("/warehouse/update_process") @ResponseBody - public String updateProcess(WarehouseDto dto) { - service.updateWarehouse(dto); - return "redirect:list"; + public boolean updateProcess(WarehouseDto dto) { + + int i = service.updateWarehouse(dto); + if (i == 1) { + return true; + } else { + return false; + } } diff --git a/src/main/resources/mappers/WarehouseMapper.xml b/src/main/resources/mappers/WarehouseMapper.xml index d120d74..3988987 100644 --- a/src/main/resources/mappers/WarehouseMapper.xml +++ b/src/main/resources/mappers/WarehouseMapper.xml @@ -20,7 +20,7 @@ select p.name, s.quantity, w.id + from warehouse w LEFT JOIN stock s ON w.id = s.warehouse_id LEFT JOIN product p ON s.product_id = p.id - w.id = #{id} and w.activation = 1 and p.name like concat('%',#{search},'%') - w.id = #{id} and w.activation = 1 and s.quantity like concat('%',#{search},'%') + w.activation = 1 and p.name like concat('%',#{search},'%') + w.activation = 1 and s.quantity like concat('%',#{search},'%') - + @@ -60,14 +61,14 @@ - w.id = #{id} and w.activation = 1 and p.name like concat('%',#{search},'%') - w.id = #{id} and w.activation = 1 and s.quantity like concat('%',#{search},'%') + w.activation = 1 and p.name like concat('%',#{search},'%') + w.activation = 1 and s.quantity like concat('%',#{search},'%') + + +
창고명
-
- +
- +
@@ -109,14 +115,7 @@ $(document).ready(function () { - //POST방식으로 create폼화면 출력 - $("#createButton").on("click", function () { - var form = document.createElement("form"); - form.action = "/warehouse/create"; - form.method = "POST"; - document.body.appendChild(form); - form.submit(); - }); + $("body").on("click", ".detailTr", function () { var id = $(this).data("id"); @@ -135,7 +134,70 @@ form.submit(); }); + //검색기능 + $("#searchBtn").on("click",function(){ + + var searchn = $("#searchn").val(); + var search = $("#search").val(); + + var form = document.createElement("form"); + form.action = "/warehouse/list"; + form.method = "get"; + + var input1 = document.createElement("input"); + input1.type = "hidden"; + input1.name = "searchn"; + input1.value = searchn; + form.appendChild(input1); + + var input2 = document.createElement("input"); + input2.type = "hidden"; + input2.name = "search"; + input2.value = search; + form.appendChild(input2); + + var input3 = document.createElement("input"); + input3.type = "hidden"; + input3.name = "p"; + input3.value = 1; + form.appendChild(input3); + + document.body.appendChild(form); + form.submit(); + + }); + });//ready + + function pageingFunction(clickedId){ + var searchn1 = $("#searchn1").val(); + var search1 = $("#search1").val(); + + var form = document.createElement("form"); + form.action = "/warehouse/list"; + form.method = "get"; + + var input1 = document.createElement("input"); + input1.type = "hidden"; + input1.name = "searchn"; + input1.value = searchn1; + form.appendChild(input1); + + var input2 = document.createElement("input"); + input2.type = "hidden"; + input2.name = "search"; + input2.value = search1; + form.appendChild(input2); + + var input3 = document.createElement("input"); + input3.type = "hidden"; + input3.name = "p"; + input3.value = clickedId; + form.appendChild(input3); + + document.body.appendChild(form); + form.submit(); + } \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/warehouse/read.jsp b/src/main/webapp/WEB-INF/views/warehouse/read.jsp index 5ff4559..57e36ae 100644 --- a/src/main/webapp/WEB-INF/views/warehouse/read.jsp +++ b/src/main/webapp/WEB-INF/views/warehouse/read.jsp @@ -24,50 +24,51 @@

-
-
-
-
- 창고명 - -
- -
- 용적 - -
- -
- 적재량 - -
- +
+
+
+ 창고명 +
+ +
+ 용적 + +
+ +
+ 적재량 + +
+
-
-
-
+
+
+
+
+
-