Merge remote-tracking branch 'origin/master'

This commit is contained in:
Suh
2024-01-12 12:38:08 +09:00
22 changed files with 1112 additions and 352 deletions

View File

@@ -77,17 +77,17 @@
<c:if test="${begin > pageNum }">
<li class="page-item">
<a href="javascript:void(0);" class="page-link" onclick="pageingFunction(this.id)" id="${begin - 1 }">&lt;</a>
<a href="javascript:void(0);" class="page-link" onclick="pagingFunction(this.id)" id="${begin - 1 }">&lt;</a>
</li>
</c:if>
<c:forEach begin="${begin }" end="${end }" var="i">
<li class="page-item <c:if test="${p == i}"> active </c:if>">
<a href="javascript:void(0);" class="page-link " onclick="pageingFunction(this.id); return false;" id="${i }">${i }</a>
<a href="javascript:void(0);" class="page-link " onclick="pagingFunction(this.id); return false;" id="${i }">${i }</a>
</li>
</c:forEach>
<c:if test="${end < totalPages }">
<li class="page-item">
<a href="javascript:void(0);" class="page-link" onclick="pageingFunction(this.id)" id="${end + 1 }">&gt;</a>
<a href="javascript:void(0);" class="page-link" onclick="pagingFunction(this.id)" id="${end + 1 }">&gt;</a>
</li>
</c:if>
</ul>
@@ -168,7 +168,7 @@
});//ready
function pageingFunction(clickedId){
function pagingFunction(clickedId){
var searchn1 = $("#searchn1").val();
var search1 = $("#search1").val();

View File

@@ -21,10 +21,10 @@
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body" id="search_modal_body">
<form action="list">
<form>
<div class="input-group mb-3 w-30 col-centered">
<div class="w-25">
<select class="form-select" name="searchn">
<select class="form-select" name="searchn" id="searchn">
<option selected="selected" value="4">세분류</option>
<option value="1">대분류</option>
<option value="2">중분류</option>
@@ -32,8 +32,14 @@
<option value="0">KAN코드</option>
</select>
</div>
<input type="text" name="search" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
<button class="btn btn-info" type="submit" id="button-addon2 searchBtn">검색</button>
<input type="text" id="search" name="search" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
<button class="btn btn-info" type="button" id="searchBtn">검색</button>
<!-- 페이징작업용 -->
<input type="hidden" id="searchn1" value="${searchn}">
<input type="hidden" id="search1" value="${search}">
<!-- 페이징작업용 -->
</div>
</form>
</div>
@@ -73,22 +79,23 @@
<div class="col-6 d-flex justify-content-center">
<nav>
<ul class="pagination">
<c:if test="${begin > pageNum }">
<li class="page-item">
<a class="page-link" href="list?p=${begin - 1 }"><</a>
</li>
</c:if>
<c:forEach begin="${begin }" end="${end }" var="i">
<li class="page-item <c:if test="${p == i}"> active </c:if>">
<a class="page-link " href="list?p=${i }">${i }</a>
</li>
</c:forEach>
<c:if test="${end < totalPages }">
<li class="page-item">
<a class="page-link" href="list?p=${end + 1 }">></a>
</li>
</c:if>
</ul>
<c:if test="${begin > pageNum }">
<li class="page-item">
<a href="javascript:void(0);" class="page-link" onclick="pagingFunction(this.id)" id="${begin - 1 }">&lt;</a>
</li>
</c:if>
<c:forEach begin="${begin }" end="${end }" var="i">
<li class="page-item <c:if test="${p == i}"> active </c:if>">
<a href="javascript:void(0);" class="page-link " onclick="pagingFunction(this.id); return false;" id="${i }">${i }</a>
</li>
</c:forEach>
<c:if test="${end < totalPages }">
<li class="page-item">
<a href="javascript:void(0);" class="page-link" onclick="pagingFunction(this.id)" id="${end + 1 }">&gt;</a>
</li>
</c:if>
</ul>
</nav>
</div>
</div><!-- row row-buttons -->
@@ -102,13 +109,96 @@
</div>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script>
$(document).ready(function(){
//검색기능
$("#searchBtn").on("click",function(){
var searchn = $("#searchn").val();
var search = $("#search").val();
var existingModal = $("#searchKanModal");
if (existingModal.length === 0) {
$.ajax({
url:"/category/categorysearch",
type:"get",
data: {
"searchn": searchn,
"search": search,
"p": 1,
},
datatype:"html"
}).done(function(data){
$("body").append(data);
$("#searchKanModal").modal("show");
}).fail(function() {
alert("오류가 발생했습니다.");
}).always(function() {
//alert("항상뜨는 창입니다.");
}); } else {
// 이미 생성된 모달이 있을 경우 기존 모달을 열기
existingModal.modal("show");
}
/*
var input1 = document.createElement("input");
input1.type = "hidden";
input1.name = "searchn";
input1.value = searchn;
form.appendChild(input1);
var input2 = document.createElement("input");
input2.type = "hidden";
input2.name = "search";
input2.value = search;
form.appendChild(input2);
var input3 = document.createElement("input");
input3.type = "hidden";
input3.name = "p";
input3.value = 1;
form.appendChild(input3);
document.body.appendChild(form);
form.submit();
*/
});
});//ready
function pagingFunction(clickedId){
var searchn1 = $("#searchn1").val();
var search1 = $("#search1").val();
var form = document.createElement("form");
form.action = "/category/categorysearch";
form.method = "get";
var input1 = document.createElement("input");
input1.type = "hidden";
input1.name = "searchn";
input1.value = searchn1;
form.appendChild(input1);
var input2 = document.createElement("input");
input2.type = "hidden";
input2.name = "search";
input2.value = search1;
form.appendChild(input2);
var input3 = document.createElement("input");
input3.type = "hidden";
input3.name = "p";
input3.value = clickedId;
form.appendChild(input3);
document.body.appendChild(form);
form.submit();
}
</script>
</body>
</html>

View File

@@ -0,0 +1,90 @@
<%@ page contentType="text/html; charset=UTF-8"%>
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>제품 가격 생성</title>
<style>
.col-centered{
margin: 0 auto;
float: none;
}
.col-margin-left-32{
margin-left: 32%;
}
</style>
</head>
<body>
<div class="mt-5 mb-5 text-center">
<h1>제품 가격 생성</h1>
</div>
<hr>
<div style="text-align: center">
<form id="createForm">
<div class="ulTag">
<div class="row">
<div class="col-12" style="text-align: center;">
<div class="input-group mb-3 w-40 col-centered">
<span class="input-group-text" id="basic-addon1">제품명</span>
<input type="text" name="productDto.name" id="productDto.name" class="form-control"
placeholder="제품명을 검색하세요" aria-label="제품명" value="${dto.productDto.name }"
aria-describedby="basic-addon1">
<button class="btn btn-outline-secondary rounded-end" id="searchProductName"
style="background-color:#FF5E5E;" type="button" >검색</button>
<input type='hidden' id='searchProductName' value='0'>
</div>
<!-- 설명만 있는 입력 -->
<div class="input-group mb-3 w-40 col-centered">
<span class="input-group-text" id="basic-addon2">중분류</span>
<input type="text" name="cls_nm_2" id="cls_nm_2" class="form-control"
placeholder="중분류를 입력하세요" aria-label="중분류" value="${dto.cls_nm_2 }"
aria-describedby="basic-addon1">
</div>
<div class="input-group mb-3 w-40 col-centered">
<span class="input-group-text" id="basic-addon3">소분류</span>
<input type="text" name="cls_nm_3" id="cls_nm_3" class="form-control"
placeholder="소분류를 입력하세요" aria-label="소분류" value="${dto.cls_nm_3 }"
aria-describedby="basic-addon1">
</div>
<div class="input-group mb-3 w-40 col-centered">
<span class="input-group-text" id="basic-addon4">세분류</span>
<input type="text" name="cls_nm_4" id="cls_nm_4" class="form-control"
placeholder="세분류를 입력하세요" aria-label="세분류" value="${dto.cls_nm_4 }"
aria-describedby="basic-addon1">
</div>
<div class="input-group mb-3 w-40 col-centered">
<span class="input-group-text" id="basic-addon5">KAN 분류코드</span>
<input type="number" min="1" name="kan_code" id="kan_code" class="form-control"
placeholder="KAN 분류코드를 입력하세요" aria-label="KAN 분류코드" value="${dto.kan_code }"
aria-describedby="button-addon2">
<button class="btn btn-outline-secondary rounded-end" id="checkKan"
style="background-color:#FF5E5E;" type="button" >중복확인</button>
<input type='hidden' id='kan_chack' value='0'>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-12 ">
<div class="w-40 col-centered" style="text-align: right">
<button type="button" class="btn btn-success" id="submitBtn">생성</button>
<button type="button" class="btn btn-secondary" id="cancelBtn">취소</button>
</div>
</div>
</div>
</form>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script>
</script>
</body>
</html>

View File

@@ -0,0 +1,116 @@
<%@ 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"%>
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>제품 가격</title>
</head>
<body>
<div class="mt-5 mb-5 text-center">
<h1>제품 가격 관리</h1>
</div>
<hr>
<div class="body">
<div class="container-fluid">
<div class="col-12">
<form>
<div class="input-group mb-3 w-30 col-centered">
<div class="w-25">
<select class="form-select" name="searchn" id="searchn">
<option selected="selected" value="0">제품명</option>
<option value="1">가격</option>
<option value="2">등록날짜</option>
</select>
</div>
<input type="text" id="search" name="search" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
<button class="btn btn-info" type="button" id="searchBtn">검색</button>
<!-- 페이징작업용 -->
<input type="hidden" id="searchn1" value="${searchn}">
<input type="hidden" id="search1" value="${search}">
<!-- 페이징작업용 -->
</div>
</form>
</div>
</div>
<div class="container-fluid">
<div class="row row-table">
<div class="col-12">
<table class="table">
<thead class="table-dark">
<tr>
<th>번호</th>
<th>제품명</th>
<th>가격</th>
<th>등록날짜</th>
<th>담당자</th>
</tr>
</thead>
<tbody>
<c:forEach items="${list }" var="dto" varStatus="status">
<tr class="detailTr" data-id="${dto.id }" >
<td>${status.count }</td>
<td>${dto.productDto.name }</td>
<td>${dto.price }</td>
<td><fmt:formatDate value="${dto.registration_date }"
dateStyle="short" /></td>
<td>${dto.accountDto.name }</td>
</tr>
</c:forEach>
</tbody>
</table>
</div>
</div>
</div>
<div class="container-fluid">
<div class="row row-buttons">
<div class="col-3 text-start">
</div>
<div class="col-6 d-flex justify-content-center">
<nav>
<ul class="pagination">
<c:if test="${begin > pageNum }">
<li class="page-item">
<a href="javascript:void(0);" class="page-link" onclick="pagingFunction(this.id)" id="${begin - 1 }">&lt;</a>
</li>
</c:if>
<c:forEach begin="${begin }" end="${end }" var="i">
<li class="page-item <c:if test="${p == i}"> active </c:if>">
<a href="javascript:void(0);" class="page-link " onclick="pagingFunction(this.id); return false;" id="${i }">${i }</a>
</li>
</c:forEach>
<c:if test="${end < totalPages }">
<li class="page-item">
<a href="javascript:void(0);" class="page-link" onclick="pagingFunction(this.id)" id="${end + 1 }">&gt;</a>
</li>
</c:if>
</ul>
</nav>
</div>
<div class="col-3 text-end">
<button type="button" class="btn btn-primary" id="createButton">생성</button>
</div>
</div><!-- row row-buttons -->
</div>
</div>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script>
$(document).ready(function(){
//POST방식으로 create폼화면 출력
$("#createButton").on("click",function(){
var form = document.createElement("form");
form.action = "/price/create";
form.method = "POST";
document.body.appendChild(form);
form.submit();
});//createButton
});//ready
</script>
</body>
</html>

View File

@@ -84,86 +84,11 @@
</form>
<!-- 모달화면 -->
<div class="modal fade" id="searchKanModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-xl" >
<div class="modal-content" id="search_modal_content">
<div class="modal-header">
<h1 class="modal-title fs-5" id="searchModalLabel">KAN 분류코드 검색</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body" id="search_modal_body">
<form action="categorySearch">
<div class="input-group mb-3 w-50 col-centered">
<div class="w-25">
<select class="form-select">
<option selected="selected" value="cls_nm_4">세분류</option>
<option value="cls_nm_1">대분류</option>
<option value="cls_nm_2">중분류</option>
<option value="cls_nm_3">세분류</option>
<option value="kan_code">KAN코드</option>
</select>
</div>
<input type="text" name="categorySearch" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
<button class="btn btn-info" type="button" id="button-addon2 searchBtn">검색</button>
</div>
</form>
</div>
<div class="container-fluid">
<div class="row row-table">
<div class="col-12">
<table class="table">
<thead class="table-dark">
<tr>
<th>대분류</th>
<th>중분류</th>
<th>소분류</th>
<th>세분류</th>
<th>KAN코드</th>
</tr>
</thead>
<tbody>
<c:forEach items="${list }" var="dto">
<tr class="detailTr" data-kan_code="${dto.kan_code}" >
<td>${dto.cls_nm_1 }</td>
<td>${dto.cls_nm_2 }</td>
<td>${dto.cls_nm_3 }</td>
<td>${dto.cls_nm_4 }</td>
<td>${dto.kan_code }</td>
</tr>
</c:forEach>
</tbody>
</table>
</div>
</div>
</div>
<div class="modal-footer">
<button id="modal_yes_button" type="button" class="modal_yes btn btn-primary">확인</button>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
</div>
</div>
</div>
</div>
<!-- 스크립트 -->
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script>
$(document).ready(function() {
const searchKanModalBootStrap = new bootstrap.Modal("#searchKanModal");
$("#searchKan").on("click", function(){
searchKanModalBootStrap.show();
});//searchKan
$("#searchVendor").on("click", function(){
searchModalBootStrap.show();
});//searcVendor
$("#submitBtn").on("click", function(){
var name = $("#name").val();
var company_name = $("#company_name").val();
@@ -240,19 +165,34 @@
})
$("#searchKan").on("click", function(){
searchKanCode();
});//searchKan
$("#searchVendor").on("click", function(){
searchModalBootStrap.show();
});//searcVendor
});//ready
function searchKanCode(){
}
function searchKanCode(){
$.ajax({
url:"/category/categorysearch",
type:"get",
datatype:"html"
}).done(function(data){
$("body").append(data);
$("#searchKanModal").modal("show");
}).fail(function() {
alert("오류가 발생했습니다.");
}).always(function() {
//alert("항상뜨는 창입니다.");
});
}
function searchVendor(){
}
});//ready
</script>
</body>

View File

@@ -101,9 +101,34 @@
})//modifyBtn click
yesNoModal.yesFunction = deleteProductFunction;
});//ready
function deleteProductFunction(){
var id = $("#id").val();
$.ajax({
url: "/product/delete",
type: "delete",
data: {
"id": id
},
datatype:"json"
}).done(function(data) {
if (data == true) {
alert("삭제되었습니다.");
$(location).attr("href", "/product/list");
} else {
alert("정상적으로 삭제되지 않았습니다..");
}
}).fail(function() {
alert("오류가 발생했습니다.");
}).always(function() {
//
});
}//deleteCategoryFunction
</script>
</body>
</html>

View File

@@ -32,6 +32,13 @@
<div class="ulTag">
<div class="row">
<div class="col-12" style="text-align: center;">
<-- 세션 만들어지고 value 수정-->
<input type='hidden' id="managerId" value="e9882095-aeb2-11ee-935d-0242ac110006">
<div class="input-group mb-3 w-40 col-centered">
<span class="input-group-text" id="basic-addon1">창고명</span>
<input type="text" name="name" id="name" class="form-control"
@@ -73,6 +80,7 @@
$("#submitBtn").on("click", function(){
var managerId = $("#managerId").val();
var name = $("#name").val();
var capacity = $("#capacity").val();
var address = $("#address").val();
@@ -99,10 +107,11 @@
url: "/warehouse/create_process",
type: "post",
data: {
"managerId" : managerId,
"name": name,
"capacity": capacity,
"address": address,
"activation": true
"address": address
},
datatype:"json"
}).done(function(data) {

View File

@@ -25,19 +25,24 @@
</div>
<div class="row">
<div class="container-fluid">
<div class="col-12" id="search">
<div class="col-12">
<form action="list">
<div class="input-group mb-3 w-30 col-centered">
<div class="w-25">
<select class="form-select" name="searchn">
<select class="form-select" name="searchn" id="searchn">
<option value="0">창고명</option>
<option value="1">용량</option>
<option value="2">적재량</option>
</select>
</div>
<input type="text" name="search" class="form-control"
<input type="text" name="search" id="search" class="form-control"
aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
<input class="btn btn-info" type="submit" id="button-addon2 searchBtn" value="검색"/>
<input class="btn btn-info" type="submit" id="searchBtn" value="검색"/>
<!-- 페이징작업용 -->
<input type="hidden" id="searchn1" value="${searchn}">
<input type="hidden" id="search1" value="${search}">
<!-- 페이징작업용 -->
</div>
</form>
</div>
@@ -57,7 +62,7 @@
</thead>
<tbody>
<c:forEach items="${wlist }" var="dto">
<tr class="detailTr" data-id="${dto.id}" )>
<tr class="detailTr" data-id="${dto.id}">
<td>${start} <c:set var="start" value="${start +1 }"/></td>
<td>${dto.name }</td>
<td>${dto.capacity }</td>
@@ -75,28 +80,29 @@
</div>
<div class="col-6 d-flex justify-content-center">
<nev>
<nav>
<ul class="pagination">
<c:if test="${begin > pageNum }">
<li class="page-item">
<a class="page-link" href="list?p=${begin - 1 }"><</a>
<a href="javascript:void(0);" class="page-link" onclick="pageingFunction(this.id)" id="${begin - 1 }">&lt;</a>
</li>
</c:if>
<c:forEach begin="${begin }" end="${end }" var="i">
<li class="page-item <c:if test="${p == i}"> active </c:if>">
<a class="page-link " href="list?p=${i }">${i }</a>
<a href="javascript:void(0);" class="page-link " onclick="pageingFunction(this.id); return false;" id="${i }">${i }</a>
</li>
</c:forEach>
<c:if test="${end < totalPages }">
<li class="page-item">
<a class="page-link" href="list?p=${end + 1 }">></a>
<a href="javascript:void(0);" class="page-link" onclick="pageingFunction(this.id)" id="${end + 1 }">&gt;</a>
</li>
</c:if>
</ul>
</nev>
</nav>
</div>
<div class="col-3 text-end">
<button type="button" class="btn btn-primary" id="createButton">생성</button>
<button type="button" class="btn btn-primary" onclick="window.location.href='/warehouse/create'">생성</button>
</div>
</div>
</div>
@@ -109,14 +115,7 @@
$(document).ready(function () {
//POST방식으로 create폼화면 출력
$("#createButton").on("click", function () {
var form = document.createElement("form");
form.action = "/warehouse/create";
form.method = "POST";
document.body.appendChild(form);
form.submit();
});
$("body").on("click", ".detailTr", function () {
var id = $(this).data("id");
@@ -135,7 +134,70 @@
form.submit();
});
//검색기능
$("#searchBtn").on("click",function(){
var searchn = $("#searchn").val();
var search = $("#search").val();
var form = document.createElement("form");
form.action = "/warehouse/list";
form.method = "get";
var input1 = document.createElement("input");
input1.type = "hidden";
input1.name = "searchn";
input1.value = searchn;
form.appendChild(input1);
var input2 = document.createElement("input");
input2.type = "hidden";
input2.name = "search";
input2.value = search;
form.appendChild(input2);
var input3 = document.createElement("input");
input3.type = "hidden";
input3.name = "p";
input3.value = 1;
form.appendChild(input3);
document.body.appendChild(form);
form.submit();
});
});//ready
function pageingFunction(clickedId){
var searchn1 = $("#searchn1").val();
var search1 = $("#search1").val();
var form = document.createElement("form");
form.action = "/warehouse/list";
form.method = "get";
var input1 = document.createElement("input");
input1.type = "hidden";
input1.name = "searchn";
input1.value = searchn1;
form.appendChild(input1);
var input2 = document.createElement("input");
input2.type = "hidden";
input2.name = "search";
input2.value = search1;
form.appendChild(input2);
var input3 = document.createElement("input");
input3.type = "hidden";
input3.name = "p";
input3.value = clickedId;
form.appendChild(input3);
document.body.appendChild(form);
form.submit();
}
</script>
</body>
</html>

View File

@@ -18,56 +18,57 @@
<div class="row">
<h1>창고 상세페이지</h1>
<div class="col-10" style="text-align: right;">
<button type="button" class="btn btn-danger" id="yes_no_modal_show_button">삭제</button>
<button type="button" class="btn btn-danger" id="yes_no_modal_show">삭제</button>
</div>
</div>
</div>
<hr>
<div style="text-align: center">
<form>
<div class="container">
<div class="row">
<div class="input-group mb-3 w-40 col-4">
<span class="input-group-text" id="basic-addon1">창고명</span>
<input type="text" class="form-control" aria-label="창고명" value="${One.name }" readonly>
</div>
<div class="input-group mb-3 w-40 col-4">
<span class="input-group-text" id="basic-addon2">용적</span>
<input type="text" class="form-control" aria-label="용적" value="${One.capacity }" readonly>
</div>
<div class="input-group mb-3 w-40 col-4">
<span class="input-group-text" id="basic-addon3">적재량</span>
<input type="text" class="form-control" aria-label="적재량" value="${One.currentCapacity }" readonly>
</div>
<div class="container">
<div class="row">
<div class="input-group mb-3 w-40 col-4">
<span class="input-group-text" id="basic-addon1">창고명</span>
<input type="text" class="form-control" aria-label="창고명" value="${One.name }" readonly>
</div>
<div class="input-group mb-3 w-40 col-4">
<span class="input-group-text" id="basic-addon2">용적</span>
<input type="text" class="form-control" aria-label="용적" value="${One.capacity }" readonly>
</div>
<div class="input-group mb-3 w-40 col-4">
<span class="input-group-text" id="basic-addon3">적재량</span>
<input type="text" class="form-control" aria-label="적재량" value="${One.currentCapacity }" readonly>
</div>
</div>
<div>
<hr>
</div>
</div>
<div>
<hr>
</div>
<div id="productSearch">
<div class="container-fluid">
<div class="col-12" id="search">
<form action="list">
<div class="input-group mb-3 w-30 col-centered">
<div class="w-25">
<select class="form-select" name="searchn">
<option value="0">제품명</option>
<option value="1">재고수</option>
</select>
</div>
<input type="text" name="search" class="form-control"
aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
<input class="btn btn-info" type="submit" id="button-addon2 searchBtn" value="검색"/>
<div class="col-12">
<div class="input-group mb-3 w-30 col-centered">
<div class="w-25">
<select class="form-select" id="searchn">
<option value="0">제품명</option>
<option value="1">재고수</option>
</select>
</div>
</form>
<input type=hidden id="id" value="${One.id}">
<input type="text" name="search" class="form-control" id="search"
aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
<input class="btn btn-info" type="submit" id="searchBtn" value="검색"/>
</div>
</div>
</div>
<div class="container-fluid">
<div class="row row-table">
<div class="col-12">
<div id="searchResults" class="col-12">
<table class="table">
<thead class="table-dark">
<tr>
@@ -115,29 +116,46 @@
</ul>
</nev>
</div>
<div class="col-3 ">
<div class="w-40 col-centered" style="text-align: right">
<button type="button" class="btn btn-primary" id="checkBtn">확인</button>
<button type="button" class="btn btn-warning" id="modifyBtn">수정</button>
</div>
</div>
</div>
</div>
</form>
</div>
<div class="align: center">
<div class="w-40 col-centered" style="text-align: right">
<button type="button" class="btn btn-primary" id="checkBtn">확인</button>
<button type="button" class="btn btn-warning" id="modifyBtn">
수정
</button>
</div>
</div>
</div>
<div class="modal fade" id="yes_no_modal_delete" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-5" id="yesNoModalLabel">삭제 하시겠습니까?</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
<button id="modal_yes_button_warehouse_delete" type="button" class="modal_yes btn btn-primary">삭제</button>
</div>
</div>
</div>
</div>
<script>
$(document).ready(function() {
$("#checkBtn").on("click", function() {
$(document).ready(function () {
$("#checkBtn").on("click", function () {
$(location).attr("href", "/warehouse/list");
})//checkBtn click
$("#modifyBtn").on("click", function() {
var id = $("#id").val();
var form = document.createElement("form");
form.action = "/warehouse/update";
form.method = "GET";
form.method = "POST";
document.body.appendChild(form);
var input = document.createElement("input");
@@ -150,25 +168,82 @@
})//modifyBtn click
yesNoModal.yesFunction = deleteCategoryFunction;
function deleteCategoryFunction(){
var id = $("#id").val();
$.ajax({
url: "/warehouse/delete",
type: "delete",
data: {
"id": id
},
datatype:"json"
}).done(function(data) {
if (data == true) {
alert("삭제되었습니다.");
$(location).attr("href", "/warehouse/list");
} else {
alert("정상적으로 삭제되지 않았습니다..");
}
}).fail(function() {
alert("오류가 발생했습니다.");
}).always(function() {
//
});
}//deleteCategoryFunction
const yesNoModalBootStrap = new bootstrap.Modal("#yes_no_modal_delete");
$("#yes_no_modal_show").on("click", function(){
yesNoModalBootStrap.show();
});
$("#modal_yes_button_warehouse_delete").on("click", function(){
yesNoModal.yesFunction();
yesNoModalBootStrap.hide();
});
// 검색 버튼 클릭 시 Ajax로 검색 결과를 갱신
$("#searchBtn").click(function () {
var search = $("#search").val();
var searchn = $("#searchn").val();
var id = $("#id").val();
$.ajax({
url: "read.jsp",
method: "POST",
data: {
search: search,
searchn: searchn,
id: id
},
success: function (result) {
// 검색 결과를 받아와서 결과를 보여주는 영역 업데이트
$("#searchResults").html(result);
},
error: function () {
alert("검색 중 오류가 발생했습니다.");
}
});
});
});//ready
$(function () {
$("a[id]").click(function () {
let no = $(this).attr("id");// 글번호
$.ajax({
url: "/deleteWarehouse/delete",
data: "id=" + id,
method: "delete"
}
).done(function () {
alert("삭제되었습니다.");
location.href = "/warehouse/list";
})
return false;//하이퍼링크 이동 X
})//click
})
</script>
</body>
</html>

View File

@@ -1,154 +1,164 @@
<%@ 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"%>
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>제품 카테고리 수정페이지</title>
<title>창고 정보 수정페이지</title>
<style>
.body{
text-align: center;
}
.col-centered{
margin: 0 auto;
float: none;
}
.col-margin-left-32{
margin-left: 32%;
}
</style>
</head>
<body>
<div class="mt-5 mb-5 text-center">
<h1>제품 카테고리 수정페이지</h1>
<h1>창고 정보 수정페이지</h1>
</div>
<hr>
<div style="text-align: center">
<form>
<%-- <div class="ulTag">--%>
<%-- <div class="row">--%>
<%-- <div class="col-12" style="text-align: center;">--%>
<%-- <div class="input-group mb-3 w-40 col-centered">--%>
<%-- <span class="input-group-text" id="basic-addon1">대분류</span> <input--%>
<%-- type="text" class="form-control" placeholder="대분류" id="cls_nm_1"--%>
<%-- aria-label="대분류" value="${dto.cls_nm_1 }">--%>
<%-- </div>--%>
<form id="createForm">
<%-- <div class="input-group mb-3 w-40 col-centered">--%>
<%-- <span class="input-group-text" id="basic-addon2">중분류</span> <input--%>
<%-- type="text" class="form-control" placeholder="중분류" id="cls_nm_2"--%>
<%-- aria-label="중분류" value="${dto.cls_nm_2 }">--%>
<%-- </div>--%>
<div class="ulTag">
<div class="row">
<div class="col-12" style="text-align: center;">
<%-- <div class="input-group mb-3 w-40 col-centered">--%>
<%-- <span class="input-group-text" id="basic-addon3">소분류</span> <input--%>
<%-- type="text" class="form-control" placeholder="소분류" id="cls_nm_3"--%>
<%-- aria-label="소분류" value="${dto.cls_nm_3 }">--%>
<%-- </div>--%>
<%-- <div class="input-group mb-3 w-40 col-centered">--%>
<%-- <span class="input-group-text" id="basic-addon4">세분류</span> <input--%>
<%-- type="text" class="form-control" placeholder="세분류" id="cls_nm_4"--%>
<%-- aria-label="세분류" value="${dto.cls_nm_4 }">--%>
<%-- </div>--%>
<div class="input-group mb-3 w-40 col-centered">
<span class="input-group-text" id="basic-addon1">창고명</span>
<input type="text" name="name" id="name" class="form-control"
placeholder="창고명을 입력하세요" aria-label="창고명" value="${dto.name }"
aria-describedby="basic-addon1">
</div>
<!-- 설명만 있는 입력 -->
<div class="input-group mb-3 w-40 col-centered">
<span class="input-group-text" id="basic-addon2">용적</span>
<input type="text" name="capacity" id="capacity" class="form-control"
placeholder="용적을 입력하세요" aria-label="용적" value="${dto.capacity }"
aria-describedby="basic-addon1">
</div>
<%-- <div class="input-group mb-3 w-40 col-centered">--%>
<%-- <span class="input-group-text" id="basic-addon5">KAN 코드</span> <input--%>
<%-- type="text" class="form-control" placeholder="KAN 코드"--%>
<%-- aria-label="KAN 코드" value="${dto.kan_code }" id="kan_code" readonly>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </div>--%>
<div class="input-group mb-3 w-40 col-centered">
<span class="input-group-text" id="basic-addon3">주소</span>
<input type="text" name="address" id="address" class="form-control"
placeholder="주소를 입력하세요" aria-label="주소" value="${dto.address }"
aria-describedby="basic-addon1">
</div>
<%-- <div class="row">--%>
<%-- <div class="col-12 ">--%>
<%-- <div class="w-40 col-centered" style="text-align: right">--%>
<%-- <button type="button" class="btn btn-primary" id="updateBtn">수정 완료</button>--%>
<%-- <button type="button" class="btn btn-secondary" id="cancelBtn">취소</button>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </div>--%>
<input type="hidden" name="name" id="id" class="form-control"
placeholder="창고명을 입력하세요" aria-label="창고명" value="${dto.id }"
aria-describedby="basic-addon1">
</div>
</div>
</div>
<div class="row">
<div class="col-12 ">
<div class="w-40 col-centered" style="text-align: right">
<button type="button" class="btn btn-primary" id="updateBtn">수정 완료</button>
<button type="button" class="btn btn-secondary" id="cancelBtn">취소</button>
</div>
</div>
</div>
</form>
</div>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script>
// $(document).ready(function() {
// $("#updateBtn").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 kan_code = $("#kan_code").val();
// if(!clsnm1){
// alert("대분류를 입력해야 합니다.");
// $("#cls_nm_1").focus();
// return false;
// }
// if(!clsnm2){
// alert("중분류를 입력해야 합니다.");
// $("#cls_nm_2").focus();
// return false;
// }
// if(!clsnm3){
// alert("소분류를 입력해야 합니다.");
// $("#cls_nm_3").focus();
// return false;
// }
// if(!clsnm4){
// alert("세분류를 입력해야 합니다.");
// $("#cls_nm_4").focus();
// return false;
// }
//
// $.ajax({
// url: "/category/update_process",
// type: "put",
// data: {
// "cls_nm_1": clsnm1,
// "cls_nm_2": clsnm2,
// "cls_nm_3": clsnm3,
// "cls_nm_4": clsnm4,
// "kan_code": kan_code,
// "activation": true
// },
// datatype:"json"
// }).done(function(data) {
// if (data == true) {
// alert("카테고리를 수정하였습니다.");
//
// var form = document.createElement("form");
// form.action = "/category/read";
// form.method = "POST";
// document.body.appendChild(form);
//
// var input = document.createElement("input");
// input.type = "hidden";
// input.name = "kan_code";
// input.value = kan_code;
// form.appendChild(input);
//
// form.submit();
// } else {
// alert("카테고리 수정에 실패하였습니다.");
// }
// }).fail(function() {
// alert("오류가 발생했습니다.");
// }).always(function() {
// //
// });
//
// });//updateBtn
//
// $("#cancelBtn").on("click", function(){
// var kan_code = $("#kan_code").val();
//
// var form = document.createElement("form");
// form.action = "/category/read";
// form.method = "POST";
// document.body.appendChild(form);
//
// var input = document.createElement("input");
// input.type = "hidden";
// input.name = "kan_code";
// input.value = kan_code;
// form.appendChild(input);
//
// form.submit();
//
// })
$(document).ready(function() {
$("#updateBtn").on("click", function() {
var name = $("#name").val();
var capacity = $("#capacity").val();
var address = $("#address").val();
var id = $("#id").val();
if(!name){
alert("창고명을 입력해야 합니다.");
$("#name").focus();
return false;
}
if(!capacity){
alert("용적크기를 입력해야 합니다.");
$("#capacity").focus();
return false;
}
if(!address){
alert("소를 입력해야 합니다.");
$("#address").focus();
return false;
}
$.ajax({
url: "/warehouse/update_process",
type: "put",
data: {
"name": name,
"capacity": capacity,
"address": address,
"id": id
},
datatype:"json"
}).done(function(data) {
if (data == true) {
alert("창고를 수정하였습니다.");
var form = document.createElement("form");
form.action = "/warehouse/read";
form.method = "POST";
document.body.appendChild(form);
var input = document.createElement("input");
input.type = "hidden";
input.name = "id";
input.value = id;
form.appendChild(input);
form.submit();
} else {
alert("카테고리 수정에 실패하였습니다.");
}
}).fail(function() {
alert("오류가 발생했습니다.");
}).always(function() {
//
});
});//updateBtn
$("#cancelBtn").on("click", function(){
var id = $("#id").val();
var form = document.createElement("form");
form.action = "/warehouse/read";
form.method = "POST";
document.body.appendChild(form);
var input = document.createElement("input");
input.type = "hidden";
input.name = "id";
input.value = id;
form.appendChild(input);
form.submit();
})
});//ready
</script>
</body>
</html>