diff --git a/src/main/java/com/no1/wms/category/CategoryController.java b/src/main/java/com/no1/wms/category/CategoryController.java index 58cff6d..69a6c26 100644 --- a/src/main/java/com/no1/wms/category/CategoryController.java +++ b/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; } } diff --git a/src/main/java/com/no1/wms/product/ProductController.java b/src/main/java/com/no1/wms/product/ProductController.java new file mode 100644 index 0000000..0c100f7 --- /dev/null +++ b/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 dto = productservice.productList(p); + m.addAttribute("list", dto); + return "product/list"; + } + + + +} diff --git a/src/main/java/com/no1/wms/product/ProductDto.java b/src/main/java/com/no1/wms/product/ProductDto.java new file mode 100644 index 0000000..bb352b7 --- /dev/null +++ b/src/main/java/com/no1/wms/product/ProductDto.java @@ -0,0 +1,30 @@ +package com.no1.wms.product; + +import java.util.Date; + +import org.apache.ibatis.type.Alias; + +import com.no1.wms.category.CategoryDto; + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +@Alias("ProductDto") +public class ProductDto { + + private String id; + private String name; + private String company_name; + private String kan_code; + private String vendor_id; + private Date registration_date; + private String manager_id; + private boolean activation; + + + + + +} diff --git a/src/main/java/com/no1/wms/product/ProductMapper.java b/src/main/java/com/no1/wms/product/ProductMapper.java new file mode 100644 index 0000000..acbd9cc --- /dev/null +++ b/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 productList(Map m); + + + +} diff --git a/src/main/java/com/no1/wms/product/ProductService.java b/src/main/java/com/no1/wms/product/ProductService.java new file mode 100644 index 0000000..6e87c2e --- /dev/null +++ b/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 productList(int p){ + //페이징 완료되면 수정해야함. + + int start = 0; + int count = 10; + + Map m = new HashMap(); + m.put("start", start); + m.put("count", count); + + return mapper.productList(m); + } + +} diff --git a/src/main/java/com/no1/wms/vendor/VendorDto.java b/src/main/java/com/no1/wms/vendor/VendorDto.java new file mode 100644 index 0000000..7586086 --- /dev/null +++ b/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; +} diff --git a/src/main/resources/mappers/CategoryMapper.xml b/src/main/resources/mappers/CategoryMapper.xml index 3d47c79..5edd7d2 100644 --- a/src/main/resources/mappers/CategoryMapper.xml +++ b/src/main/resources/mappers/CategoryMapper.xml @@ -39,7 +39,7 @@ diff --git a/src/main/resources/mappers/ProductMapper.xml b/src/main/resources/mappers/ProductMapper.xml new file mode 100644 index 0000000..a684ac6 --- /dev/null +++ b/src/main/resources/mappers/ProductMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/category/read.jsp b/src/main/webapp/WEB-INF/views/category/read.jsp index 864c84e..8bd5901 100644 --- a/src/main/webapp/WEB-INF/views/category/read.jsp +++ b/src/main/webapp/WEB-INF/views/category/read.jsp @@ -8,7 +8,13 @@
+ +

제품 카테고리 상세페이지

+
+ +
+
@@ -86,10 +92,41 @@ })//modifyBtn click - - + yesNoModal.yesFunction = deleteCategoryFunction; });//ready + + + + + function deleteCategoryFunction(){ + var kan_code = $("#kan_code").val(); + $.ajax({ + url: "/category/delete", + type: "delete", + data: { + "kan_code": kan_code + }, + datatype:"json" + }).done(function(data) { + if (data == true) { + alert("삭제되었습니다."); + $(location).attr("href", "/category/list"); + } else { + alert("정상적으로 삭제되지 않았습니다.."); + } + }).fail(function() { + alert("오류가 발생했습니다."); + }).always(function() { + // + }); + + }//deleteCategoryFunction + + + + + + - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/product/list.jsp b/src/main/webapp/WEB-INF/views/product/list.jsp new file mode 100644 index 0000000..8eb1b2b --- /dev/null +++ b/src/main/webapp/WEB-INF/views/product/list.jsp @@ -0,0 +1,110 @@ +<%@ page contentType="text/html; charset=UTF-8"%> + + + + +제품 목록 + + +
+

제품 관리

+
+
+
+
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
제품명회사명소분류거래처등록날짜담당자
${dto.cls_nm_1 }${dto.cls_nm_2 }${dto.cls_nm_3 }${dto.cls_nm_4 }${dto.kan_code }
+ +
+
+
+
+
+
+ 엑셀이미지 + +
+
+ +
+
+ +
+
+
+
+ + + + + \ No newline at end of file