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

#수정

Browse Source 
재고량이 수정되어 예약된 출고량보다 낮아지면 즉시 출고 안됨
This commit is contained in:
sungsu
2024-01-22 13:04:18 +09:00
parent 7dbae87749
commit b06a984f27
3 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/resources/mappers/ProductOutMapper.xml
View File

@@ -37,10 +37,11 @@
<select id="outOne" parameterType="Map" resultType="Map">
select o.id as id, p.name as product_name, p.kan_code, o.quantity, w.name as warehouse_name, w.id as warehouse_id, p.id as product_id, o.expected_delivery_date, o.delivery_date, o.note
select o.id as id, p.name as product_name, p.kan_code, o.quantity as outQuantity, s.quantity as stockQuantity, w.name as warehouse_name, w.id as warehouse_id, p.id as product_id, o.expected_delivery_date, o.delivery_date, o.note
from product_out o
left join warehouse w on o.warehouse_id = w.id
left join product p on o.product_id = p.id
left join warehouse w on o.warehouse_id = w.id
left join stock s on o.product_id = s.product_id and o.warehouse_id = s.warehouse_id
where o.id = #{id}
</select>
@@ -103,7 +104,7 @@
<update id="updateWarehouseDeleteStock" parameterType="com.no1.wms.out.ProductOutDto">
update warehouse
set current_capacity = current_capacity - #{quantity}
set current_capacity = current_capacity - #{outQuantity}
where id = #{warehouse_id};
</update>
@@ -116,13 +117,13 @@
<update id="outNowUpdate" parameterType="com.no1.wms.out.ProductOutDto">
update product_out
set quantity = #{quantity}, expected_delivery_date = #{expected_delivery_date}, delivery_date = #{delivery_date}
set quantity = #{outQuantity}, expected_delivery_date = #{expected_delivery_date}, delivery_date = #{delivery_date}
where id = #{id};
</update>
<update id="stockQuantityUpdate" parameterType="com.no1.wms.out.ProductOutDto">
update stock
set quantity = quantity - #{quantity}
set quantity = quantity - #{outQuantity}
where product_id = #{product_id} and warehouse_id = #{warehouse_id};
</update>
<!-- update -->

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

@@ -37,8 +37,13 @@
</div>
<div class="input-group mb-3 w-40 col-centered">
<span id='quantity_name' class="input-group-text">출고량</span>
<input readonly id="quantity" type="text" class="form-control" placeholder="수량을 입력하세요" value="${dto.quantity}">
<span id='stockQuantity_name' class="input-group-text">재고량</span>
<input readonly id="stockQuantity" type="text" class="form-control" placeholder="수량을 입력하세요" value="${dto.stockQuantity}">
</div>
<div class="input-group mb-3 w-40 col-centered">
<span id='outQuantity_name' class="input-group-text">출고량</span>
<input readonly id="outQuantity" type="text" class="form-control" placeholder="수량을 입력하세요" value="${dto.outQuantity}">
</div>
<!--창고 관련 -->
@@ -214,7 +219,8 @@
function outNowUpdate() {
var id = $("#id").val();
var quantity = $("#quantity").val();
var stockQuantity = parseInt($("#stockQuantity").val(), 10);
var outQuantity = parseInt($("#outQuantity").val(), 10);
var product_id = $("#product_id").val()
var warehouse_id = $("#warehouse_id").val();
var expected_delivery_date = $("#expected_delivery_date").val();
@@ -222,12 +228,17 @@
var now = new Date();
var delivery_date = now.toISOString().slice(0, 19).replace('T', ' ');
if (outQuantity > stockQuantity) {
alert("출고량이 재고량을 넘을 수 없습니다.");
return false;
}
$.ajax({
url: "/out/outNow",
type: "put",
data: {
"id": id,
"quantity": quantity,
"outQuantity": outQuantity,
"product_id":product_id,
"warehouse_id": warehouse_id,
"expected_delivery_date": expected_delivery_date,

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

@@ -34,10 +34,14 @@
<div class="input-group mb-3 w-40 col-centered">
<span id='shipment_quantity_label' class="input-group-text">출고량</span>
<input id="quantity" type="text" class="form-control" placeholder="수량을 입력하세요" value="${dto.quantity}">
<span id='stockQuantity_name' class="input-group-text">재고량</span>
<input readonly id="stockQuantity" type="text" class="form-control" placeholder="수량을 입력하세요" value="${dto.stockQuantity}">
</div>
<div class="input-group mb-3 w-40 col-centered">
<span id='outQuantity_name' class="input-group-text">출고량</span>
<input readonly id="outQuantity" type="text" class="form-control" placeholder="수량을 입력하세요" value="${dto.outQuantity}">
</div>
<!--창고 관련 -->
@@ -103,13 +107,17 @@
$("#updateBtn").on("click", function () {
var id = $("#id").val();
var product_id = $("#product_id").val();
var quantity = $("#quantity").val();
var stockQuantity = parseInt($("#stockQuantity").val(), 10);
var outQuantity = parseInt($("#outQuantity").val(), 10);
var expected_delivery_date = $("#expected_delivery_date").val();
var warehouse_id = $("#warehouse_id").val();
var note = $("#note").val();
var activation = $("#activation").val();
if (outQuantity > stockQuantity) {
alert("출고량이 재고량을 넘을 수 없습니다.");
return false;
}
if (!product_id) {
alert("제품을 선택해야 합니다.");
@@ -130,7 +138,7 @@
"expected_delivery_date":expected_delivery_date,
"note":note,
"warehouse_id": warehouse_id,
"quantity": quantity,
"quantity": outQuantity,
"activation": activation,