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

#update

Browse Source
This commit is contained in:
sungsu
2024-01-21 23:25:34 +09:00
parent 75b5155ee7
commit c4776ac8a2
22 changed files with 215 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/webapp/WEB-INF/views/out/create.jsp
View File

@@ -108,14 +108,14 @@
$("#submitBtn").on("click", function () {
var product_id = $("#product_id").val();
var quantity = $("#quantity").val();
var quantity = parseInt($("#quantity").val(), 10);
var expected_delivery_date = $("#expected_delivery_date").val();
var delivery_date = $("#delivery_date").val();
var warehouse_id = $("#warehouse_id").val();
var manager_id = $("#manager_id").val();
var note = $("#note").val();
var activation = $("#activation").val();
var shipment_quantity = $("#shipment_quantity").val();
var shipment_quantity = parseInt($("#shipment_quantity").val(), 10);
if (!product_id) {

6
src/main/webapp/WEB-INF/views/out/list.jsp
View File

@@ -30,12 +30,12 @@
<div class="input-group mb-3 w-30 col-centered">
<div class="w-25">
<select class="form-select" name="searchn" id="searchn">
<option value="0">제품명</option>
<option value="1">창고명</option>
<option value="0" ${searchn == 0 ? 'selected' : ''}>제품명</option>
<option value="1" ${searchn == 1 ? 'selected' : ''}>창고명</option>
</select>
</div>
<input type="text" name="search" id="search" class="form-control"
aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
aria-label="Text input with dropdown button" value="${search}" placeholder="검색어를 입력하세요">
<input class="btn btn-info" type="submit" id="searchBtn" value="검색"/>
<!-- 페이징작업용 -->

19
src/main/webapp/WEB-INF/views/out/read.jsp
View File

@@ -60,7 +60,7 @@
<div class="input-group mb-3 w-40 col-centered">
<span id='note_label' class="input-group-text">비고</span>
<textarea readonly id="note" class="form-control" rows="5" value="${dto.note}"></textarea>
<textarea readonly id="note" class="form-control" rows="5">${dto.note}</textarea>
</div>
@@ -68,7 +68,7 @@
</div>
</div>
<div class="row col-12">
<div class="col-6 ">
<div class="col-6" id="onoff">
<div class="w-40 col-centered" style="text-align: right">
<button type="button" class="btn btn-danger" id="outNow">출고</button>
</div>
@@ -109,7 +109,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
<button id="modal_yes_button_outNow" type="button" class="modal_yes btn btn-primary">삭제</button>
<button id="modal_yes_button_outNow" type="button" class="modal_yes btn btn-primary">출고</button>
</div>
</div>
</div>
@@ -137,6 +137,13 @@
$(document).ready(function () {
var deliveryDate = $("#delivery_date").val();
// '출고 날짜' 입력 필드에 값이 있다면, '출고' 버튼을 숨깁니다.
if (deliveryDate) {
$("#outNow").hide();
}
$("#modifyBtn").on("click", function () {
var id = $("#id").val();
@@ -207,6 +214,9 @@
function outNowUpdate() {
var id = $("#id").val();
var quantity = $("#quantity").val();
var product_id = $("#product_id").val()
var warehouse_id = $("#warehouse_id").val();
var expected_delivery_date = $("#expected_delivery_date").val();
// 현재 날짜와 시간을 얻기
var now = new Date();
@@ -217,6 +227,9 @@
type: "put",
data: {
"id": id,
"quantity": quantity,
"product_id":product_id,
"warehouse_id": warehouse_id,
"expected_delivery_date": expected_delivery_date,
"delivery_date": delivery_date
},

2
src/main/webapp/WEB-INF/views/out/update.jsp
View File

@@ -59,7 +59,7 @@
<div class="input-group mb-3 w-40 col-centered">
<span id='note_label' class="input-group-text">비고</span>
<textarea id="note" class="form-control" rows="5" value="${note}"></textarea>
<textarea id="note" class="form-control" rows="5">${dto.note}</textarea>
</div>

32
src/main/webapp/WEB-INF/views/stock/create.jsp
View File

@@ -54,7 +54,7 @@
<div class="input-group mb-3 w-40 col-centered">
<span id='RemainingCapacity_label' class="input-group-text">잔여 용량</span>
<input readonly id="remainingcapacity" type="text" placeholder="" value="${dto.capacity - dto.current_capacity}" class="form-control">
<input readonly id="remainingcapacity" type="text" placeholder="" class="form-control">
</div>
@@ -62,13 +62,15 @@
<div class="input-group mb-3 w-40 col-centered">
<span class="input-group-text" id="basic-addon4">재고량</span>
<input type="text" name="quantity" id="quantity" class="form-control"
placeholder="재고량을 입력하세요" aria-label="재고량" value="${dto.quantity }"
placeholder="재고량을 입력하세요" aria-label="재고량"
aria-describedby="basic-addon1">
</div>
</div>
</div>
</div>
@@ -103,15 +105,16 @@
}
function showSearchModals2(title, val){
$("#searchModalLabel").text(title);
const data = { name : val};
var product_id = $("#product_id").val();
$("#searchModalLabel").text(title);
const data = { name : val,
product_id :product_id};
$.ajax({
type : 'post', // 타입 (get, post, put 등등)
url : '/stock/show_modal', // 요청할 서버url
dataType : 'html', // 데이터 타입 (html, xml, json, text 등등)
data : {"product_id" : product_id},data,
data : data,
success : function(result) { // 결과 성공 콜백함수
$("#search_modal_body").html(result);
searchModalBootStrap.show();
@@ -129,9 +132,18 @@
$("#submitBtn").on("click", function () {
var product_id = $("#product_id").val();
var warehouse_id = $("#warehouse_id").val();
var quantity = $("#quantity").val();
var activation = $("#activation").val();
var remainingcapacity = $("#remainingcapacity").val();
var quantity = parseInt($("#quantity").val(), 10);
var remainingcapacity = parseInt($("#remainingcapacity").val(), 10);
console.log("Quantity:", quantity);
console.log("Remaining Capacity:", remainingcapacity);
if (quantity > remainingcapacity) {
alert("적재 할 재고량이 잔여 용량을 넘을 수 없습니다.");
$("#quantity").focus();
return false;
}
if (!product_id) {
alert("제품을 선택해야 합니다.");
@@ -150,12 +162,6 @@
return false;
}
if (quantity > remainingcapacity) {
alert("적재 할 재고량이 잔여 용량을 넘을 수 없습니다.");
$("#quantity").focus();
return false;
}
$.ajax({
url: "/stock/create_process",
type: "post",

20
src/main/webapp/WEB-INF/views/stock/list.jsp
View File

@@ -48,13 +48,14 @@
<div class="input-group mb-3 w-30 col-centered">
<div class="w-25">
<select class="form-select" name="searchn1" id="searchn1">
<option value="0">제품명</option>
<option value="1">카테고리</option>
<option value="2">재고수</option>
<option value="0" ${searchn == 0 ? 'selected' : ''}>제품명</option>
<option value="1" ${searchn == 1 ? 'selected' : ''}>카테고리</option>
<option value="2" ${searchn == 2 ? 'selected' : ''}>재고수</option>
<option value="3" ${searchn == 3 ? 'selected' : ''}>창고명</option>
</select>
</div>
<input type="text" id="search1" name="search" class="form-control"
aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
aria-label="Text input with dropdown button" value="${search}" placeholder="검색어를 입력하세요">
<button class="btn btn-info" type="button" id="searchBtn">검색</button>
<!-- 페이징작업용 -->
@@ -98,7 +99,6 @@
<div class="row row-buttons">
<div class="col-3 text-start">
<img width="50" height="50" src="https://img.icons8.com/color/48/ms-excel.png" alt="ms-excel"/>
<button type="button" class="btn btn-success" id="downlodeStockForm">서식 다운로드</button>
<button type="button" class="btn btn-success" id="downlodeExcelList">리스트 다운로드</button>
</div>
<div class="col-6 d-flex justify-content-center">
@@ -147,13 +147,14 @@
<div class="input-group mb-3 w-30 col-centered">
<div class="w-25">
<select class="form-select" name="searchn" id="searchn2">
<option value="0">제품명</option>
<option value="1">카테고리</option>
<option value="2">재고수</option>
<option value="0" ${searchn == 0 ? 'selected' : ''}>제품명</option>
<option value="1" ${searchn == 1 ? 'selected' : ''}>카테고리</option>
<option value="2" ${searchn == 2 ? 'selected' : ''}>재고수</option>
<option value="3" ${searchn == 3 ? 'selected' : ''}>창고명</option>
</select>
</div>
<input type="text" id="search2" name="search" class="form-control"
aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
aria-label="Text input with dropdown button" value="${search}" placeholder="검색어를 입력하세요">
<button class="btn btn-info" type="button" id="searchBtn2">검색</button>
<!-- 페이징작업용 -->
@@ -195,7 +196,6 @@
<div class="row row-buttons">
<div class="col-3 text-start">
<img width="50" height="50" src="https://img.icons8.com/color/48/ms-excel.png" alt="ms-excel"/>
<button type="button" class="btn btn-success" id="downlodeStockForm2">서식 다운로드</button>
<button type="button" class="btn btn-success" id="downlodeExcelList2">리스트 다운로드</button>
</div>
<div class="col-6 d-flex justify-content-center">

8
src/main/webapp/WEB-INF/views/stock/update.jsp
View File

@@ -39,7 +39,7 @@
<!--창고 관련 -->
<div class="input-group mb-3 w-40 col-centered">
<span id='Warehouse_label' class="input-group-text">창고</span>
<input readonly id="warehouse_name" type="text" class="form-control" placeholder="창고 검색" value="${dto.company_name}">
<input readonly id="warehouse_name" type="text" class="form-control" placeholder="창고 검색" value="${dto.warehouseName}">
<input hidden name="product_id" id="warehouse_id" value="${dto.warehouseId}">
<%-- <button id="Warehouse_search_button" class="btn-primary btn" onclick="showSearchModals('창고 검색','warehouse_capacity_currentCapacity')">검색</button>--%>
</div>
@@ -55,7 +55,7 @@
</div>
<div class="input-group mb-3 w-40 col-centered">
<span id='RemainingCapacity_label' class="input-group-text">재고량 한도</span>
<span id='RemainingCapacity_label' class="input-group-text">수정 가능한 재고량 한도</span>
<input readonly id="remainingcapacity" type="text" placeholder="" value="${dto.capacity - dto.current_capacity + dto.quantity}" class="form-control">
</div>
@@ -120,9 +120,9 @@
var warehouse_id = $("#warehouse_id").val();
var quantity = $("#quantity").val();
var activation = $("#activation").val();
var remainingcapacity = $("#remainingcapacity").val();
var id = $("#id").val();
var quantityAdjustment = $("#quantityAdjustment").val();
var quantityAdjustment = parseInt($("#quantityAdjustment").val(), 10);
var remainingcapacity = parseInt($("#remainingcapacity").val(), 10);
if (!product_id) {

34
src/main/webapp/WEB-INF/views/vendor/list.jsp vendored
View File

@@ -18,13 +18,13 @@
<div class="input-group mb-3 w-30 col-centered">
<div class="w-25">
<select class="form-select" name="searchn" id="searchn">
<option value="0">업체명</option>
<option value="1">대표번호</option>
<option value="2">거래처 담당자</option>
<option value="3">거래처 담당자 전화번호</option>
<option value="0" ${searchn == 0 ? 'selected' : ''}>업체명</option>
<option value="1" ${searchn == 1 ? 'selected' : ''}>대표번호</option>
<option value="2" ${searchn == 2 ? 'selected' : ''}>거래처 담당자</option>
<option value="3" ${searchn == 3 ? 'selected' : ''}>거래처 담당자 전화번호</option>
</select>
</div>
<input type="text" id="search" name="search" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
<input type="text" id="search" name="search" class="form-control" aria-label="Text input with dropdown button" value="${search}" placeholder="검색어를 입력하세요">
<button class="btn btn-info" type="button" id="searchBtn">검색</button>
<!-- 페이징작업용 -->
@@ -69,8 +69,7 @@
<div class="row row-buttons">
<div class="col-3 text-start">
<img width="50" height="50" src="https://img.icons8.com/color/48/ms-excel.png" alt="ms-excel"/>
<button type="button" class="btn btn-success" id="upload">업로드</button>
<button type="button" class="btn btn-success" id="downlodeExcelForm">서식 다운로드</button>
<button type="button" class="btn btn-success" id="downlodeExcelForm">양식 다운로드</button>
<button type="button" class="btn btn-success" id="downlodeExcelList">리스트 다운로드</button>
</div>
<div class="col-6 d-flex justify-content-center">
@@ -99,6 +98,14 @@
<button type="button" class="btn btn-primary" id="createButton">생성</button>
</div>
</div><!-- row row-buttons -->
<form name="uplodeExcleForm" id="uplodeExcleForm" method="post" onsubmit="return _onSubmit();" action="/vendor/uplodeExcel" enctype="multipart/form-data" class="form-horizontal">
<input type="file" name="file" id="file" accept=".xlsx, .xls"/>
<button type="submit" class="btn btn-success" id="uploadExcel">업로드</button>
</form><!-- uplodeExcleForm -->
</div>
</div>
@@ -215,6 +222,19 @@
document.body.appendChild(form);
form.submit();
}
function _onSubmit(){
if($("#file").val() == ""){
alert("파일을 업로드해주세요.");
$("#file").focus();
return false;
}
return true;
}
</script>
</body>
</html>

8
src/main/webapp/WEB-INF/views/warehouse/list.jsp
View File

@@ -30,13 +30,13 @@
<div class="input-group mb-3 w-30 col-centered">
<div class="w-25">
<select class="form-select" name="searchn" id="searchn">
<option value="0">창고명</option>
<option value="1">용량</option>
<option value="2">적재량</option>
<option value="0" ${searchn == 0 ? 'selected' : ''}>창고명</option>
<option value="1" ${searchn == 1 ? 'selected' : ''}>용량</option>
<option value="2" ${searchn == 2 ? 'selected' : ''}>적재량</option>
</select>
</div>
<input type="text" name="search" id="search" class="form-control"
aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
aria-label="Text input with dropdown button" value="${search}" placeholder="검색어를 입력하세요">
<button class="btn btn-info" type="button" id="searchBtn">검색</button>
<!-- 페이징작업용 -->

6
src/main/webapp/WEB-INF/views/warehouse/read.jsp
View File

@@ -53,13 +53,13 @@
<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>
<option value="0" ${searchn == 0 ? 'selected' : ''}>제품명</option>
<option value="1" ${searchn == 1 ? 'selected' : ''}>재고수</option>
</select>
</div>
<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="검색어를 입력하세요">
aria-label="Text input with dropdown button" value="${search}" placeholder="검색어를 입력하세요">
<input class="btn btn-info" type="submit" id="searchBtn" value="검색"/>
</div>