From d7b9bf1a2ff56d9a6a91bb1a07a674289c6a1e1d Mon Sep 17 00:00:00 2001
From: Kana <Kana@Desktop>
Date: Sun, 28 Jan 2024 10:41:37 +0900
Subject: [PATCH 1/2] change inMapper inList

---
 src/main/resources/mappers/InMapper.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mappers/InMapper.xml b/src/main/resources/mappers/InMapper.xml
index feffd73..1cf7cc7 100644
--- a/src/main/resources/mappers/InMapper.xml
+++ b/src/main/resources/mappers/InMapper.xml
@@ -107,14 +107,15 @@
 	    </where>
 	</select>
 
-	<select id="inList" parameterType="map" resultMap="inResultMap">
+	<select id="
+" parameterType="map" resultMap="inResultMap">
 	    SELECT 
 	        proin.id, proin.group_number, proin.product_id, proin.in_date, proin.quantity, proin.warehouse_id, proin.manager_id, proin.note, proin.activation,
 	        planin.view_group_number,
 	        pro.name as product_name, 
 	        w.name as warehouse_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 
 	        product_in as proin 
 	        LEFT JOIN plan_In as planin on proin.group_number = planin.group_number and proin.product_id = planin.product_id

From 0986af920bd31728fcca4a25dc2b3f3d23e6533c Mon Sep 17 00:00:00 2001
From: Kana <Kana@Desktop>
Date: Sun, 28 Jan 2024 10:48:38 +0900
Subject: [PATCH 2/2] change InMapper and InUpdate

---
 src/main/resources/mappers/InMapper.xml     | 3 +--
 src/main/webapp/WEB-INF/views/in/update.jsp | 6 ------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/main/resources/mappers/InMapper.xml b/src/main/resources/mappers/InMapper.xml
index 1cf7cc7..207042f 100644
--- a/src/main/resources/mappers/InMapper.xml
+++ b/src/main/resources/mappers/InMapper.xml
@@ -107,8 +107,7 @@
 	    </where>
 	</select>
 
-	<select id="
-" parameterType="map" resultMap="inResultMap">
+	<select id="inList" parameterType="map" resultMap="inResultMap">
 	    SELECT 
 	        proin.id, proin.group_number, proin.product_id, proin.in_date, proin.quantity, proin.warehouse_id, proin.manager_id, proin.note, proin.activation,
 	        planin.view_group_number,
diff --git a/src/main/webapp/WEB-INF/views/in/update.jsp b/src/main/webapp/WEB-INF/views/in/update.jsp
index 0c95de9..7eed8bc 100644
--- a/src/main/webapp/WEB-INF/views/in/update.jsp
+++ b/src/main/webapp/WEB-INF/views/in/update.jsp
@@ -25,9 +25,6 @@
                             <span class="input-group-text" id="basic-addon1">제품명</span>
                             <input type="text" class="form-control" name="productName" placeholder="제품명을 검색하세요"
                                 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}">
                         </div>
 
@@ -60,9 +57,6 @@
                             <input type="text" name="warehouse_name" id="warehouse_name" class="form-control"
                                 placeholder="창고를 검색하세요" aria-label="창고명" value="${dto.warehouseDto.name}"
                                 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}">
                         </div>