Merge branch 'master' of https://github.com/suhf/No1WMS.git

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
@@ -34,7 +26,7 @@ public class StockController {
 		int startRow = (page - 1) * perPage;
 		
 		//스톡서비스로 재고 리스트 출력 메서트 작성
-		List<StockDto> dto = service.stockList(searchn, search, perPage);
+		List<StockDto> dto = service.list(searchn, search, perPage);
 		m.addAttribute("list", dto);
 		
 		int pageNum = 4;//보여질 페이지 번호 수
@@ -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;
+	}
 }

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;

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);
+
 	
 	
 }

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
@@ -25,7 +23,7 @@ public class StockService {
 	}
 
 	
-	public List<StockDto> stockList(int searchn, String search, int start){
+	public List<StockDto> list(int searchn, String search, int start){
 		
 		System.out.println(searchn+search);
 		
@@ -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);
+	}
 }