mirror of
https://github.com/suhf/No1WMS.git
synced 2026-02-06 04:04:03 +09:00
#update
This commit is contained in:
sungsu
@@ -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",
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user