Merge remote-tracking branch 'origin/master'

src/main/java/com/no1/wms/category/CategoryController.java

@@ -98,16 +98,14 @@ public class CategoryController {
 	}
 
 	// 삭제
-	@DeleteMapping("/category/delete/{kan_code}")
+	@DeleteMapping("/category/delete")
 	@ResponseBody
-	public int delete(@PathVariable String kan_code) {
+	public boolean delete(String kan_code) {
 		int i = categoryService.deactivateByKanCode(kan_code);
 		if (i == 1) {
-			return i;
+			return true;
 		} else {
-			// ajax테스트후 결정
-			// m.addAttribute("dto", dto);
-			return 0;
+			return false;
 		}
 	}
 	

src/main/java/com/no1/wms/product/ProductController.java

@@ -0,0 +1,28 @@
+package com.no1.wms.product;
+
+import java.util.List;
+
+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.RequestParam;
+
+@Controller
+public class ProductController {
+	
+	@Autowired
+	ProductService productservice;
+	
+	@GetMapping("/product/list")
+	public String list(@RequestParam(name = "p", defaultValue = "1") int p, Model m) {
+
+		// 서비스로 카테고리 목록 불러오는 메서드 작성
+		List<ProductDto> dto = productservice.productList(p);
+		m.addAttribute("list", dto);
+		return "product/list";
+	}
+	
+	
+	
+}

src/main/java/com/no1/wms/product/ProductDto.java

@@ -0,0 +1,33 @@
+package com.no1.wms.product;
+
+import java.util.Date;
+
+import org.apache.ibatis.type.Alias;
+
+import com.no1.wms.account.AccountDto;
+import com.no1.wms.category.CategoryDto;
+import com.no1.wms.vendor.VendorDto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+@Alias("ProductDto")
+public class ProductDto {
+	
+	private String id;//id
+	private String name;//제품명
+	private String company_name;//회사명
+	private String kan_code;//분류코드
+	private String vendor_id;//거래처 id
+	private Date registration_date;//등록날짜
+	private String manager_id;//담당자
+	private boolean activation;//활성화
+	
+	private VendorDto vendorDto;
+	private AccountDto accountDto;
+	private CategoryDto categoryDto;
+	
+	
+}

src/main/java/com/no1/wms/product/ProductMapper.java

@@ -0,0 +1,15 @@
+package com.no1.wms.product;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ProductMapper {
+	
+	List<ProductDto> productList(Map<String, Object> m);
+	
+	
+	
+}

src/main/java/com/no1/wms/product/ProductService.java

@@ -0,0 +1,29 @@
+package com.no1.wms.product;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ProductService {
+	
+	@Autowired
+	ProductMapper mapper;
+	
+	public List<ProductDto> productList(int p){
+		//페이징 완료되면 수정해야함.
+		
+		int start = 0;
+		int count = 10;
+		
+		Map m = new HashMap<String, Object>();
+		m.put("start", start);
+		m.put("count", count);
+		
+		return mapper.productList(m);
+	}
+	
+}

src/main/java/com/no1/wms/vendor/VendorDto.java

@@ -0,0 +1,25 @@
+package com.no1.wms.vendor;
+
+import org.apache.ibatis.type.Alias;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+@Alias("VendorDto")
+public class VendorDto {
+	
+	private String id;
+	private String name;
+	private String president_name;
+	private String address;
+	private String registration_number;
+	private String email;
+	private String president_telephone;
+	private String vendor_manager;
+	private String vendor_manager_telephone;
+	private String main_product;
+	private String manager_id;
+	private boolean activation;	
+}

src/main/java/com/no1/wms/warehouse/WarehouseController.java

@@ -22,14 +22,15 @@ public class WarehouseController {
 					   @RequestParam(name = "p", defaultValue = "1") int page, Model m) {
 		int count = service.count(searchn, search);
 		
-		int perPage = 10; // 한 페이지에 보일 글의 갯수
+		int perPage = 5; // 한 페이지에 보일 글의 갯수
 		int startRow = (page - 1) * perPage;
 		
 		//스톡서비스로 재고 리스트 출력 메서트 작성
-		List<Object> dto = service.list(searchn, search, perPage);
+		List<WarehouseDto> dto = service.list(searchn, search, startRow ,perPage);
 		m.addAttribute("wlist", dto);
+		m.addAttribute("start", startRow + 1);
 		
-		int pageNum = 4;//보여질 페이지 번호 수
+		int pageNum = 5;//보여질 페이지 번호 수
 		int totalPages = count / perPage + (count % perPage > 0 ? 1 : 0); // 전체 페이지 수
 	
 		int begin = (page - 1) / pageNum * pageNum + 1;
@@ -41,14 +42,15 @@ public class WarehouseController {
 		m.addAttribute("end", end);
 		m.addAttribute("pageNum", pageNum);
 		m.addAttribute("totalPages", totalPages);
+		m.addAttribute("p" , page);
 		
 		return "warehouse/list";
 	}
 				
 	
 	// 재고 상세페이지
-	@PostMapping("warehouse/read/{id}")
-	public String read(@PathVariable String id, Model m) {
+	@PostMapping("warehouse/read")
+	public String read(String id, Model m) {
 		//스톡서비스로 재고 상세페이지 출력 메서드 작성
 		WarehouseDto dto = service.warehouseOne(id);
 		m.addAttribute("dto", dto);

src/main/java/com/no1/wms/warehouse/WarehouseMapper.java

@@ -11,7 +11,7 @@ public interface WarehouseMapper {
 	
 	int count(Map<String, Object> m);//검색 글 갯수
 	
-	List<Object> list(Map<String, Object> m);
+	List<WarehouseDto> list(Map<String, Object> m);
 
 	int updateWarehouse(WarehouseDto dto);
 	

src/main/java/com/no1/wms/warehouse/WarehouseService.java

@@ -22,7 +22,7 @@ public class WarehouseService {
 	}
 
 	
-	public List<Object> list(int searchn, String search, int start){
+	public List<WarehouseDto> list(int searchn, String search, int start, int perPage){
 		
 		System.out.println(searchn+search);
 		
@@ -30,7 +30,7 @@ public class WarehouseService {
 		m.put("searchn",searchn);
 		m.put("search", search);
 		m.put("start", start);
-		m.put("perPage", 10);
+		m.put("perPage", perPage);
 
 		return mapper.list(m);