mirror of
https://github.com/suhf/No1WMS.git
synced 2026-02-05 04:03:45 +09:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
Suh
@@ -56,12 +56,11 @@
|
||||
aria-describedby="basic-addon1">
|
||||
</div>
|
||||
<div class="input-group mb-3 w-40 col-centered">
|
||||
<input type="number" name="kan_code" id="kan_code" class="form-control"
|
||||
<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" id="checkKan"
|
||||
style="background-color:#FF5E5E;" type="button"
|
||||
id="button-addon2">중복확인</button>
|
||||
<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>
|
||||
@@ -94,6 +93,14 @@
|
||||
$("#checkKan").prop("disabled", false);
|
||||
return false;
|
||||
}
|
||||
|
||||
//1이상의 정수만 입력받는다.
|
||||
if (kanCode <= 0){
|
||||
alert("KAN 분류코드는 1 이상의 정수를 입력해주세요");
|
||||
$("#kan_code").focus();
|
||||
$("#checkKan").prop("disabled", false);
|
||||
return false;
|
||||
}
|
||||
|
||||
$.ajax({
|
||||
url: "/category/checkKancode",
|
||||
|
||||
@@ -8,7 +8,13 @@
|
||||
</head>
|
||||
<body>
|
||||
<div class="mt-5 mb-5 text-center">
|
||||
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
115
src/main/webapp/WEB-INF/views/product/list.jsp
Normal file
115
src/main/webapp/WEB-INF/views/product/list.jsp
Normal file
@@ -0,0 +1,115 @@
|
||||
<%@ page contentType="text/html; charset=UTF-8"%>
|
||||
<!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 action="productSearch">
|
||||
<div class="input-group mb-3 w-30 col-centered">
|
||||
<div class="w-25">
|
||||
<select class="form-select">
|
||||
<option selected="selected" value="name">제품명</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="productSearch" 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>
|
||||
<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>
|
||||
<th>담당자</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<c:forEach items="${list }" var="dto">
|
||||
<tr class="detailTr" data-productId="${dto.id}" >
|
||||
<td>${dto.name }</td>
|
||||
<td>${dto.company_name }</td>
|
||||
<!-- <td>${dto.categoryDto.cls_nm_4 }</td>
|
||||
<td>${dto.vendorDto.name }</td>
|
||||
<td>${dto.registration_date }</td>
|
||||
<td>${dto.accountDto.name }</td>-->
|
||||
<td>1</td>
|
||||
<td>2</td>
|
||||
<td>3</td>
|
||||
<td>4</td>
|
||||
</tr>
|
||||
</c:forEach>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container-fluid">
|
||||
<div class="row row-buttons">
|
||||
<div class="col-3 text-start">
|
||||
<img alt="엑셀이미지" src="엑셀이미지">
|
||||
<button type="button" class="btn btn-success" id="uploadExcel">업로드</button>
|
||||
</div>
|
||||
<div class="col-6 d-flex justify-content-center">
|
||||
<nav>
|
||||
<ul class="pagination">
|
||||
<li class="page-item">
|
||||
<a class="page-link" href="#"><</a>
|
||||
</li>
|
||||
<li class="page-item">
|
||||
<a class="page-link" href="#">1</a>
|
||||
</li>
|
||||
<li class="page-item active">
|
||||
<a class="page-link" href="#">2</a>
|
||||
</li>
|
||||
<li class="page-item">
|
||||
<a class="page-link" href="#">3</a>
|
||||
</li>
|
||||
<li class="page-item">
|
||||
<a class="page-link" href="#">4</a>
|
||||
</li>
|
||||
<li class="page-item">
|
||||
<a class="page-link" href="#">5</a>
|
||||
</li>
|
||||
<li class="page-item">
|
||||
<a class="page-link" href="#">6</a>
|
||||
</li>
|
||||
<li class="page-item">
|
||||
<a class="page-link" href="#">></a>
|
||||
</li>
|
||||
</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>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -19,18 +19,18 @@
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="container-fluid">
|
||||
<div class="col-12">
|
||||
<form action="warehouseSearch">
|
||||
<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">
|
||||
<option selected="selected" value="0">창고명</option>
|
||||
<select class="form-select" name="searchn">
|
||||
<option value="0">창고명</option>
|
||||
<option value="1">용량</option>
|
||||
<option value="2">적재량</option>
|
||||
</select>
|
||||
</div>
|
||||
<input type="text" name="warehouseSearch" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
|
||||
<button class="btn btn-info" type="button" id="button-addon2 searchBtn">검색</button>
|
||||
<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>
|
||||
</form>
|
||||
</div>
|
||||
@@ -50,34 +50,43 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
<c:forEach items="${wlist }" var="dto">
|
||||
<tr class="detailTr" data-w_id="${dto.id}" >
|
||||
<tr class="detailTr" data-id="${dto.id}" >
|
||||
<td>${start} <c:set var="start" value="${start +1 }"/></td>
|
||||
<td><a href="read/${dto.id }">
|
||||
${dto.name }</a></td>
|
||||
<td>${dto.name }</td>
|
||||
<td>${dto.capacity }</td>
|
||||
<td>${dto.current_capacity }</td>
|
||||
</tr>
|
||||
</c:forEach>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container-fluid">
|
||||
<div class="row row-buttons">
|
||||
<div class="col-3">
|
||||
|
||||
</div>
|
||||
<div class="col-6 d-flex justify-content-center">
|
||||
<div>
|
||||
<nev>
|
||||
<ul class="pagination">
|
||||
<c:if test="${begin > pageNum }">
|
||||
<a href="list.jsp?p=${begin - 1 }">이전</a>
|
||||
<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">
|
||||
<a href="list.jsp?p=${i }">${i }</a>
|
||||
<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 }">
|
||||
<a href="list.jsp?p=${end + 1 }">다음</a>
|
||||
<li class="page-item">
|
||||
<a class="page-link" href="list?p=${end + 1 }">></a>
|
||||
</li>
|
||||
</c:if>
|
||||
</div>
|
||||
</ul>
|
||||
</nev>
|
||||
</div>
|
||||
<div class="col-3 text-end">
|
||||
<button type="button" class="btn btn-primary" id="createButton">생성</button>
|
||||
@@ -92,8 +101,30 @@
|
||||
</body>
|
||||
|
||||
<script>
|
||||
$("#createButton").on("click", function() {
|
||||
window.location.href = "/warehouse/create";
|
||||
});
|
||||
$(document).ready(function(){
|
||||
$("#createButton").on("click", function() {
|
||||
window.location.href = "/warehouse/create";
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
$("body").on("click", ".detailTr", function(){
|
||||
var id = $(this).data("id");
|
||||
|
||||
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>
|
||||
</html>
|
||||
|
||||
52
src/main/webapp/WEB-INF/views/warehouse/read.jsp
Normal file
52
src/main/webapp/WEB-INF/views/warehouse/read.jsp
Normal file
@@ -0,0 +1,52 @@
|
||||
<%@ page contentType="text/html; charset=UTF-8"%>
|
||||
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>창고 상세페이지</title>
|
||||
<style type="text/css">
|
||||
.header {
|
||||
text-align: center;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="col-12">
|
||||
<div class="col-3">
|
||||
</div>
|
||||
<div class="mt-5 mb-5 col-6 text-center">
|
||||
<h1>제품 카테고리 상세페이지</h1>
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<button type="button" class="btn btn-danger" id="deleteButton">삭제</button>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
$("#deleteButton").on("click", function() {
|
||||
|
||||
var id = $(this).data("id");
|
||||
|
||||
var form = document.createElement("form");
|
||||
form.action = "/warehouse/list";
|
||||
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>
|
||||
</html>
|
||||
Reference in New Issue
Block a user