diff --git a/src/main/java/com/no1/wms/category/CategoryController.java b/src/main/java/com/no1/wms/category/CategoryController.java index eba75fe..1764ba2 100644 --- a/src/main/java/com/no1/wms/category/CategoryController.java +++ b/src/main/java/com/no1/wms/category/CategoryController.java @@ -37,7 +37,7 @@ public class CategoryController { return "category/test"; } - + // 카테고리 리스트 출력 @GetMapping("/category/list") public String list(@RequestParam(name = "p", defaultValue = "1") int p, Model m) { @@ -66,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; } } @@ -126,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; } diff --git a/src/main/java/com/no1/wms/category/CategoryDto.java b/src/main/java/com/no1/wms/category/CategoryDto.java index d187e46..0980e34 100644 --- a/src/main/java/com/no1/wms/category/CategoryDto.java +++ b/src/main/java/com/no1/wms/category/CategoryDto.java @@ -16,5 +16,4 @@ public class CategoryDto { private String cls_nm_3; private String cls_nm_4; private boolean activation; - } diff --git a/src/main/java/com/no1/wms/category/CategoryMapper.java b/src/main/java/com/no1/wms/category/CategoryMapper.java index c702642..a3e8def 100644 --- a/src/main/java/com/no1/wms/category/CategoryMapper.java +++ b/src/main/java/com/no1/wms/category/CategoryMapper.java @@ -14,4 +14,5 @@ public interface CategoryMapper { int updateByKanCode(CategoryDto dto); int deactivateByKanCode(String kan_code); int activateByKanCode(String kan_code); + String kanCheck(String kan_code); } diff --git a/src/main/java/com/no1/wms/category/CategoryService.java b/src/main/java/com/no1/wms/category/CategoryService.java index 2cf2679..9280565 100644 --- a/src/main/java/com/no1/wms/category/CategoryService.java +++ b/src/main/java/com/no1/wms/category/CategoryService.java @@ -52,14 +52,8 @@ public class CategoryService { return mapper.activateByKanCode(kan_code); } - public int checkKan(String kan_code) { - CategoryDto dto = mapper.selectByKanCode(kan_code); - String kancode = dto.getKan_code(); - if(kancode == null) { - return 0; - }else { - return 1; - } + public String kanCheck(String kan_code) { + return mapper.kanCheck(kan_code); } diff --git a/src/main/java/com/no1/wms/stock/StockController.java b/src/main/java/com/no1/wms/stock/StockController.java index 77f5bd7..34bd7e9 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 @@ -34,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;//보여질 페이지 번호 수 @@ -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..aa7e81b 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 @@ -25,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); @@ -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/CategoryMapper.xml b/src/main/resources/mappers/CategoryMapper.xml index 7e0045e..86268b2 100644 --- a/src/main/resources/mappers/CategoryMapper.xml +++ b/src/main/resources/mappers/CategoryMapper.xml @@ -7,9 +7,9 @@ INSERT INTO product_category (kan_code, cls_nm_1, cls_nm_2, cls_nm_3, cls_nm_4, activation) - VALUES (#{dto.kan_code}, #{dto.cls_nm_1},#{dto.cls_nm_2},#{dto.cls_nm_3},#{dto.cls_nm_4},1) + VALUES (#{kan_code}, #{cls_nm_1},#{cls_nm_2},#{cls_nm_3},#{cls_nm_4},1) - + @@ -51,7 +51,9 @@ select * from product_category - + diff --git a/src/main/resources/mappers/StockMapper.xml b/src/main/resources/mappers/StockMapper.xml index a760c29..3645a61 100644 --- a/src/main/resources/mappers/StockMapper.xml +++ b/src/main/resources/mappers/StockMapper.xml @@ -2,32 +2,32 @@ - + - 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} - 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 diff --git a/src/main/webapp/WEB-INF/views/category/create.jsp b/src/main/webapp/WEB-INF/views/category/create.jsp index 6cfd6d3..6a09cee 100644 --- a/src/main/webapp/WEB-INF/views/category/create.jsp +++ b/src/main/webapp/WEB-INF/views/category/create.jsp @@ -6,25 +6,28 @@ 카테고리 생성 -
+

제품 카테고리 생성

@@ -32,51 +35,46 @@ input {
-
-
+
+
대분류 - +
-
+
중분류 - +
-
+
소분류 - +
-
- 중분류 - +
+ 세분류 +
-
- - +
+ +
- 대분류 - - - 중분류 - - - 소분류 - - - 세분류 - - - KAN 분류코드 - - - -
-
- - +
+ +
@@ -87,29 +85,31 @@ input { // 중복 클릭 방지를 위해 버튼을 비활성화 $("#checkKan").prop("disabled", true); - // 이전 결과 및 메시지 초기화 - $("#chackDiv").html(""); - var kanCode = $("#kan_code").val(); if (!kanCode) { - $("#chackDiv").html("KAN 분류코드를 입력하세요."); + alert("KAN 분류코드를 입력하세요."); + $("#kan_code").focus(); // 버튼 다시 활성화 $("#checkKan").prop("disabled", false); return false; } $.ajax({ + url: "/category/checkKancode", type: "post", - url: "/category/chackKancode", - data: { kan_code: kanCode }, - dataType: text + data: {"kan_code": kanCode}, + datatype:"text" }).done(function(data) { - if (data == 0) { - $("#chackDiv").html("사용가능합니다"); - $("#chackDiv").append(""); + if (data == "") { + $("#checkKan").css("background-color", "#4CAF50"); // 파란색 배경으로 변경 + $("#checkKan").text("사용가능"); // 버튼 텍스트 변경 + $("#checkKan").append(""); } else { - $("#chackDiv").html("이미 사용중인 KAN 분류코드입니다."); + $("#checkKan").css("background-color", "#FF5E5E"); // 원래의 빨간색 배경으로 변경 + $("#checkKan").text("사용불가"); // 버튼 텍스트 변경 + $("#kan_chack").val('0'); + //여기 } }).fail(function() { alert("오류가 발생했습니다."); @@ -117,12 +117,71 @@ input { // Ajax 요청 완료 후 버튼 다시 활성화 $("#checkKan").prop("disabled", false); }); - }); - - // 포커스를 잃었을 때 KAN 분류코드 입력 안내 메시지를 초기화 - $("#kan_code").on("blur", function() { - $("#chackDiv").html(""); - }); + });//kan중복체크 기능 + + + + $("#submit").on("click", function(){ + var clsnm1 = $("#cls_nm_1").val(); + var clsnm2 = $("#cls_nm_2").val(); + var clsnm3 = $("#cls_nm_3").val(); + var clsnm4 = $("#cls_nm_4").val(); + var kanCode = $("#kan_code").val(); + if(!clsnm1){ + alert("대분류를 입력해야 합니다."); + return false; + } + if(!clsnm2){ + alert("중분류를 입력해야 합니다."); + return false; + } + if(!clsnm3){ + alert("소분류를 입력해야 합니다."); + return false; + } + if(!clsnm4){ + alert("세분류를 입력해야 합니다."); + return false; + } + if( $("#kan_chack").val() != 1){ + alert("KAN코드를 입력후 중복체크를 해야합니다."); + return false; + } + + $.ajax({ + url: "/category/create_process", + type: "post", + data: { + "cls_nm_1": clsnm1, + "cls_nm_2": clsnm2, + "cls_nm_3": clsnm3, + "cls_nm_4": clsnm4, + "kan_code": kanCode, + "activation": true + }, + datatype:"json" + }).done(function(data) { + if (data == true) { + alert("카테고리가 생성되었습니다."); + $(location).attr("href", "/category/list") + } else { + alert("카테고리 생성에 실패하였습니다."); + } + }).fail(function() { + alert("오류가 발생했습니다."); + }).always(function() { + // Ajax 요청 완료 후 버튼 다시 활성화 + + }); + + }) + + + + + + + }); diff --git a/src/main/webapp/WEB-INF/views/category/list.jsp b/src/main/webapp/WEB-INF/views/category/list.jsp index bb802db..05251b9 100644 --- a/src/main/webapp/WEB-INF/views/category/list.jsp +++ b/src/main/webapp/WEB-INF/views/category/list.jsp @@ -6,37 +6,38 @@ 제품 카테고리 -
-

제품 카테고리 관리

+
+

제품 카테고리 관리

-
-
- + + + + + +
+ +
-
- -
-
- -
+
-
diff --git a/src/main/webapp/WEB-INF/views/category/test.jsp b/src/main/webapp/WEB-INF/views/category/test.jsp index b5d025f..8a91481 100644 --- a/src/main/webapp/WEB-INF/views/category/test.jsp +++ b/src/main/webapp/WEB-INF/views/category/test.jsp @@ -1,18 +1,81 @@ <%@ page contentType="text/html; charset=UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> test상세페이지 + -test success
-
- + test success +
+
+ ${item.kan_code} : ${item.cls_nm_1} > ${item.cls_nm_2} > ${item.cls_nm_3} > ${item.cls_nm_4}
활성화 : ${item.activation}
-
- +
+ + 코드테스트 버튼 : +
+ + +
+ + + + + + \ No newline at end of file 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