diff --git a/src/main/java/com/no1/wms/base/MainPageController.java b/src/main/java/com/no1/wms/base/MainPageController.java index 2120bcd..e7afc6b 100644 --- a/src/main/java/com/no1/wms/base/MainPageController.java +++ b/src/main/java/com/no1/wms/base/MainPageController.java @@ -1,5 +1,7 @@ package com.no1.wms.base; +import com.no1.wms.in.InDto; +import com.no1.wms.in.InService; import com.no1.wms.stock.StockService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -7,6 +9,8 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import java.util.Map; @@ -15,7 +19,10 @@ public class MainPageController { @Autowired StockService service; - + + @Autowired + InService inService; + @GetMapping("/main") public String mainPage(@RequestParam(name = "searchn2", defaultValue = "0") int searchn2, @RequestParam(name = "search2", defaultValue = "") String search2, @@ -27,6 +34,15 @@ public class MainPageController { List> dto2 = service.list2(searchn2, search2, startRow2 ,perPage2); m.addAttribute("slist2", dto2); System.out.println("리스트 확인 : : " + dto2); + + + Date today = new Date(); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String formattedDate = dateFormat.format(today); + + List dto = inService.inListMain(formattedDate); + m.addAttribute("inDto", dto); + return "base/main"; } } diff --git a/src/main/java/com/no1/wms/in/InMapper.java b/src/main/java/com/no1/wms/in/InMapper.java index e204958..b1290b9 100644 --- a/src/main/java/com/no1/wms/in/InMapper.java +++ b/src/main/java/com/no1/wms/in/InMapper.java @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface InMapper { List inList(Map m); + List inListMain(Map m); int count(Map m); int createProcess(InDto dto); int createProcess2(InDto dto); @@ -22,4 +23,6 @@ public interface InMapper { int deactivateById(String id); String selectWarehouseQuantity(String warehouseId); int updateWarehouseQuantity(Map m); + + } diff --git a/src/main/java/com/no1/wms/in/InService.java b/src/main/java/com/no1/wms/in/InService.java index 0540d73..558bdcd 100644 --- a/src/main/java/com/no1/wms/in/InService.java +++ b/src/main/java/com/no1/wms/in/InService.java @@ -1,5 +1,6 @@ package com.no1.wms.in; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -22,6 +23,12 @@ public class InService { return mapper.inList(m); } + + public List inListMain(String today){//메인페이지에서 활용 + Map m = new HashMap(); + m.put("today",today); + return mapper.inListMain(m); + } public int count(int searchn, String search) { Map m = new HashMap(); diff --git a/src/main/java/com/no1/wms/planin/PlanInController.java b/src/main/java/com/no1/wms/planin/PlanInController.java index 9eebad7..6c8a7fd 100644 --- a/src/main/java/com/no1/wms/planin/PlanInController.java +++ b/src/main/java/com/no1/wms/planin/PlanInController.java @@ -33,10 +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 = 15; + int perPage = 10; int startRow = (page - 1) * perPage; - int count = planinservice.count(searchn, search); - + int count = planinservice.count(searchn, search, startRow, perPage); int pageNum = 4;//보여질 페이지 번호 수 diff --git a/src/main/java/com/no1/wms/planin/PlanInService.java b/src/main/java/com/no1/wms/planin/PlanInService.java index b816bab..b8eb2b0 100644 --- a/src/main/java/com/no1/wms/planin/PlanInService.java +++ b/src/main/java/com/no1/wms/planin/PlanInService.java @@ -20,11 +20,13 @@ public class PlanInService { return mapper.selectAll(map); } - - int count(int searchn, String search){ + int count(int searchn, String search, int start, int perPage){ + System.out.printf("searchn : %d, search : %s, start : %d, perpage : %d", searchn, search, start, perPage); HashMap m = new HashMap<>(); m.put("searchn", searchn); m.put("search", search); + m.put("start", start); + m.put("perPage", perPage); return mapper.count(m); } @@ -47,7 +49,4 @@ public class PlanInService { return mapper.selectByQRHash(qrHash); } - - - } diff --git a/src/main/resources/mappers/InMapper.xml b/src/main/resources/mappers/InMapper.xml index 1637777..2c15a48 100644 --- a/src/main/resources/mappers/InMapper.xml +++ b/src/main/resources/mappers/InMapper.xml @@ -139,6 +139,26 @@ ORDER BY proin.in_date desc LIMIT #{start} , #{perPage} + + + + select count(*) from ( SELECT 1 from plan_In i join product p - + + i.product_id = p.id and i.activation = 1 and i.view_group_number like concat('%',#{search},'%') i.product_id = p.id and i.activation = 1 and p.name like concat('%',#{search},'%') - i.product_id = p.id and i.activation = 1 and i.group_number like concat('%',#{search},'%') + i.product_id = p.id and i.activation = 1 and i.quantity like concat(#{search}) ) t diff --git a/src/main/webapp/WEB-INF/views/base/main.jsp b/src/main/webapp/WEB-INF/views/base/main.jsp index d1ef02c..45b63ac 100644 --- a/src/main/webapp/WEB-INF/views/base/main.jsp +++ b/src/main/webapp/WEB-INF/views/base/main.jsp @@ -1,5 +1,6 @@ -<%@ page contentType="text/html; charset=UTF-8" %>3 +<%@ page contentType="text/html; charset=UTF-8" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + @@ -55,8 +56,41 @@
- -
네 번째 공간
+ + +
+
+
오늘의 입고
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
번호제품명입고예정그룹번호수량창고
${status.count }${dto.productDto.name }${dto.planInDto.viewGroupNumber}${dto.quantity }${dto.warehouseDto.name}
+
+
@@ -78,9 +112,9 @@ center: 'title', right: 'dayGridMonth,timeGridWeek,timeGridDay,listMonth' }, - googleCalendarApiKey: 'AIzaSyBKWDNnFEMpuNCPubU3pkkmB1F6XLX_bSo', + googleCalendarApiKey: '', events: { - googleCalendarId: '7a3e7ae86281b8e995e4db0402865fb947ceb73c7d633f3a629a0068ac0ca66c@group.calendar.google.com', + googleCalendarId: '@group.calendar.google.com', className: 'gcal-event' // an option! }, eventClick: function (info) { @@ -145,6 +179,23 @@ form.submit(); }); + $("body").on("click", ".detailTr2", function () { + var id = $(this).data("id"); + + var form = document.createElement("form"); + form.action = "/in/read"; + form.method = "POST"; + document.body.appendChild(form); + + var input = document.createElement("input"); + input.type = "hidden"; + input.name = "id"; + input.value = id; + form.appendChild(input); + + form.submit(); + + }); }); diff --git a/src/main/webapp/WEB-INF/views/planin/list.jsp b/src/main/webapp/WEB-INF/views/planin/list.jsp index 46b7e05..ab60438 100644 --- a/src/main/webapp/WEB-INF/views/planin/list.jsp +++ b/src/main/webapp/WEB-INF/views/planin/list.jsp @@ -31,6 +31,14 @@ $form.trigger("submit"); } + + function onPaging(target){ + const p = $(target).data("p"); + $("#pPage").val(p); + const $form = $("#search_form"); + $form.attr("action", "/plan_in/list"); + $form.trigger("submit"); + }
@@ -77,6 +85,23 @@
+
+
+
+ +
+
+