From 154873c024de8bb38830994a654b6ffcec4a3544 Mon Sep 17 00:00:00 2001 From: sungsu Date: Fri, 5 Jan 2024 12:46:25 +0900 Subject: [PATCH 1/3] #update StockController.java StockDto.java StockMapper.xml StockMapper.java StockService.java --- .../com/no1/wms/stock/StockController.java | 56 ++++++++++++++----- src/main/java/com/no1/wms/stock/StockDto.java | 4 +- .../java/com/no1/wms/stock/StockMapper.java | 10 ++-- .../java/com/no1/wms/stock/StockService.java | 17 +++--- src/main/resources/mappers/StockMapper.xml | 12 +++- 5 files changed, 67 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/no1/wms/stock/StockController.java b/src/main/java/com/no1/wms/stock/StockController.java index 77f5bd7..a222982 100644 --- a/src/main/java/com/no1/wms/stock/StockController.java +++ b/src/main/java/com/no1/wms/stock/StockController.java @@ -1,20 +1,12 @@ package com.no1.wms.stock; -import java.util.List; -import java.util.UUID; - 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.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; -import com.no1.wms.stock.StockDto; +import java.util.List; @Controller @Slf4j @@ -56,7 +48,7 @@ public class StockController { // 재고 상세페이지 @PostMapping("stock/read/{id}") - public String read(@PathVariable UUID id, Model m) { + public String read(@PathVariable String id, Model m) { //스톡서비스로 재고 상세페이지 출력 메서드 작성 StockDto dto = service.stockOne(id); m.addAttribute("dto", dto); @@ -66,10 +58,44 @@ public class StockController { // 수정 - 폼 @GetMapping("/stock/update/{id}") - public String update(@PathVariable UUID id, Model m) { -// StockDto dto = service.updateStock(); -// m.addAttribute("dto", dto); + public String update(@PathVariable String id, Model m) { + StockDto dto = service.stockOne(id); + m.addAttribute("dto", dto); return "stock/update"; } - + + + // 수정 프로세스 + @PutMapping("/board/update_process") + @ResponseBody + public String updateProcess(StockDto dto) { + service.updateStock(dto); + return "redirect:list"; + } + + + // 생성 폼 + @PostMapping("/stock/create") + public String create() + { + return "stock/create"; + } + + + // 생성 프로세스 + @PostMapping("/stock/create_process") + @ResponseBody + public String createProcess(StockDto dto) { + service.createStock(dto); + return "redirect:list";// 글목록 + } + + + // 삭제 + @DeleteMapping("/stock/delete") + @ResponseBody + public int delete(String id) { + int i = service.deleteBoard(id); + return i; + } } diff --git a/src/main/java/com/no1/wms/stock/StockDto.java b/src/main/java/com/no1/wms/stock/StockDto.java index 4a4fcd2..f62552d 100644 --- a/src/main/java/com/no1/wms/stock/StockDto.java +++ b/src/main/java/com/no1/wms/stock/StockDto.java @@ -1,13 +1,11 @@ package com.no1.wms.stock; -import java.util.UUID; - import lombok.Data; @Data public class StockDto { - private UUID id; + private String id; private int warehouse_id; private int product_id; private int quantity; diff --git a/src/main/java/com/no1/wms/stock/StockMapper.java b/src/main/java/com/no1/wms/stock/StockMapper.java index d30c6f9..a64b7eb 100644 --- a/src/main/java/com/no1/wms/stock/StockMapper.java +++ b/src/main/java/com/no1/wms/stock/StockMapper.java @@ -1,10 +1,9 @@ package com.no1.wms.stock; +import org.apache.ibatis.annotations.Mapper; + import java.util.List; import java.util.Map; -import java.util.UUID; - -import org.apache.ibatis.annotations.Mapper; @Mapper @@ -18,7 +17,10 @@ public interface StockMapper { int createStock(StockDto dto); - StockDto stockOne(UUID id); + StockDto stockOne(String id); + + int deleteStock(String id); + } diff --git a/src/main/java/com/no1/wms/stock/StockService.java b/src/main/java/com/no1/wms/stock/StockService.java index 5ed1032..2d2fb2a 100644 --- a/src/main/java/com/no1/wms/stock/StockService.java +++ b/src/main/java/com/no1/wms/stock/StockService.java @@ -1,14 +1,12 @@ package com.no1.wms.stock; -import java.io.Console; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - 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 public class StockService { @Autowired @@ -40,7 +38,7 @@ public class StockService { } - public StockDto stockOne(UUID id) { + public StockDto stockOne(String id) { return mapper.stockOne(id); } @@ -53,4 +51,9 @@ public class StockService { public int updateStock(StockDto dto) { return mapper.updateStock(dto); } + + + public int deleteBoard(String id) { + return mapper.deleteStock(id); + } } diff --git a/src/main/resources/mappers/StockMapper.xml b/src/main/resources/mappers/StockMapper.xml index d1ec809..ac7239a 100644 --- a/src/main/resources/mappers/StockMapper.xml +++ b/src/main/resources/mappers/StockMapper.xml @@ -27,7 +27,7 @@ order by id desc limit #{start}, #{perPage} - selct * from stock where id = #{id} @@ -44,8 +44,14 @@ - insert into stock (id, quantity, activation) - values (#{dto.id}, #{dto.quantity}, 1) + insert into stock (id, warehouse_id, product_id, quantity, activation) + values (#{dto.id}, #{dto.warehouse_id}, #{dto.product_id}, #{dto.quantity}, 1) + + + + delete from stock where no = #{id} + + \ No newline at end of file From f34cccef3508cb9c1b380703bb79c77c1cc66c0c Mon Sep 17 00:00:00 2001 From: sungsu Date: Fri, 5 Jan 2024 15:11:31 +0900 Subject: [PATCH 2/3] #update StockController.java StockDto.java StockMapper.xml StockMapper.java StockService.java --- .../no1/wms/category/CategoryController.java | 17 +-- .../com/no1/wms/stock/StockController.java | 2 +- .../java/com/no1/wms/stock/StockService.java | 2 +- src/main/resources/mappers/StockMapper.xml | 12 +- src/main/webapp/WEB-INF/views/stock/list.jsp | 103 ++++++++++++++++++ 5 files changed, 115 insertions(+), 21 deletions(-) create mode 100644 src/main/webapp/WEB-INF/views/stock/list.jsp diff --git a/src/main/java/com/no1/wms/category/CategoryController.java b/src/main/java/com/no1/wms/category/CategoryController.java index eba75fe..bc06964 100644 --- a/src/main/java/com/no1/wms/category/CategoryController.java +++ b/src/main/java/com/no1/wms/category/CategoryController.java @@ -1,22 +1,13 @@ package com.no1.wms.category; -import java.util.List; - -import javax.servlet.http.HttpServletResponse; - +import com.no1.wms.excel.ExcelUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; -import com.no1.wms.excel.ExcelUtils; +import javax.servlet.http.HttpServletResponse; +import java.util.List; diff --git a/src/main/java/com/no1/wms/stock/StockController.java b/src/main/java/com/no1/wms/stock/StockController.java index a222982..34bd7e9 100644 --- a/src/main/java/com/no1/wms/stock/StockController.java +++ b/src/main/java/com/no1/wms/stock/StockController.java @@ -26,7 +26,7 @@ public class StockController { int startRow = (page - 1) * perPage; //스톡서비스로 재고 리스트 출력 메서트 작성 - List dto = service.stockList(searchn, search, perPage); + List dto = service.list(searchn, search, perPage); m.addAttribute("list", dto); int pageNum = 4;//보여질 페이지 번호 수 diff --git a/src/main/java/com/no1/wms/stock/StockService.java b/src/main/java/com/no1/wms/stock/StockService.java index 2d2fb2a..aa7e81b 100644 --- a/src/main/java/com/no1/wms/stock/StockService.java +++ b/src/main/java/com/no1/wms/stock/StockService.java @@ -23,7 +23,7 @@ public class StockService { } - public List stockList(int searchn, String search, int start){ + public List list(int searchn, String search, int start){ System.out.println(searchn+search); diff --git a/src/main/resources/mappers/StockMapper.xml b/src/main/resources/mappers/StockMapper.xml index ac7239a..3645a61 100644 --- a/src/main/resources/mappers/StockMapper.xml +++ b/src/main/resources/mappers/StockMapper.xml @@ -2,26 +2,26 @@ - + - select * from wms.stock left join wms.warehouse on wms.stock.warehouse_id = wms.warehouse.id left join wms.product on wms.stock.product_id = wms.product.id - activation = 1 and warehouse.name like concat('%',#{search},'%') - activation = 1 and product.name like concat('%',#{search},'%') + wms.stock.activation = 1 and wms.warehouse.name like concat('%',#{search},'%') + wms.stock.activation = 1 and wms.product.name like concat('%',#{search},'%') order by id desc limit #{start}, #{perPage} diff --git a/src/main/webapp/WEB-INF/views/stock/list.jsp b/src/main/webapp/WEB-INF/views/stock/list.jsp new file mode 100644 index 0000000..0c9f765 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/stock/list.jsp @@ -0,0 +1,103 @@ +<%@ page contentType="text/html; charset=UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + + + + + 재고 리스트 + + + + + +
+

재고 리스트

+
+
+ +여기다가 화면 만들기 + +
+ + + +
+ + +
+ + + + + + + + + + + + + + + + + +
번호제품명창고명
${stock.stock.id}${stock.product.name }${stock.warehouse.name }
+
+ + [이전] + + + ${i} + + + [다음] + +
+ + +
+ + +
+ tab2 content +
+
+
+ + + \ No newline at end of file From 5597aea8a99d6c2905e4319890fc2630599e6a9a Mon Sep 17 00:00:00 2001 From: 1457rk <145002004+1457rk@users.noreply.github.com> Date: Fri, 5 Jan 2024 18:33:53 +0900 Subject: [PATCH 3/3] Update CategoryController.java --- .../no1/wms/category/CategoryController.java | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/no1/wms/category/CategoryController.java b/src/main/java/com/no1/wms/category/CategoryController.java index bc06964..f3f1423 100644 --- a/src/main/java/com/no1/wms/category/CategoryController.java +++ b/src/main/java/com/no1/wms/category/CategoryController.java @@ -1,13 +1,22 @@ package com.no1.wms.category; -import com.no1.wms.excel.ExcelUtils; +import java.util.List; + +import javax.servlet.http.HttpServletResponse; + 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.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; -import javax.servlet.http.HttpServletResponse; -import java.util.List; +import com.no1.wms.excel.ExcelUtils; @@ -57,14 +66,14 @@ public class CategoryController { // 생성 - Ajax @PostMapping("/category/create_process") @ResponseBody - public int createProcess(CategoryDto dto, Model m) { + public boolean createProcess(CategoryDto dto, Model m) { int i = categoryService.createProcess(dto); if (i == 1) { - return i; + return true; } else { // ajax테스트후 결정 - // m.addAttribute("dto", dto); - return 0; + m.addAttribute("dto", dto); + return false; } } @@ -117,13 +126,11 @@ public class CategoryController { } // KAN코드 중복확인 메서드 - - @PostMapping("/category/chackKancode") + @PostMapping("/category/checkKancode") @ResponseBody - public int chackKancode(String kan_code) { - int chack = categoryService.checkKan(kan_code); - System.out.println(chack); - return chack; + public String chackKancode(String kan_code) { + String checkkan = categoryService.kanCheck(kan_code); + return checkkan; }