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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
sungsu
2024-01-28 16:42:19 +09:00
parent 6827285122 0986af920b
commit bf741dc4ed
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/mappers/InMapper.xml
View File

@@ -114,7 +114,7 @@
pro.name as product_name, pro.name as product_name,
w.name as warehouse_name, w.name as warehouse_name,
a.name as account_name, a.name as account_name,
(SELECT price FROM prices WHERE product_id = proin.product_id ORDER BY registration_date DESC LIMIT 1) as latest_price (SELECT price FROM prices WHERE product_id = proin.product_id and activation = 1 ORDER BY registration_date DESC LIMIT 1) as latest_price
FROM FROM
product_in as proin product_in as proin
LEFT JOIN plan_In as planin on proin.group_number = planin.group_number and proin.product_id = planin.product_id LEFT JOIN plan_In as planin on proin.group_number = planin.group_number and proin.product_id = planin.product_id

6
src/main/webapp/WEB-INF/views/in/update.jsp
View File

@@ -25,9 +25,6 @@
<span class="input-group-text" id="basic-addon1">제품명</span> <span class="input-group-text" id="basic-addon1">제품명</span>
<input type="text" class="form-control" name="productName" placeholder="제품명을 검색하세요" <input type="text" class="form-control" name="productName" placeholder="제품명을 검색하세요"
aria-label="제품명" id="productName" value="${dto.productDto.name}" readonly> aria-label="제품명" id="productName" value="${dto.productDto.name}" readonly>
<button class="btn btn-outline-secondary rounded-end" id="searchProductName"
style="background-color:#FF5E5E;" type="button"
onclick="showSearchModal_product('제품 검색','product')">검색</button>
<input type='hidden' id="product_id" value="${dto.product_id}"> <input type='hidden' id="product_id" value="${dto.product_id}">
</div> </div>
@@ -60,9 +57,6 @@
<input type="text" name="warehouse_name" id="warehouse_name" class="form-control" <input type="text" name="warehouse_name" id="warehouse_name" class="form-control"
placeholder="창고를 검색하세요" aria-label="창고명" value="${dto.warehouseDto.name}" placeholder="창고를 검색하세요" aria-label="창고명" value="${dto.warehouseDto.name}"
aria-describedby="basic-addon1" readonly> aria-describedby="basic-addon1" readonly>
<button class="btn btn-outline-secondary rounded-end" id="searchWarehouseName"
style="background-color:#FF5E5E;" type="button"
onclick="showSearchModal_warehouse('창고 검색','warehouse_capacity_currentCapacity')">검색</button>
<input type='hidden' id="warehouse_id" value="${dto.warehouse_id}"> <input type='hidden' id="warehouse_id" value="${dto.warehouse_id}">
</div> </div>