github-mirrors/No1WMS
1
0
Fork 0
mirror of https://github.com/suhf/No1WMS.git synced 2026-02-05 04:03:45 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
sungsu
2024-01-11 00:17:08 +09:00
parent 9a761e7728 93e55e26ec
commit 4b1c006adc
11 changed files with 723 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/webapp/WEB-INF/views/category/create.jsp
View File

@@ -5,9 +5,6 @@
<meta charset="UTF-8">
<title>카테고리 생성</title>
<style>
.body{
text-align: center;
}
.col-centered{
margin: 0 auto;
float: none;
@@ -56,8 +53,9 @@
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 }"
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>

259
src/main/webapp/WEB-INF/views/product/create.jsp Normal file
View File

@@ -0,0 +1,259 @@
<%@ 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>
<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="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="company_name" id="company_name" class="form-control"
placeholder="회사명을 입력하세요(선택)" aria-label="회사명" value="${dto.company_name }"
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="number" min="1" name="cls_nm_4" id="cls_nm_4" class="form-control"
placeholder="KAN 분류코드를 입력하세요(모달이 만들어지면 분류로 바꿀예정)" aria-label="분류"
aria-describedby="button-addon2">
<button class="btn btn-outline-secondary rounded-end" id="searchKan"
style="background-color:#FF5E5E;" type="button" >검색</button>
<input type='hidden' id='searchKanChack' value='0'>
</div>
<div class="input-group mb-3 w-40 col-centered">
<span class="input-group-text" id="basic-addon4">거래처</span>
<input type="text" name="vendor" id="vendor" class="form-control"
placeholder="거래처를 입력하세요" aria-label="거래처"
aria-describedby="button-addon2">
<button class="btn btn-outline-secondary rounded-end" id="searchVendor"
style="background-color:#FF5E5E;" type="button" >검색</button>
<input type='hidden' id='searchVendorChack' value='0'>
</div>
<!-- 추후 수정 -->
<input type='hidden' id="manager_id" value="83bdda69-ae95-11ee-935d-0242ac110006">
<input type='hidden' id="vendor_id" value="">
<input type='hidden' id="kan_code" value="">
<!-- 추후 수정 -->
</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>
<!-- 모달화면 -->
<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();
var kan_code = $("#cls_nm_4").val();// 수정해야함.
var vendor = $("#vendor").val();
var manager_id = $("#manager_id").val();
if(!name){
alert("제품명을 입력해야 합니다.");
$("#name").focus();
return false;
}
if(!company_name){
company_name = "미지정";
}
if(!kan_code){
alert("KAN 분류코드를 입력해야 합니다.");
$("#kan_code").focus();
return false;
}
if(!vendor){
alert("거래처를 입력해야 합니다.");
$("#vendor").focus();
return false;
}
$.ajax({
url: "/product/create_process",
type: "post",
data: {
"name": name,
"company_name": company_name,
"kan_code": kan_code,
"vendor_id": vendor, // 추후 수정해야함.
"manager_id": manager_id,
"activation": true
},
datatype:"json"
}).done(function(data) {
if (data == true) {
alert("제품을 추가했습니다.");
$(location).attr("href", "/product/list");
//생각해서 바꿔야함.
// 조건 : DB에서 생성되는 uuid를 어떻게 자바스크립트에서 가져올것인지 궁리.
/*
var form = document.createElement("form");
form.action = "/product/read";
form.method = "POST";
document.body.appendChild(form);
var input = document.createElement("input");
input.type = "hidden";
input.name = "id";
input.value = data.id;
form.appendChild(input);
form.submit();
*/
} else {
alert("제품 추가에 실패하였습니다.");
}
}).fail(function() {
alert("오류가 발생했습니다.");
}).always(function() {
//
});
});
$("#cancelBtn").on("click", function(){
$(location).attr("href", "/product/list");
})
});//ready
function searchKanCode(){
}
function searchVendor(){
}
</script>
</body>
</html>

69
src/main/webapp/WEB-INF/views/product/list.jsp
View File

@@ -1,4 +1,6 @@
<%@ 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>
@@ -39,7 +41,7 @@
<tr>
<th>제품명</th>
<th>회사명</th>
<th>소분류</th>
<th>분류</th>
<th>거래처</th>
<th>등록날짜</th>
<th>담당자</th>
@@ -47,17 +49,14 @@
</thead>
<tbody>
<c:forEach items="${list }" var="dto">
<tr class="detailTr" data-productId="${dto.id}" >
<tr class="detailTr" data-product_id="${dto.id}" >
<td>${dto.name }</td>
<td>${dto.company_name }</td>
<!-- <td>${dto.categoryDto.cls_nm_4 }</td>
<td>${dto.categoryDto.cls_nm_4 }</td>
<td>${dto.vendorDto.name }</td>
<td>${dto.registration_date }</td>
<td>${dto.accountDto.name }</td>-->
<td>3</td>
<td>4</td>
<td>5</td>
<td>6</td>
<td><fmt:formatDate value="${dto.registration_date }"
dateStyle="short" /></td>
<td>${dto.accountDto.name }</td>
</tr>
</c:forEach>
</tbody>
@@ -66,11 +65,10 @@
</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>
@@ -78,10 +76,10 @@
<li class="page-item">
<a class="page-link" href="#">&lt;</a>
</li>
<li class="page-item">
<li class="page-item active">
<a class="page-link" href="#">1</a>
</li>
<li class="page-item active">
<li class="page-item">
<a class="page-link" href="#">2</a>
</li>
<li class="page-item">
@@ -103,13 +101,54 @@
</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" 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 = "/product/create";
form.method = "POST";
document.body.appendChild(form);
form.submit();
});//createButton
$("body").on("click", ".detailTr", function(){
var product_id = $(this).data("product_id");
//console.log(product_id);
var form = document.createElement("form");
form.action = "/product/read";
form.method = "POST";
document.body.appendChild(form);
var input = document.createElement("input");
input.type = "hidden";
input.name = "id";
input.value = product_id;
form.appendChild(input);
form.submit();
});
});//ready
</script>
</body>
</html>

109
src/main/webapp/WEB-INF/views/product/read.jsp Normal file
View File

@@ -0,0 +1,109 @@
<%@ 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">
<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>
<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="제품명"
aria-label="제품명" value="${dto.name }" readonly>
</div>
<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="회사명"
aria-label="회사명" value="${dto.company_name }" readonly>
</div>
<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="분류"
aria-label="분류" value="${dto.categoryDto.cls_nm_4 }" readonly>
</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="거래처"
aria-label="거래처" value="${dto.vendorDto.name }" readonly>
</div>
<div class="input-group mb-3 w-40 col-centered">
<span class="input-group-text" id="basic-addon5">등록날짜</span> <input
type="text" class="form-control" placeholder="등록날짜"
aria-label="KAN 코드" value="${dto.registration_date }" readonly>
</div>
<div class="input-group mb-3 w-40 col-centered">
<span class="input-group-text" id="basic-addon6">담당자</span> <input
type="text" class="form-control" placeholder="담당자"
aria-label="담당자" value="${dto.accountDto.name }" id="kan_code" readonly>
</div>
<input type='hidden' id="id" value="${dto.id }">
</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="checkBtn">확인</button>
<button type="button" class="btn btn-warning" id="modifyBtn">수정</button>
</div>
</div>
</div>
</form>
</div>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script>
$(document).ready(function() {
$("#checkBtn").on("click", function() {
$(location).attr("href", "/product/list");
})//checkBtn click
$("#modifyBtn").on("click", function() {
var id = $("#id").val();
var form = document.createElement("form");
form.action = "/product/update";
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();
})//modifyBtn click
});//ready
</script>
</body>
</html>

189
src/main/webapp/WEB-INF/views/product/update.jsp Normal file
View File

@@ -0,0 +1,189 @@
<%@ page contentType="text/html; charset=UTF-8"%>
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Insert title here</title>
</head>
<body>
<div class="mt-5 mb-5 text-center">
<div class="row">
<h1>제품 수정</h1>
</div>
</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" name="newProductName" placeholder="제품명을 입력하세요"
aria-label="제품명" id="name" value="${dto.name }">
</div>
<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" name="newCompanyName" placeholder="회사명을 입력하세요(선택)"
aria-label="회사명" id="company_name" value="${dto.company_name }">
</div>
<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" name="newCategory" placeholder="분류를 입력해도 바뀌는건 없습니다 ㅎㅎ(수정예정)"
aria-label="분류" id="cls_nm_4" value="${dto.categoryDto.cls_nm_4 }">
<button class="btn btn-outline-secondary rounded-end" id="searchKan"
style="background-color:#FF5E5E;" type="button" >검색</button>
<input type='hidden' id='searchKanChack' value='0'>
</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" name="newVendor" placeholder="거래처를 입력해도 바뀌는 건 없습니다."
aria-label="거래처" id="vendor" value="${dto.vendorDto.name }">
<button class="btn btn-outline-secondary rounded-end" id="searchVendor"
style="background-color:#FF5E5E;" type="button" >검색</button>
<input type='hidden' id='searchVendorChack' value='0'>
</div>
<div class="input-group mb-3 w-40 col-centered">
<span class="input-group-text" id="basic-addon5">등록날짜</span>
<input type="text" class="form-control" name="newRegistrationDate"
aria-label="등록날짜" readonly id="registration_date" value="${dto.registration_date } (자동)">
</div>
<input type='hidden' id="id" value="${dto.id }">
<!-- 추후 수정 -->
<input type='hidden' id="manager_id" value="83bdda69-ae95-11ee-935d-0242ac110006">
<input type='hidden' id="vendor_id" value="${dto.vendor_id }">
<input type='hidden' id="kan_code" value="${dto.kan_code }">
<!-- 추후 수정 -->
</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="submitBtn">수정 완료</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() {
$("#cancelBtn").on("click", function(){
var id = $("#id").val();
var form = document.createElement("form");
form.action = "/product/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();
})//cancelBtn
$("#submitBtn").on("click", function(){
var name = $("#name").val();
var company_name = $("#company_name").val();
var kan_code = $("#kan_code").val();
var vendor_id = $("#vendor_id").val();
var manager_id = $("#manager_id").val();
var id = $("#id").val();
if(!name){
alert("제품명을 입력해야 합니다.");
$("#name").focus();
return false;
}
if(!company_name){
company_name = "미지정";
}
if(!kan_code){
alert("KAN 분류코드를 입력해야 합니다.");
//$("#kan_code").focus();
return false;
}
if(!vendor_id){
alert("거래처를 입력해야 합니다.");
//$("#vendor").focus();
return false;
}
console.log(name);
console.log(company_name);
console.log(kan_code);
console.log(vendor_id);
console.log(manager_id);
console.log(id);
$.ajax({
url: "/product/update_process",
type: "put",
data: {
"id":id,
"name": name,
"company_name": company_name,
"kan_code": kan_code,
"vendor_id": vendor_id,
"manager_id": manager_id,
"activation": true
},
datatype:"json"
}).done(function(data) {
if (data == true) {
alert("제품을 수정했습니다.");
//$(location).attr("href", "/product/list");
var form = document.createElement("form");
form.action = "/product/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() {
//
});
});//submitBtn
});//ready
</script>
</body>
</html>