diff --git a/app.py b/app.py index 2abe95c..2d0d14c 100644 --- a/app.py +++ b/app.py @@ -261,11 +261,21 @@ def get_herbs_by_ingredient(ingredient_code): try: with get_db() as conn: cursor = conn.cursor() + + # 먼저 마스터 약재명 조회 + cursor.execute(""" + SELECT herb_name + FROM herb_masters + WHERE ingredient_code = ? + """, (ingredient_code,)) + master_row = cursor.fetchone() + master_herb_name = master_row[0] if master_row else None + cursor.execute(""" SELECT h.herb_item_id, h.insurance_code, - h.herb_name, + h.herb_name as product_name, h.specification, CASE WHEN h.specification LIKE '%신흥%' THEN '신흥' @@ -286,7 +296,13 @@ def get_herbs_by_ingredient(ingredient_code): ORDER BY stock_quantity DESC, h.herb_name """, (ingredient_code,)) - products = [dict(row) for row in cursor.fetchall()] + products = [] + for row in cursor.fetchall(): + product = dict(row) + # 마스터 약재명 추가 + product['herb_name'] = master_herb_name or product['product_name'] + products.append(product) + return jsonify({'success': True, 'data': products}) except Exception as e: return jsonify({'success': False, 'error': str(e)}), 500 diff --git a/static/app.js b/static/app.js index dcb1f10..3decd42 100644 --- a/static/app.js +++ b/static/app.js @@ -1674,7 +1674,8 @@ $(document).ready(function() { productSelect.append(''); response.data.forEach(product => { const stockInfo = product.stock_quantity > 0 ? `(재고: ${product.stock_quantity.toFixed(1)}g)` : '(재고 없음)'; - productSelect.append(``); + const companyInfo = product.company_name ? `[${product.company_name}]` : ''; + productSelect.append(``); }); productSelect.prop('disabled', false); }