diff --git a/src/main/java/com/no1/wms/account/AccountController.java b/src/main/java/com/no1/wms/account/AccountController.java index 606fe97..b4ebfd8 100644 --- a/src/main/java/com/no1/wms/account/AccountController.java +++ b/src/main/java/com/no1/wms/account/AccountController.java @@ -1,8 +1,6 @@ package com.no1.wms.account; import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.stream.JsonReader; import com.no1.wms.authority.AuthorityDto; import com.no1.wms.authority.AuthorityService; import com.no1.wms.utils.ConstantValues; @@ -11,7 +9,6 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import java.io.StringReader; import java.util.List; import java.util.Map; import java.util.UUID; @@ -27,11 +24,32 @@ public class AccountController { AuthorityService authorityService; @GetMapping("/list") - public ModelAndView list(ModelAndView mav, @RequestParam(defaultValue = "") String search, @RequestParam(defaultValue = "0") int start){ + public ModelAndView list(ModelAndView mav,@RequestParam(defaultValue = "0") int searchn, @RequestParam(defaultValue = "") String search, @RequestParam(defaultValue = "1") int page){ + int perPage = 10; + int startRow = (page - 1) * perPage; + int count = accountService.count(searchn, search, startRow, perPage); - List list = accountService.selectAll(search, start, ConstantValues.PER_PAGE); + int pageNum = 4;//보여질 페이지 번호 수 + int totalPages = count / perPage + (count % perPage > 0 ? 1 : 0); // 전체 페이지 수 + + + + + //스톡서비스로 재고 리스트 출력 메서트 작성 + List list = accountService.selectAll(searchn, search, searchn, perPage); + + int begin = (page - 1) / pageNum * pageNum + 1; + int end = begin + pageNum - 1; + if (end > totalPages) { + end = totalPages; + } mav.addObject("list", list); + mav.addObject("end", end); + mav.addObject("searchn", searchn); + mav.addObject("search", search); + mav.addObject("page", startRow); + mav.addObject("begin", begin); mav.setViewName("account/list"); return mav; } @@ -120,7 +138,7 @@ public class AccountController { }else if(name.equals("dept")){ list = accountService.selectDeptAll(search, start, ConstantValues.PER_PAGE); }else if(name.equals("pos")){ - list = accountService.selectPosAll(search, start, ConstantValues.PER_PAGE); + list = accountService.selectPosAll(10, search, start); } // mav.addObject("list", list); diff --git a/src/main/java/com/no1/wms/account/AccountMapper.java b/src/main/java/com/no1/wms/account/AccountMapper.java index 0be0ebd..2a72779 100644 --- a/src/main/java/com/no1/wms/account/AccountMapper.java +++ b/src/main/java/com/no1/wms/account/AccountMapper.java @@ -31,4 +31,6 @@ public interface AccountMapper { int delete(AccountDto dto); AccountDto selectByLogin(AccountDto dto); + + int count(Map m); } diff --git a/src/main/java/com/no1/wms/account/AccountService.java b/src/main/java/com/no1/wms/account/AccountService.java index fe299eb..cf196c5 100644 --- a/src/main/java/com/no1/wms/account/AccountService.java +++ b/src/main/java/com/no1/wms/account/AccountService.java @@ -29,11 +29,12 @@ public class AccountService { return mapper.selectById(dto); } - public List selectAll(String search, int start, int perPage){ + public List selectAll(int searchn, String search, int start, int perPage){ HashMap map = new HashMap(); map.put("search", search); map.put("start", start); map.put("perPage", perPage); + map.put("searchn", searchn); @@ -49,7 +50,7 @@ public class AccountService { return mapper.selectDeptAll(map); } - List selectPosAll(String search, int start, int perPage){ + List selectPosAll(int perPage, String search, int start){ HashMap map = new HashMap(); map.put("search", search); map.put("start", start); @@ -69,4 +70,13 @@ public class AccountService { return mapper.selectByLogin(dto); } + int count(int searchn, String search, int start, int perPage){ + HashMap m = new HashMap<>(); + m.put("searchn", searchn); + m.put("search", search); + m.put("start", start); + m.put("perPage", perPage); + return mapper.count(m); + } + } diff --git a/src/main/java/com/no1/wms/base/AuthAspect.java b/src/main/java/com/no1/wms/base/AuthAspect.java index 4e72e2d..6bfe1e3 100644 --- a/src/main/java/com/no1/wms/base/AuthAspect.java +++ b/src/main/java/com/no1/wms/base/AuthAspect.java @@ -59,7 +59,7 @@ public class AuthAspect { AuthData authData = auth.get(packageName); - if(packageName.equals("base")){ + if(packageName.equals("base") || packageName.equals("mypage")){ return joinPoint.proceed(); }else if( authData != null ){ String methodName = joinPoint.getSignature().getName().toLowerCase(); diff --git a/src/main/java/com/no1/wms/category/CategoryController.java b/src/main/java/com/no1/wms/category/CategoryController.java index 9e7e4f3..d427557 100644 --- a/src/main/java/com/no1/wms/category/CategoryController.java +++ b/src/main/java/com/no1/wms/category/CategoryController.java @@ -202,6 +202,8 @@ public class CategoryController { return "modal/categorysearch"; }; + + //서식 다운로드 @GetMapping("/category/downlodeCategoryForm") public void downlodeCategoryForm (HttpServletResponse response) throws IOException{ String categoryFormName = "카테고리 데이터 입력 서식.xlsx"; diff --git a/src/main/java/com/no1/wms/price/PriceController.java b/src/main/java/com/no1/wms/price/PriceController.java index e389aea..84d6467 100644 --- a/src/main/java/com/no1/wms/price/PriceController.java +++ b/src/main/java/com/no1/wms/price/PriceController.java @@ -166,4 +166,6 @@ public class PriceController { } + + } diff --git a/src/main/java/com/no1/wms/product/ProductController.java b/src/main/java/com/no1/wms/product/ProductController.java index d4476ce..b5a9240 100644 --- a/src/main/java/com/no1/wms/product/ProductController.java +++ b/src/main/java/com/no1/wms/product/ProductController.java @@ -17,6 +17,8 @@ import org.springframework.web.servlet.ModelAndView; import com.no1.wms.category.CategoryDto; import com.no1.wms.category.CategoryService; import com.no1.wms.price.PriceDto; +import com.no1.wms.vendor.VendorDto; +import com.no1.wms.vendor.VendorService; @Controller @RequestMapping("/product") @@ -26,6 +28,8 @@ public class ProductController { ProductService productService; @Autowired CategoryService categoryService; + @Autowired + VendorService service; /* @GetMapping("list") @@ -141,7 +145,7 @@ public class ProductController { @RequestParam(name = "p", defaultValue = "1") int page, ModelAndView m, String name) { int count = categoryService.count(searchn, search); - int perPage = 10; // 한 페이지에 보일 글의 개수 + int perPage =9; // 한 페이지에 보일 글의 개수 int startRow = (page - 1) * perPage; List dto = categoryService.categoryList2(searchn, search, startRow ,perPage); @@ -171,6 +175,44 @@ public class ProductController { + + @PostMapping("/show_modal2") + public ModelAndView vendorShowModal(@RequestParam(name = "searchn", defaultValue = "0") int searchn, + @RequestParam(name = "search", defaultValue = "") String search, + @RequestParam(name = "p", defaultValue = "1") int page, ModelAndView m, String name) { + + int count = service.count(searchn, search); + + int perPage = 9; // 한 페이지에 보일 글의 갯수 + int startRow = (page - 1) * perPage; + + //스톡서비스로 재고 리스트 출력 메서트 작성 + List dto = service.list(searchn, search, startRow ,perPage); + + + m.addObject("vlist", dto); + m.addObject("start", startRow + 1); + + int pageNum = 5;//보여질 페이지 번호 수 + int totalPages = count / perPage + (count % perPage > 0 ? 1 : 0); // 전체 페이지 수 + + int begin = (page - 1) / pageNum * pageNum + 1; + int end = begin + pageNum - 1; + if (end > totalPages) { + end = totalPages; + } + m.addObject("searchn", searchn); + m.addObject("search", search); + m.addObject("begin", begin); + m.addObject("end", end); + m.addObject("pageNum", pageNum); + m.addObject("totalPages", totalPages); + m.addObject("p" , page); + m.setViewName(name); + + return m; + } + diff --git a/src/main/java/com/no1/wms/vendor/VendorController.java b/src/main/java/com/no1/wms/vendor/VendorController.java index 39d21ec..3b7a83f 100644 --- a/src/main/java/com/no1/wms/vendor/VendorController.java +++ b/src/main/java/com/no1/wms/vendor/VendorController.java @@ -1,124 +1,124 @@ -package com.no1.wms.vendor; - -import com.no1.wms.warehouse.WarehouseDto; -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.*; - -import java.util.List; -import java.util.Map; - -@Controller -@Slf4j -public class VendorController { - - @Autowired - VendorService service; - - // 재고 리스트 출력 - @GetMapping("vendor/list") - public String list(@RequestParam(name = "searchn", defaultValue = "0") int searchn, - @RequestParam(name = "search", defaultValue = "") String search, - @RequestParam(name = "p", defaultValue = "1") int page, Model m) { - - int count = service.count(searchn, search); - - int perPage = 10; // 한 페이지에 보일 글의 갯수 - int startRow = (page - 1) * perPage; - - //스톡서비스로 재고 리스트 출력 메서트 작성 - List dto = service.list(searchn, search, startRow ,perPage); - - - m.addAttribute("vlist", dto); - m.addAttribute("start", startRow + 1); - - int pageNum = 5;//보여질 페이지 번호 수 - int totalPages = count / perPage + (count % perPage > 0 ? 1 : 0); // 전체 페이지 수 - - int begin = (page - 1) / pageNum * pageNum + 1; - int end = begin + pageNum - 1; - if (end > totalPages) { - end = totalPages; - } - m.addAttribute("searchn", searchn); - m.addAttribute("search", search); - m.addAttribute("begin", begin); - m.addAttribute("end", end); - m.addAttribute("pageNum", pageNum); - m.addAttribute("totalPages", totalPages); - m.addAttribute("p" , page); - - return "vendor/list"; - } - - - // 재고 상세페이지 - @PostMapping("vendor/read") - public String read(String id, Model m) { - //스톡서비스로 재고 상세페이지 출력 메서드 작성 - - VendorDto One = service.vendorOne(id); - System.out.println("one :: " + One); - log.debug("One테스트 :: " + One); - - m.addAttribute("One", One); - - return "vendor/read"; - } - - - // 수정 - 폼 - @PostMapping("/vendor/update") - public String update(String id, Model m) { - VendorDto dto = service.vendorOne(id); - m.addAttribute("dto", dto); - return "vendor/update"; - } - - - // 수정 프로세스 - @PutMapping("/vendor/update_process") - @ResponseBody - public boolean updateProcess(VendorDto dto) { - - int i = service.updateVendor(dto); - if (i == 1) { - return true; - } else { - return false; - } - } - - - // 생성 폼 - @PostMapping("/vendor/create") - public String create() - { - return "vendor/create"; - } - - - // 생성 프로세스 - @PostMapping("/vendor/create_process") - @ResponseBody - public boolean createProcess(VendorDto dto) { - int i = service.createVendor(dto); - if (i == 1) { - return true; - } else { - return false; - } - } - - - // 삭제 - @DeleteMapping("/vendor/delete") - @ResponseBody - public int delete(String id) { - int i = service.deleteVendor(id); - return i; - } -} +package com.no1.wms.vendor; + +import com.no1.wms.warehouse.WarehouseDto; +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.*; + +import java.util.List; +import java.util.Map; + +@Controller +@Slf4j +public class VendorController { + + @Autowired + VendorService service; + + // 재고 리스트 출력 + @GetMapping("vendor/list") + public String list(@RequestParam(name = "searchn", defaultValue = "0") int searchn, + @RequestParam(name = "search", defaultValue = "") String search, + @RequestParam(name = "p", defaultValue = "1") int page, Model m) { + + int count = service.count(searchn, search); + + int perPage = 10; // 한 페이지에 보일 글의 갯수 + int startRow = (page - 1) * perPage; + + //스톡서비스로 재고 리스트 출력 메서트 작성 + List dto = service.list(searchn, search, startRow ,perPage); + + + m.addAttribute("vlist", dto); + m.addAttribute("start", startRow + 1); + + int pageNum = 5;//보여질 페이지 번호 수 + int totalPages = count / perPage + (count % perPage > 0 ? 1 : 0); // 전체 페이지 수 + + int begin = (page - 1) / pageNum * pageNum + 1; + int end = begin + pageNum - 1; + if (end > totalPages) { + end = totalPages; + } + m.addAttribute("searchn", searchn); + m.addAttribute("search", search); + m.addAttribute("begin", begin); + m.addAttribute("end", end); + m.addAttribute("pageNum", pageNum); + m.addAttribute("totalPages", totalPages); + m.addAttribute("p" , page); + + return "vendor/list"; + } + + + // 재고 상세페이지 + @PostMapping("vendor/read") + public String read(String id, Model m) { + //스톡서비스로 재고 상세페이지 출력 메서드 작성 + + VendorDto One = service.vendorOne(id); + System.out.println("one :: " + One); + log.debug("One테스트 :: " + One); + + m.addAttribute("One", One); + + return "vendor/read"; + } + + + // 수정 - 폼 + @PostMapping("/vendor/update") + public String update(String id, Model m) { + VendorDto dto = service.vendorOne(id); + m.addAttribute("dto", dto); + return "vendor/update"; + } + + + // 수정 프로세스 + @PutMapping("/vendor/update_process") + @ResponseBody + public boolean updateProcess(VendorDto dto) { + + int i = service.updateVendor(dto); + if (i == 1) { + return true; + } else { + return false; + } + } + + + // 생성 폼 + @PostMapping("/vendor/create") + public String create() + { + return "vendor/create"; + } + + + // 생성 프로세스 + @PostMapping("/vendor/create_process") + @ResponseBody + public boolean createProcess(VendorDto dto) { + int i = service.createVendor(dto); + if (i == 1) { + return true; + } else { + return false; + } + } + + + // 삭제 + @DeleteMapping("/vendor/delete") + @ResponseBody + public int delete(String id) { + int i = service.deleteVendor(id); + return i; + } +} diff --git a/src/main/java/com/no1/wms/vendor/VendorMapper.java b/src/main/java/com/no1/wms/vendor/VendorMapper.java index f8b0a86..ebd888c 100644 --- a/src/main/java/com/no1/wms/vendor/VendorMapper.java +++ b/src/main/java/com/no1/wms/vendor/VendorMapper.java @@ -1,26 +1,26 @@ -package com.no1.wms.vendor; - -import com.no1.wms.warehouse.WarehouseDto; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; -import java.util.Map; - - -@Mapper -public interface VendorMapper { - - List list(Map m); - - int count(Map m);//검색 글 갯수 - - VendorDto vendorOne(String id); - - int updateVendor(VendorDto dto); - - int createVendor(VendorDto dto); - - int deleteVendor(String id); - - -} +package com.no1.wms.vendor; + +import com.no1.wms.warehouse.WarehouseDto; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + + +@Mapper +public interface VendorMapper { + + List list(Map m); + + int count(Map m);//검색 글 갯수 + + VendorDto vendorOne(String id); + + int updateVendor(VendorDto dto); + + int createVendor(VendorDto dto); + + int deleteVendor(String id); + + +} diff --git a/src/main/java/com/no1/wms/vendor/VendorService.java b/src/main/java/com/no1/wms/vendor/VendorService.java index f0793c5..c88207e 100644 --- a/src/main/java/com/no1/wms/vendor/VendorService.java +++ b/src/main/java/com/no1/wms/vendor/VendorService.java @@ -1,57 +1,57 @@ -package com.no1.wms.vendor; - -import com.no1.wms.warehouse.WarehouseDto; -import lombok.extern.slf4j.Slf4j; -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 -@Slf4j -public class VendorService { - @Autowired - VendorMapper mapper; - - public int count(int searchn, String search) { - - Map m = new HashMap(); - m.put("searchn", searchn); - m.put("search", search); - return mapper.count(m); - } - - - public List list(int searchn, String search, int start, int perPage) { - - System.out.println(searchn + search); - - Map m = new HashMap(); - m.put("searchn", searchn); - m.put("search", search); - m.put("start", start); - m.put("perPage", perPage); - - return mapper.list(m); - } - - public VendorDto vendorOne(String id) { - return mapper.vendorOne(id); - } - - public int updateVendor(VendorDto dto) { - return mapper.updateVendor(dto); - } - - - public int createVendor(VendorDto dto) { - return mapper.createVendor(dto); - } - - - public int deleteVendor(String id) { - return mapper.deleteVendor(id); - } -} +package com.no1.wms.vendor; + +import com.no1.wms.warehouse.WarehouseDto; +import lombok.extern.slf4j.Slf4j; +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 +@Slf4j +public class VendorService { + @Autowired + VendorMapper mapper; + + public int count(int searchn, String search) { + + Map m = new HashMap(); + m.put("searchn", searchn); + m.put("search", search); + return mapper.count(m); + } + + + public List list(int searchn, String search, int start, int perPage) { + + System.out.println(searchn + search); + + Map m = new HashMap(); + m.put("searchn", searchn); + m.put("search", search); + m.put("start", start); + m.put("perPage", perPage); + + return mapper.list(m); + } + + public VendorDto vendorOne(String id) { + return mapper.vendorOne(id); + } + + public int updateVendor(VendorDto dto) { + return mapper.updateVendor(dto); + } + + + public int createVendor(VendorDto dto) { + return mapper.createVendor(dto); + } + + + public int deleteVendor(String id) { + return mapper.deleteVendor(id); + } +} diff --git a/src/main/resources/mappers/AccountMapper.xml b/src/main/resources/mappers/AccountMapper.xml index d82361c..5696769 100644 --- a/src/main/resources/mappers/AccountMapper.xml +++ b/src/main/resources/mappers/AccountMapper.xml @@ -63,8 +63,14 @@ acc.birth, acc.telephone, acc.address, acc.activation, auth2.name group_auth_name, auth.name personal_auth_name from account acc join authority auth join authority auth2 on acc.personal_authority_id = auth.id and acc.group_authority_id = auth2.id - where acc.name like concat('%',#{search},'%') - order by acc.activation desc, acc.id desc limit #{start}, #{perPage} + + + acc.activation = 1 and acc.name like concat('%',#{search},'%') + acc.activation = 1 and acc.employee_number like concat('%',#{search},'%') + + + order by acc.id desc limit #{start}, #{perPage} + insert into account @@ -134,4 +140,15 @@ update account SET activation = false WHERE id = #{id} + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/account/list.jsp b/src/main/webapp/WEB-INF/views/account/list.jsp index 78dcaf3..392626b 100644 --- a/src/main/webapp/WEB-INF/views/account/list.jsp +++ b/src/main/webapp/WEB-INF/views/account/list.jsp @@ -49,6 +49,14 @@ } + function onPaging(target){ + const p = $(target).data("p"); + $("#pPage").val(p); + const $form = $("#search_form"); + $form.attr("action", "/account/list"); + $form.trigger("submit"); + } + @@ -66,6 +74,21 @@
+
+
+ +
+
@@ -89,6 +112,21 @@
+
+
+
+ + [<] + + + ${i} + + + [>] + +
+
+
diff --git a/src/main/webapp/WEB-INF/views/category/read.jsp b/src/main/webapp/WEB-INF/views/category/read.jsp index 8bd5901..7e9a3ee 100644 --- a/src/main/webapp/WEB-INF/views/category/read.jsp +++ b/src/main/webapp/WEB-INF/views/category/read.jsp @@ -12,7 +12,7 @@

제품 카테고리 상세페이지

- +
@@ -91,8 +91,6 @@ form.submit(); })//modifyBtn click - - yesNoModal.yesFunction = deleteCategoryFunction; });//ready @@ -123,6 +121,15 @@ }//deleteCategoryFunction + function goDelete(){ + yesNoModalTextDefine("카테고리 삭제", "해당 카테고리를 삭제하시겠습니까?"); + $("#yesNoModalLabel").text(yesNoModal.title); + $("#yesNoModalBodyTextDiv").text(yesNoModal.body); + yesNoModal.yesFunction = deleteCategoryFunction; + yesNoModalBootStrap.show(); + + + } diff --git a/src/main/webapp/WEB-INF/views/modal/category.jsp b/src/main/webapp/WEB-INF/views/modal/category.jsp index 859198e..044403d 100644 --- a/src/main/webapp/WEB-INF/views/modal/category.jsp +++ b/src/main/webapp/WEB-INF/views/modal/category.jsp @@ -1,12 +1,9 @@ <%@ page contentType="text/html; charset=UTF-8"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +
@@ -59,11 +119,32 @@ ${dto.cls_nm_3 } ${dto.cls_nm_4 } ${dto.kan_code } - +
+ +
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/modal/price.jsp b/src/main/webapp/WEB-INF/views/modal/price.jsp new file mode 100644 index 0000000..6afa5e7 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/modal/price.jsp @@ -0,0 +1,71 @@ +<%@ page contentType="text/html; charset=UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + +
+
+
+
+
+
+ +
+ + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
번호제품명가격등록날짜담당자선택
${status.count }${dto.productDto.name }${dto.price }${dto.accountDto.name }
+
+
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/modal/product.jsp b/src/main/webapp/WEB-INF/views/modal/product.jsp index 3092221..7ae22a1 100644 --- a/src/main/webapp/WEB-INF/views/modal/product.jsp +++ b/src/main/webapp/WEB-INF/views/modal/product.jsp @@ -1,13 +1,10 @@ <%@ page contentType="text/html; charset=UTF-8"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +
@@ -62,11 +119,32 @@ ${dto.accountDto.name } - +
+ +
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/modal/vendor.jsp b/src/main/webapp/WEB-INF/views/modal/vendor.jsp new file mode 100644 index 0000000..2fa73e5 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/modal/vendor.jsp @@ -0,0 +1,147 @@ +<%@ page contentType="text/html; charset=UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + +
+
+
+
+
+
+ +
+ + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
번호업체명대표번호거래처 담당자거래처 담당자 전화번호선택
${start} ${dto.name }${dto.president_telephone }${dto.vendor_manager }${dto.vendor_manager_telephone }
+
+
+
+
+ +
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/price/read.jsp b/src/main/webapp/WEB-INF/views/price/read.jsp index 9071a73..2418ee8 100644 --- a/src/main/webapp/WEB-INF/views/price/read.jsp +++ b/src/main/webapp/WEB-INF/views/price/read.jsp @@ -11,7 +11,7 @@

제품 상세페이지

- +
@@ -118,6 +118,16 @@ }); }//deletePriceFunction + function goDelete(){ + yesNoModalTextDefine("제품가격 삭제", "해당 제품가격을 삭제하시겠습니까?"); + $("#yesNoModalLabel").text(yesNoModal.title); + $("#yesNoModalBodyTextDiv").text(yesNoModal.body); + yesNoModal.yesFunction = deletePriceFunction; + yesNoModalBootStrap.show(); + + + } + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/product/create.jsp b/src/main/webapp/WEB-INF/views/product/create.jsp index 9e78404..a2f0686 100644 --- a/src/main/webapp/WEB-INF/views/product/create.jsp +++ b/src/main/webapp/WEB-INF/views/product/create.jsp @@ -57,17 +57,15 @@ 거래처 + aria-describedby="button-addon2" readonly> - + - - - + @@ -190,7 +188,7 @@ const data = { name : val}; $.ajax({ type : 'post', // 타입 (get, post, put 등등) - url : '/category/show_modal', // 요청할 서버url + url : '/product/show_modal2', // 요청할 서버url dataType : 'html', // 데이터 타입 (html, xml, json, text 등등) data : data, success : function(result) { // 결과 성공 콜백함수 diff --git a/src/main/webapp/WEB-INF/views/product/read.jsp b/src/main/webapp/WEB-INF/views/product/read.jsp index 46d6994..2cda58f 100644 --- a/src/main/webapp/WEB-INF/views/product/read.jsp +++ b/src/main/webapp/WEB-INF/views/product/read.jsp @@ -11,7 +11,7 @@

제품 상세페이지

- +
@@ -128,7 +128,15 @@ }); }//deleteProductFunction - + function goDelete(){ + yesNoModalTextDefine("제품 삭제", "해당 제품을 삭제하시겠습니까?"); + $("#yesNoModalLabel").text(yesNoModal.title); + $("#yesNoModalBodyTextDiv").text(yesNoModal.body); + yesNoModal.yesFunction = deleteProductFunction; + yesNoModalBootStrap.show(); + + + } \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/product/update.jsp b/src/main/webapp/WEB-INF/views/product/update.jsp index 8f03a25..4e43aa0 100644 --- a/src/main/webapp/WEB-INF/views/product/update.jsp +++ b/src/main/webapp/WEB-INF/views/product/update.jsp @@ -42,15 +42,15 @@ -
- 거래처 - - - - -
+
+ 거래처 + + + +
등록날짜 @@ -61,9 +61,7 @@ - - - +
@@ -188,7 +186,24 @@ alert(error) } }); - } + }//showSearchModal + function showSearchModal2(title, val){ + $("#searchModalLabel").text(title); + const data = { name : val}; + $.ajax({ + type : 'post', // 타입 (get, post, put 등등) + url : '/product/show_modal2', // 요청할 서버url + dataType : 'html', // 데이터 타입 (html, xml, json, text 등등) + data : data, + success : function(result) { // 결과 성공 콜백함수 + $("#search_modal_body").html(result); + searchModalBootStrap.show(); + }, + error : function(request, status, error) { + alert(error) + } + }); + }//showSearchModal2