From 9c91eb41cb0bb0f8016a0cc3dfbf8ad5504f28c7 Mon Sep 17 00:00:00 2001 From: sungsu Date: Wed, 17 Jan 2024 17:03:28 +0900 Subject: [PATCH] #update --- .../com/no1/wms/out/ProductOutController.java | 200 ++++++++++++++ .../java/com/no1/wms/out/ProductOutDto.java | 29 ++ .../com/no1/wms/out/ProductOutMapper.java | 46 ++++ .../com/no1/wms/out/ProductOutService.java | 108 ++++++++ .../ResetPasswordController.java | 45 ++- .../com/no1/wms/stock/StockController.java | 117 ++++---- .../resources/mappers/ProductOutMapper.xml | 139 ++++++++++ .../resources/mappers/ResetPasswordMapper.xml | 35 ++- src/main/resources/mappers/StockMapper.xml | 8 +- .../modal/product_category_company_search.jsp | 7 +- .../views/modal/stock_product_warehouse.jsp | 163 +++++++++++ .../warehouse_capacity_currentCapacity.jsp | 19 +- src/main/webapp/WEB-INF/views/out/create.jsp | 196 +++++++++++++ src/main/webapp/WEB-INF/views/out/list.jsp | 219 +++++++++++++++ src/main/webapp/WEB-INF/views/out/read.jsp | 260 ++++++++++++++++++ src/main/webapp/WEB-INF/views/out/update.jsp | 189 +++++++++++++ .../WEB-INF/views/resetpassword/list.jsp | 201 ++++++++++++++ 17 files changed, 1903 insertions(+), 78 deletions(-) create mode 100644 src/main/java/com/no1/wms/out/ProductOutController.java create mode 100644 src/main/java/com/no1/wms/out/ProductOutDto.java create mode 100644 src/main/java/com/no1/wms/out/ProductOutMapper.java create mode 100644 src/main/java/com/no1/wms/out/ProductOutService.java create mode 100644 src/main/resources/mappers/ProductOutMapper.xml create mode 100644 src/main/webapp/WEB-INF/views/modal/stock_product_warehouse.jsp create mode 100644 src/main/webapp/WEB-INF/views/out/create.jsp create mode 100644 src/main/webapp/WEB-INF/views/out/list.jsp create mode 100644 src/main/webapp/WEB-INF/views/out/read.jsp create mode 100644 src/main/webapp/WEB-INF/views/out/update.jsp create mode 100644 src/main/webapp/WEB-INF/views/resetpassword/list.jsp diff --git a/src/main/java/com/no1/wms/out/ProductOutController.java b/src/main/java/com/no1/wms/out/ProductOutController.java new file mode 100644 index 0000000..47423ee --- /dev/null +++ b/src/main/java/com/no1/wms/out/ProductOutController.java @@ -0,0 +1,200 @@ +package com.no1.wms.out; + + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import java.util.List; +import java.util.Map; + +@Controller +@Slf4j +@RequestMapping("/out") +public class ProductOutController { + + @Autowired + ProductOutService service; + + // 출고 리스트 출력 + @GetMapping("/list") + public String list(@RequestParam(name = "searchn", defaultValue = "0") int searchn, + @RequestParam(name = "search", defaultValue = "") String search, + @RequestParam(name = "p", defaultValue = "1") int page, Model m) { + int count = service.count(searchn, search); + + int perPage = 10; // 한 페이지에 보일 글의 갯수 + int startRow = (page - 1) * perPage; + + //스톡서비스로 재고 리스트 출력 메서트 작성 + List> dto = service.list(searchn, search, startRow ,perPage); + m.addAttribute("olist", dto); + + m.addAttribute("start", startRow + 1); + + int pageNum = 5;//보여질 페이지 번호 수 + int totalPages = count / perPage + (count % perPage > 0 ? 1 : 0); // 전체 페이지 수 + + int begin = (page - 1) / pageNum * pageNum + 1; + int end = begin + pageNum - 1; + if (end > totalPages) { + end = totalPages; + } + m.addAttribute("searchn", searchn); + m.addAttribute("search", search); + m.addAttribute("begin", begin); + m.addAttribute("end", end); + m.addAttribute("pageNum", pageNum); + m.addAttribute("totalPages", totalPages); + m.addAttribute("p" , page); + + System.out.println("테스트 : : " + m); + + + return "out/list"; + } + + + + + // 재고 상세페이지 + @PostMapping("/read") + public String read(@RequestParam String id, Model m) { + //스톡서비스로 재고 상세페이지 출력 메서드 작성 + Map dto = service.outOne(id); + m.addAttribute("dto", dto); + return "out/read"; + } + + + // 수정 - 폼 + @PostMapping("/update") + public String update(String id, Model m) { + Map dto = service.outOne(id); + m.addAttribute("dto", dto); + return "out/update"; + } + + + // 수정 프로세스 + @PutMapping("/update_process") + @ResponseBody + public boolean updateProcess(ProductOutDto dto) { + + int i = service.outUpdate(dto); + if (i == 1) { + return true; + } else { + return false; + } + } + + + + // 생성 폼 + @PostMapping("/create") + public String create() { + return "out/create"; + } + + + // 생성 - Ajax + @PostMapping("/create_process") + @ResponseBody + public boolean createProcess(ProductOutDto dto) { + System.out.println("테스트 : : " + dto); + int i = service.createOut(dto); + if (i != 0) { + return true; + } else { + return false; + } + } + + + // 삭제 + @DeleteMapping("/delete") + @ResponseBody + public int delete(ProductOutDto dto) { + System.out.println("데이터 :: " + dto); + int i = service.deleteOut(dto); + + return i; + } + + + //즉시 출고 + @PutMapping("/outNow") + @ResponseBody + public boolean outNow(ProductOutDto dto) { + int i = service.outNowUpdate(dto); + if (i != 0) { + service.updateWarehouseDeleteStock(dto); + return true; + } else { + return false; + } + } + + + + @PostMapping("/show_modal") + public ModelAndView showModal(@RequestParam(name = "searchn", defaultValue = "0") int searchn, + @RequestParam(name = "search", defaultValue = "") String search, + @RequestParam(name = "p", defaultValue = "1") int page, + @RequestParam String name, ModelAndView mav){ + + int perPage = 5; // 한 페이지에 보일 글의 갯수 + int startRow = (page - 1) * perPage; + + List> list = null; + int count = 0; + + //테스트 + System.out.println("name : " + name); + System.out.println("list : " + list); + System.out.println("count : " + count); + System.out.println("mav : " + mav); + //테스트 + + // 모달 선택 + if(name.equals("stock_product_warehouse")){ + list = service.stockSelect(searchn, search, startRow, perPage); + count = service.stockCount(searchn, search); + }else if(name.equals("warehouse_capacity_currentCapacity")) { + } + + mav.addObject("list", list); + + mav.addObject("start", startRow + 1); + + int pageNum = 5;//보여질 페이지 번호 수 + int totalPages = count / perPage + (count % perPage > 0 ? 1 : 0); // 전체 페이지 수 + + int begin = (page - 1) / pageNum * pageNum + 1; + int end = begin + pageNum - 1; + if (end > totalPages) { + end = totalPages; + } + mav.addObject("searchn", searchn); + mav.addObject("search", search); + mav.addObject("begin", begin); + mav.addObject("end", end); + mav.addObject("pageNum", pageNum); + mav.addObject("totalPages", totalPages); + mav.addObject("p" , page); + + mav.setViewName(name); + + //테스트 + System.out.println("name : " + name); + System.out.println("list : " + list); + System.out.println("count : " + count); + System.out.println("mav : " + mav); + //테스트 + return mav; + } +} diff --git a/src/main/java/com/no1/wms/out/ProductOutDto.java b/src/main/java/com/no1/wms/out/ProductOutDto.java new file mode 100644 index 0000000..c2c0ea6 --- /dev/null +++ b/src/main/java/com/no1/wms/out/ProductOutDto.java @@ -0,0 +1,29 @@ +package com.no1.wms.out; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ProductOutDto { + + private String id; + private String product_id; + private int quantity; + private String expected_delivery_date; + private String delivery_date; + private String warehouse_id; + private String manager_id; + private String note; + private int activation; + + + +} diff --git a/src/main/java/com/no1/wms/out/ProductOutMapper.java b/src/main/java/com/no1/wms/out/ProductOutMapper.java new file mode 100644 index 0000000..f28f3b3 --- /dev/null +++ b/src/main/java/com/no1/wms/out/ProductOutMapper.java @@ -0,0 +1,46 @@ +package com.no1.wms.out; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + + +@Mapper +public interface ProductOutMapper { + + int count(Map m);//검색 글 갯수 + + List> list(Map m); + + + + + int outUpdate(ProductOutDto dto); + int updateStock(ProductOutDto dto); + + int updateWarehouse(ProductOutDto dto); + + int outNowUpdate(ProductOutDto dto); + int updateWarehousePlus(ProductOutDto dto); + + int updateWarehouseDeleteStock(ProductOutDto dto); + + int createOut(ProductOutDto dto); + + Map outOne(String id); + + int deleteOut(ProductOutDto dto); + + int outNow(ProductOutDto dto); + + List> stockSelect(Map m); + + int stockCount(Map m);//검색 글 갯수 + + + + + + +} diff --git a/src/main/java/com/no1/wms/out/ProductOutService.java b/src/main/java/com/no1/wms/out/ProductOutService.java new file mode 100644 index 0000000..ae3eb8d --- /dev/null +++ b/src/main/java/com/no1/wms/out/ProductOutService.java @@ -0,0 +1,108 @@ +package com.no1.wms.out; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +@Slf4j +public class ProductOutService { + @Autowired + ProductOutMapper mapper; + + public int count(int searchn, String search) { + + + Map m = new HashMap(); + m.put("searchn",searchn); + m.put("search", search); + return mapper.count(m); + } + + + public List> list(int searchn, String search, int start, int perPage){ + + + Map m = new HashMap(); + m.put("searchn",searchn); + m.put("search", search); + m.put("start", start); + m.put("perPage", perPage); + + List> result = mapper.list(m); + return result; + + } + + + + public Map outOne(String id) { + return mapper.outOne(id); + } + + + public int createOut(ProductOutDto dto) { + return mapper.createOut(dto); + } + + + + public int outUpdate(ProductOutDto dto) { + return mapper.outUpdate(dto); + } + public int updateStock(ProductOutDto dto) { + return mapper.updateStock(dto); + } + + public int updateWarehouse(ProductOutDto dto){ + return mapper.updateWarehouse(dto); + } + + public int outNowUpdate(ProductOutDto dto){ + return mapper.outNowUpdate(dto);} + + public int updateWarehousePlus(ProductOutDto dto){ + return mapper.updateWarehousePlus(dto); + } + + public int updateWarehouseDeleteStock(ProductOutDto dto){ + return mapper.updateWarehouseDeleteStock(dto); + } + + public int deleteOut(ProductOutDto dto) { + return mapper.deleteOut(dto); + } + + public int outNow(ProductOutDto dto) { + return mapper.outNow(dto); + } + + public List> stockSelect(int searchn, String search, int start, int perPage){ + Map m = new HashMap(); + m.put("searchn", searchn); + m.put("search", search); + m.put("start", start); + m.put("perPage", perPage); + + List> productresult = mapper.stockSelect(m); + + return productresult; + } + + public int stockCount(int searchn, String search) { + + + Map m = new HashMap(); + m.put("searchn",searchn); + m.put("search", search); + return mapper.stockCount(m); + } + + + +} + diff --git a/src/main/java/com/no1/wms/resetpassword/ResetPasswordController.java b/src/main/java/com/no1/wms/resetpassword/ResetPasswordController.java index 8736520..90a6442 100644 --- a/src/main/java/com/no1/wms/resetpassword/ResetPasswordController.java +++ b/src/main/java/com/no1/wms/resetpassword/ResetPasswordController.java @@ -3,9 +3,11 @@ package com.no1.wms.resetpassword; import com.google.gson.Gson; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; @Controller @RequestMapping("/resetpassword") @@ -15,6 +17,43 @@ public class ResetPasswordController { @Autowired ResetPasswordService resetPasswordService; + /*GetMapping("/list") + public String list(@RequestParam(name = "searchn", defaultValue = "0") int searchn, + @RequestParam(name = "search", defaultValue = "") String search, + @RequestParam(name = "p", defaultValue = "1") int page, Model m) { + int count = resetPasswordService.count(searchn, search); + + int perPage = 10; // 한 페이지에 보일 글의 갯수 + int startRow = (page - 1) * perPage; + + //스톡서비스로 재고 리스트 출력 메서트 작성 + List> dto = resetPasswordService.list(searchn, search, startRow ,perPage); + m.addAttribute("rlist", dto); + + m.addAttribute("start", startRow + 1); + + int pageNum = 5;//보여질 페이지 번호 수 + int totalPages = count / perPage + (count % perPage > 0 ? 1 : 0); // 전체 페이지 수 + + int begin = (page - 1) / pageNum * pageNum + 1; + int end = begin + pageNum - 1; + if (end > totalPages) { + end = totalPages; + } + m.addAttribute("searchn", searchn); + m.addAttribute("search", search); + m.addAttribute("begin", begin); + m.addAttribute("end", end); + m.addAttribute("pageNum", pageNum); + m.addAttribute("totalPages", totalPages); + m.addAttribute("p" , page); + + System.out.println("테스트 : : " + m); + + + return "out/list"; + }*/ + @PostMapping("/insert") @ResponseBody public String insert(ResetPasswordDto dto, Gson gson){ diff --git a/src/main/java/com/no1/wms/stock/StockController.java b/src/main/java/com/no1/wms/stock/StockController.java index 09eeaee..147b145 100644 --- a/src/main/java/com/no1/wms/stock/StockController.java +++ b/src/main/java/com/no1/wms/stock/StockController.java @@ -22,78 +22,77 @@ public class StockController { // 탭 1 재고 리스트 출력 @GetMapping("/list") - public String list(@RequestParam(name = "searchn", defaultValue = "0") int searchn, - @RequestParam(name = "search", defaultValue = "") String search, - @RequestParam(name = "p", defaultValue = "1") int page, Model m) { - int count = service.count(searchn, search); + public String list(@RequestParam(name = "searchn1", defaultValue = "0") int searchn1, + @RequestParam(name = "search1", defaultValue = "") String search1, + @RequestParam(name = "p1", defaultValue = "1") int p1, + @RequestParam(name = "searchn2", defaultValue = "0") int searchn2, + @RequestParam(name = "search2", defaultValue = "") String search2, + @RequestParam(name = "p2", defaultValue = "1") int p2, + Model m) { + int count = service.count(searchn1, search1); - int perPage = 10; // 한 페이지에 보일 글의 갯수 - int startRow = (page - 1) * perPage; + int perPage1 = 10; // 한 페이지에 보일 글의 갯수 + int startRow1 = (p1 - 1) * perPage1; //스톡서비스로 재고 리스트 출력 메서트 작성 - List> dto = service.list(searchn, search, startRow ,perPage); - m.addAttribute("slist", dto); + List> dto1 = service.list(searchn1, search1, startRow1 ,perPage1); + m.addAttribute("slist1", dto1); - m.addAttribute("start", startRow + 1); + m.addAttribute("start1", startRow1 + 1); - int pageNum = 5;//보여질 페이지 번호 수 - int totalPages = count / perPage + (count % perPage > 0 ? 1 : 0); // 전체 페이지 수 + int pageNum1 = 5;//보여질 페이지 번호 수 + int totalPages1 = count / perPage1 + (count % perPage1 > 0 ? 1 : 0); // 전체 페이지 수 - int begin = (page - 1) / pageNum * pageNum + 1; - int end = begin + pageNum - 1; - if (end > totalPages) { - end = totalPages; + int begin1 = (p1 - 1) / pageNum1 * pageNum1 + 1; + int end1 = begin1 + pageNum1 - 1; + if (end1 > totalPages1) { + end1 = totalPages1; } - m.addAttribute("searchn", searchn); - m.addAttribute("search", search); - m.addAttribute("begin", begin); - m.addAttribute("end", end); - m.addAttribute("pageNum", pageNum); - m.addAttribute("totalPages", totalPages); - m.addAttribute("p" , page); + m.addAttribute("searchn1", searchn1); + m.addAttribute("search1", search1); + m.addAttribute("begin1", begin1); + m.addAttribute("end1", end1); + m.addAttribute("pageNum1", pageNum1); + m.addAttribute("totalPages1", totalPages1); + m.addAttribute("p1" , p1); + //탭 2 + int count2 = service.count2(searchn2, search2); + System.out.println("count2 ::" + count2); + + int perPage2 = 10; // 한 페이지에 보일 글의 갯수 + int startRow2 = (p2 - 1) * perPage2; + + //스톡서비스로 재고 리스트 출력 메서트 작성 + List> dto2 = service.list2(searchn2, search2, startRow2 ,perPage2); + System.out.println("dto ::" + dto2); + + m.addAttribute("slist2", dto2); + + m.addAttribute("start2", startRow2 + 1); + + int pageNum2 = 5;//보여질 페이지 번호 수 + int totalPages2 = count2 / perPage2 + (count2 % perPage2 > 0 ? 1 : 0); // 전체 페이지 수 + + int begin2 = (p2 - 1) / pageNum2 * pageNum2 + 1; + int end2 = begin2 + pageNum2 - 1; + if (end2 > totalPages2) { + end2 = totalPages2; + } + m.addAttribute("searchn2", searchn2); + m.addAttribute("search2", search2); + m.addAttribute("begin2", begin2); + m.addAttribute("end2", end2); + m.addAttribute("pageNum2", pageNum2); + m.addAttribute("totalPages2", totalPages2); + m.addAttribute("p2" , p2); + return "stock/list"; } - // 탭 2 재고 리스트 출력 - @GetMapping("/list2") - public String list2(@RequestParam(name = "searchn", defaultValue = "0") int searchn, - @RequestParam(name = "search", defaultValue = "") String search, - @RequestParam(name = "p2", defaultValue = "1") int page, Model m) { - int count = service.count(searchn, search); - - int perPage = 10; // 한 페이지에 보일 글의 갯수 - int startRow = (page - 1) * perPage; - - //스톡서비스로 재고 리스트 출력 메서트 작성 - List> dto = service.list(searchn, search, startRow ,perPage); - m.addAttribute("slist2", dto); - - m.addAttribute("start2", startRow + 1); - - int pageNum = 5;//보여질 페이지 번호 수 - int totalPages = count / perPage + (count % perPage > 0 ? 1 : 0); // 전체 페이지 수 - - int begin = (page - 1) / pageNum * pageNum + 1; - int end = begin + pageNum - 1; - if (end > totalPages) { - end = totalPages; - } - m.addAttribute("searchn2", searchn); - m.addAttribute("search2", search); - m.addAttribute("begin2", begin); - m.addAttribute("end2", end); - m.addAttribute("pageNum2", pageNum); - m.addAttribute("totalPages2", totalPages); - m.addAttribute("p2" , page); - - - - return "stock/list"; - } // 재고 상세페이지 @@ -204,6 +203,8 @@ public class StockController { if (end > totalPages) { end = totalPages; } + mav.addObject("searchn", searchn); + mav.addObject("search", search); mav.addObject("begin", begin); mav.addObject("end", end); mav.addObject("pageNum", pageNum); diff --git a/src/main/resources/mappers/ProductOutMapper.xml b/src/main/resources/mappers/ProductOutMapper.xml new file mode 100644 index 0000000..316f79c --- /dev/null +++ b/src/main/resources/mappers/ProductOutMapper.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + update product_out + set quantity = #{quantity}, expected_delivery_date = #{expected_delivery_date}, product_id = #{product_id}, warehouse_id = #{warehouse_id}, note = #{note} + where id = #{id}; + + + + update warehouse w + left join stock s on w.id = s.warehouse_id + set w.current_capacity = w.current_capacity + #{quantity} + where w.id = #{warehouseId}; + + + + update warehouse w + left join stock s on w.id = s.warehouse_id + set w.current_capacity = w.current_capacity + (#{quantityAdjustment} - #{quantity}) + where w.id = #{warehouseId}; + + + + update warehouse + set current_capacity = current_capacity - #{quantity} + where id = #{warehouse_id}; + + + + update stock s + left join warehouse w on s.warehouse_id = w.id + set s.quantity = s.quantity - #{quantity} + where s.warehouse_id = #{warehouse_id}; + + + + update product_out + set quantity = #{quantity}, expected_delivery_date = #{expected_delivery_date}, delivery_date = #{delivery_date} + where id = #{id}; + + + + + + + insert into product_out (id, product_id, quantity, expected_delivery_date, delivery_date, warehouse_id, manager_id, note, activation) + values (UUID(), #{product_id}, #{quantity}, #{expected_delivery_date}, null, #{warehouse_id}, #{manager_id}, #{note}, #{activation}); + + + + + + delete + from product_out + where id = #{id} + + + \ No newline at end of file diff --git a/src/main/resources/mappers/ResetPasswordMapper.xml b/src/main/resources/mappers/ResetPasswordMapper.xml index 34feaff..e423d78 100644 --- a/src/main/resources/mappers/ResetPasswordMapper.xml +++ b/src/main/resources/mappers/ResetPasswordMapper.xml @@ -12,16 +12,39 @@ + insert into reset_password - ( - id, account_id, note, date - ) + (id, account_id, note, date) VALUES - ( - UUID(), (SELECT id from account where employee_number = #{employeeNumber} ), #{note}, NOW() - ) + (UUID(), (SELECT id from account where employee_number = #{employeeNumber} ), #{note}, NOW()) + + + + + diff --git a/src/main/webapp/WEB-INF/views/modal/product_category_company_search.jsp b/src/main/webapp/WEB-INF/views/modal/product_category_company_search.jsp index 38aff74..d5cbdce 100644 --- a/src/main/webapp/WEB-INF/views/modal/product_category_company_search.jsp +++ b/src/main/webapp/WEB-INF/views/modal/product_category_company_search.jsp @@ -9,11 +9,13 @@ const tid = $tag.data('tid'); const tcategory = $tag.data('tcategory'); const tcompany_name = $tag.data('tcompany_name'); + const tkan_code = $tag.data('kan_code'); $("#stock_pro_name").val(tname); $("#product_id").val(tid); $("#stock_category_name").val(tcategory); $("#stock_company_name_name").val(tcompany_name); + $("#kan_code").val(tkan_code); hideSearchModal(); } @@ -46,8 +48,8 @@ function pageingFunction(clickedId) { - var searchn = $("#searchn").val(); - var search = $("#search").val(); + var searchn = $("#searchn1").val(); + var search = $("#search1").val(); $.ajax({ type: "POST", @@ -115,6 +117,7 @@ data-tname="${dto.name}" data-tcategory="${dto.cls_Nm_4}" data-tcompany_name="${dto.company_name}" + data-kan_code="${dto.kan_code}" class="btn btn-primary" onclick="onSelect(this)">선택 diff --git a/src/main/webapp/WEB-INF/views/modal/stock_product_warehouse.jsp b/src/main/webapp/WEB-INF/views/modal/stock_product_warehouse.jsp new file mode 100644 index 0000000..d3e90ef --- /dev/null +++ b/src/main/webapp/WEB-INF/views/modal/stock_product_warehouse.jsp @@ -0,0 +1,163 @@ +<%@ page contentType="text/html; charset=UTF-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + +
+
+
+
+
+
+ +
+ + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
제품제품코드창고재고량
${dto.product_name }${dto.kan_code }${dto.warehouse_name }${dto.quantity } + +
+
+
+ +
+ +
+ +
+
+
diff --git a/src/main/webapp/WEB-INF/views/modal/warehouse_capacity_currentCapacity.jsp b/src/main/webapp/WEB-INF/views/modal/warehouse_capacity_currentCapacity.jsp index bdf2f27..6d0e06f 100644 --- a/src/main/webapp/WEB-INF/views/modal/warehouse_capacity_currentCapacity.jsp +++ b/src/main/webapp/WEB-INF/views/modal/warehouse_capacity_currentCapacity.jsp @@ -1,5 +1,6 @@ <%@ page contentType="text/html; charset=UTF-8" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + +
@@ -91,6 +92,11 @@ + + + + +
@@ -160,4 +166,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/out/create.jsp b/src/main/webapp/WEB-INF/views/out/create.jsp new file mode 100644 index 0000000..a3a5ab3 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/out/create.jsp @@ -0,0 +1,196 @@ +<%@ page contentType="text/html; charset=UTF-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + + +
+

출고 예정 생성

+
+
+
+
+
+
+ + + + + + +
+ 제품 + + + +
+ +
+ 제품 코드 + +
+ +
+ 재고량 + +
+ +
+ 출고량 + +
+ + + + +
+ 창고 + + +
+ +
+ 출고 예정 날짜 + +
+ +
+ 출고 날짜 + +
+ +
+ 비고 + +
+ + +
+
+
+
+
+
+ + + +
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/views/out/list.jsp b/src/main/webapp/WEB-INF/views/out/list.jsp new file mode 100644 index 0000000..25151ae --- /dev/null +++ b/src/main/webapp/WEB-INF/views/out/list.jsp @@ -0,0 +1,219 @@ +<%@ page contentType="text/html; charset=UTF-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + + + + + 출고 리스트 + + + +
+
+
+
+

출고 관리 리스트

+
+
+
+
+
+
+
+
+
+
+ +
+ + + + + + + +
+
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
번호제품명수량창고명출고 예정 날짜출고 날짜비고
${start} ${dto.productName }${dto.quantity }${dto.warehouseName }${dto.expected_delivery_date }${dto.delivery_date }${dto.note }
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+ +
+
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/out/read.jsp b/src/main/webapp/WEB-INF/views/out/read.jsp new file mode 100644 index 0000000..8a9d1d6 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/out/read.jsp @@ -0,0 +1,260 @@ +<%@ page contentType="text/html; charset=UTF-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + + + + + + + + +
+

출고 예정 상세페이지

+
+ +
+
+
+
+
+
+
+ + + + + +
+ 제품 + + +
+ +
+ 제품 코드 + +
+ +
+ 출고량 + +
+ + +
+ 창고 + + +
+ +
+ 출고 예정 날짜 + +
+ +
+ 출고 날짜 + +
+ +
+ 비고 + +
+ + +
+
+
+
+
+
+ +
+
+
+
+ + + +
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/out/update.jsp b/src/main/webapp/WEB-INF/views/out/update.jsp new file mode 100644 index 0000000..1428606 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/out/update.jsp @@ -0,0 +1,189 @@ +<%@ page contentType="text/html; charset=UTF-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + + +
+

출고 예정 수정

+
+
+
+
+
+
+ + + + + + + +
+ 제품 + + + +
+ +
+ 제품 코드 + +
+ + +
+ 출고량 + +
+ + + + +
+ 창고 + + +
+ +
+ 출고 예정 날짜 + +
+ +
+ 출고 날짜 + +
+ +
+ 비고 + +
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/views/resetpassword/list.jsp b/src/main/webapp/WEB-INF/views/resetpassword/list.jsp new file mode 100644 index 0000000..b0c537c --- /dev/null +++ b/src/main/webapp/WEB-INF/views/resetpassword/list.jsp @@ -0,0 +1,201 @@ +<%@ page contentType="text/html; charset=UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + + + + +패스워드 초기화 요청 + + +
+

패스워드 초기화 요청

+
+
+
+
+
+
+
+
+ +
+ + + + + + + + +
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
번호사원명아이디요청사유
${start} ${dto.name }${dto.president_telephone }${dto.vendor_manager }${dto.vendor_manager_telephone }
+
+
+
+
+
+
+ ms-excel + + +
+
+ +
+
+ +
+
+
+
+ + + + + \ No newline at end of file