diff --git a/src/main/resources/mappers/InMapper.xml b/src/main/resources/mappers/InMapper.xml index feffd73..207042f 100644 --- a/src/main/resources/mappers/InMapper.xml +++ b/src/main/resources/mappers/InMapper.xml @@ -114,7 +114,7 @@ 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 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 @@ 제품명 - @@ -60,9 +57,6 @@ -