diff --git a/stockMate/src/main/java/com/stockm8/controller/HomeController.java b/stockMate/src/main/java/com/stockm8/controller/HomeController.java
index 6883832..ab38e42 100644
--- a/stockMate/src/main/java/com/stockm8/controller/HomeController.java
+++ b/stockMate/src/main/java/com/stockm8/controller/HomeController.java
@@ -4,6 +4,8 @@
 import java.util.Date;
 import java.util.Locale;
 
+import javax.servlet.http.HttpSession;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -32,7 +34,7 @@ public String home(Locale locale, Model model) {
 		String formattedDate = dateFormat.format(date);
 		
 		model.addAttribute("serverTime", formattedDate );
-		return "user/main";
+		return "main";
 	}
 	//http://localhost:8088/dashboard
 	@RequestMapping(value = "/dashboard", method = RequestMethod.GET)
@@ -62,4 +64,44 @@ public String qrScanner(Locale locale, Model model) {
 		
 		return "qrScanner";
 	}
+	
+	// 대시보드사용법 - /howtouse (GET)
+	@RequestMapping(value = "/howtouse", method = RequestMethod.GET)
+	public String howtouseGET(Model model, HttpSession session) throws Exception {
+		Long userId = (Long) session.getAttribute("userId");
+//                if (id == null) {
+//                    // 세션에 id가 없으면 에러 처리
+//                    return "redirect:/user/main";
+//                }
+//               UserVO resultVO = userService.getUser(userId);
+//               model.addAttribute("resultVO", resultVO);
+		return "howtouse";
+	}
+	
+	// 상담하기 - /user/consultation (GET)
+	@RequestMapping(value = "/consultation", method = RequestMethod.GET)
+	public String consultationGET(Model model, HttpSession session) throws Exception {
+		Long userId = (Long) session.getAttribute("id");
+
+//                if (id == null) {
+//                    // 세션에 id가 없으면 에러 처리
+//                    return "redirect:/user/main";
+//                }
+//               UserVO resultVO = userService.getUser(userId, password );
+//               model.addAttribute("resultVO", resultVO);
+		return "consultation";
+	}
+	
+	// 회사소개 - /intro (GET)
+	@RequestMapping(value = "/intro", method = RequestMethod.GET)
+	public String introGET(Model model, HttpSession session) throws Exception {
+		Long userId = (Long) session.getAttribute("userId");
+//                if (id == null) {
+//                    // 세션에 id가 없으면 에러 처리
+//                    return "redirect:/user/main";
+//                }
+//               UserVO resultVO = userService.getUser(userId);
+//               model.addAttribute("resultVO", resultVO);
+		return "/intro";
+	}
 }
diff --git a/stockMate/src/main/java/com/stockm8/controller/UserController.java b/stockMate/src/main/java/com/stockm8/controller/UserController.java
index 3f3cb18..9fbfb87 100644
--- a/stockMate/src/main/java/com/stockm8/controller/UserController.java
+++ b/stockMate/src/main/java/com/stockm8/controller/UserController.java
@@ -392,23 +392,6 @@ public void changePasswordPOST(
 	    }
 	}
 
-	
-	// 상담하기 - /user/consultation (GET)
-	@RequestMapping(value = "/consultation", method = RequestMethod.GET)
-	public String consultationGET(Model model, HttpSession session) throws Exception {
-		Long userId = (Long) session.getAttribute("id");
-
-//                if (id == null) {
-//                    // 세션에 id가 없으면 에러 처리
-//                    return "redirect:/user/main";
-//                }
-//               UserVO resultVO = userService.getUser(userId, password );
-//               model.addAttribute("resultVO", resultVO);
-		return "/user/consultation";
-	}
-
-	
-	
 
 	@RequestMapping(value = "/sendConsultation", method = RequestMethod.POST)
 	public String sendConsultation(
@@ -491,21 +474,6 @@ protected PasswordAuthentication getPasswordAuthentication() {
 	}
 
 
-	
-	
-	// 대시보드사용법 - /howtouse (GET)
-	@RequestMapping(value = "/howtouse", method = RequestMethod.GET)
-	public String howtouseGET(Model model, HttpSession session) throws Exception {
-		Long userId = (Long) session.getAttribute("userId");
-//                if (id == null) {
-//                    // 세션에 id가 없으면 에러 처리
-//                    return "redirect:/user/main";
-//                }
-//               UserVO resultVO = userService.getUser(userId);
-//               model.addAttribute("resultVO", resultVO);
-		return "/user/howtouse";
-	}
-
 	// 대시보드사용법 - /howtouse2 (GET)
 	@RequestMapping(value = "/howtouse2", method = RequestMethod.GET)
 	public String howtouseGET2(Model model, HttpSession session) throws Exception {
@@ -519,18 +487,7 @@ public String howtouseGET2(Model model, HttpSession session) throws Exception {
 		return "/user/howtouse2";
 	}
 
-	// 회사소개 - /intro (GET)
-	@RequestMapping(value = "/intro", method = RequestMethod.GET)
-	public String introGET(Model model, HttpSession session) throws Exception {
-		Long userId = (Long) session.getAttribute("userId");
-//                if (id == null) {
-//                    // 세션에 id가 없으면 에러 처리
-//                    return "redirect:/user/main";
-//                }
-//               UserVO resultVO = userService.getUser(userId);
-//               model.addAttribute("resultVO", resultVO);
-		return "/user/intro";
-	}
+
 
 	// 회원정보 삭제 - 비밀번호 입력 (GET)
 	@RequestMapping(value = "/delete", method = RequestMethod.GET)
diff --git a/stockMate/src/main/webapp/WEB-INF/views/user/consultation.jsp b/stockMate/src/main/webapp/WEB-INF/views/consultation.jsp
similarity index 100%
rename from stockMate/src/main/webapp/WEB-INF/views/user/consultation.jsp
rename to stockMate/src/main/webapp/WEB-INF/views/consultation.jsp
diff --git a/stockMate/src/main/webapp/WEB-INF/views/dashboard.jsp b/stockMate/src/main/webapp/WEB-INF/views/dashboard.jsp
index 489a246..910ee39 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/dashboard.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/dashboard.jsp
@@ -189,23 +189,20 @@
             <!-- Sidebar -->
             <div class="sidebar">
                 <div class="disabled">Dashboard</div>
+				<a href="warehouse/register">창고 등록</a>
+				<a href="stock/register">재고 등록</a>
                 <a href="product/register">상품 등록</a>
                 <a href="user/editinfo1">내정보 조회/수정</a>
                 <a href="user/changepassword1">비밀번호 변경</a>
                 <a href="user/howtouse2">대시보드 사용법</a>
-               <a href="user/main" onclick="return confirmLogout();" style="color: red;">Sign out</a>
+                <a href="user/signout" style="color: red;">Sign out</a>
+                <a href="user/main" onclick="return confirmLogout();" style="color: red;">Sign out</a>
 			<script>
 			function confirmLogout() {
 			    alert("로그아웃 되었습니다");
 			    return true; // 링크 이동을 계속 진행
 			}
 			</script>
-                <a href="warehouse/register">창고 등록</a>
-                <a href="stock/register">재고 등록</a>
-                <a href="profile">내정보 조회/수정</a>
-                <a href="password">비밀번호 변경</a>
-                <a href="help">대시보드 사용법</a>
-                <a href="user/signout" style="color: red;">Sign out</a>
             </div>
             <!-- Main Content -->
             <div class="main-content">
diff --git a/stockMate/src/main/webapp/WEB-INF/views/user/howtouse.jsp b/stockMate/src/main/webapp/WEB-INF/views/howtouse.jsp
similarity index 99%
rename from stockMate/src/main/webapp/WEB-INF/views/user/howtouse.jsp
rename to stockMate/src/main/webapp/WEB-INF/views/howtouse.jsp
index 08fe0b8..1c0a7c7 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/user/howtouse.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/howtouse.jsp
@@ -142,7 +142,7 @@
             </div>
         </div>
         <div class="back-button">
-            <a href="/user/main">뒤로 돌아가기</a>
+            <a href="/">뒤로 돌아가기</a>
         </div>
     </div>
 </body>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/user/intro.jsp b/stockMate/src/main/webapp/WEB-INF/views/intro.jsp
similarity index 98%
rename from stockMate/src/main/webapp/WEB-INF/views/user/intro.jsp
rename to stockMate/src/main/webapp/WEB-INF/views/intro.jsp
index 90bc418..70ac269 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/user/intro.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/intro.jsp
@@ -110,7 +110,7 @@
             <p>완성된 기능이 무사히 업그레이드되었을 때의 뿌듯함을 느끼며, 고객 만족도를 위해 지속적으로 노력하고 있습니다.</p>
         </div>
         <div class="back-button">
-            <a href="/user/main">뒤로 돌아가기</a>
+            <a href="/">뒤로 돌아가기</a>
         </div>
     </div>
 </body>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/user/main.jsp b/stockMate/src/main/webapp/WEB-INF/views/main.jsp
similarity index 90%
rename from stockMate/src/main/webapp/WEB-INF/views/user/main.jsp
rename to stockMate/src/main/webapp/WEB-INF/views/main.jsp
index 6262122..cafcfb2 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/user/main.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/main.jsp
@@ -120,9 +120,9 @@ body {
     <div class="nav">
         <a href="user/signup">회원가입</a>
         <a href="user/signin">로그인</a>
-        <a href="user/howtouse">대시보드 사용법</a>
-        <a href="user/consultation">상담문의</a>
-        <a href="intro">회사소개</a>
+        <a href="/howtouse">대시보드 사용법</a>
+        <a href="/consultation">상담문의</a>
+        <a href="/intro">회사소개</a>
     </div>
 
     <!-- Content -->
diff --git a/stockMate/src/main/webapp/WEB-INF/views/qrScanner.jsp b/stockMate/src/main/webapp/WEB-INF/views/qrScanner.jsp
index 40d3525..ec398ab 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/qrScanner.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/qrScanner.jsp
@@ -1,341 +1,61 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
+	pageEncoding="UTF-8"%>
 <!DOCTYPE html>
 <html lang="ko">
 <head>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>QR 코드 스캔 및 상품 정보</title>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/html5-qrcode/2.2.1/html5-qrcode.min.js"></script>
-<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-<script>
-$(document).ready(function () {
-    $("#barcodeInput").on("keyup", function (e) {
-        if (e.key === "Enter") {
-            let barcode = $(this).val().trim();
-            if (barcode) {
-                $.ajax({
-                    url: "/receiving/scan",
-                    method: "POST",
-                    contentType: "application/json",
-                    data: JSON.stringify({ barcode: barcode }),
-                    success: function (response) {
-                        if (response.success) {
-                            $("#stockInfo").html(
-                                "<table border='1' style='border-collapse: collapse; width: 100%;'>" +
-                                    "<thead>" +
-                                        "<tr>" +
-                                            "<th>제품명</th>" +
-                                            "<th>남은 재고</th>" +
-                                            "<th>입고처리할 남은 수량</th>" +
-                                            "<th>단가</th>" +
-                                        "</tr>" +
-                                    "</thead>" +
-                                    "<tbody>" +
-                                        "<tr>" +
-                                            "<td>" + response.productName + "</td>" +
-                                            "<td>" + response.remainingStock + "</td>" +
-                                            "<td>" + response.reservedQuantity + "</td>" +
-                                            "<td>" + response.productPrice + "</td>" +
-                                        "</tr>" +
-                                    "</tbody>" +
-                                "</table>"
-                            );
-                        } else {
-                            alert("더이상 입고할 수량이 없습니다.");
-                            if(confirm("발주를 새로 등록 하시겠습니까?")) {
-                                window.location.href = "/order/register";
-                            }
-                        }
-                    },
-                    error: function () {
-                        $("#stockInfo").html("<h3 style='color: red;'>서버 오류가 발생했습니다.</h3>");
-                    }
-                });
-                $(this).val(""); // 입력창 초기화
-            }
-        }
-    });
-});
-</script>
+<script
+	src="https://cdnjs.cloudflare.com/ajax/libs/html5-qrcode/2.2.1/html5-qrcode.min.js"></script>
 <style>
 body {
-    font-family: 'Arial', sans-serif;
-    background-color: #f4f4f9;
-    margin: 0;
-    padding: 0;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    min-height: 100vh;
-}
-
-header {
-    background-color: #2c3e50;
-    width: 100%;
-    padding: 15px 0;
-    color: white;
-    text-align: center;
-}
-
-header a {
-    color: white;
-    text-decoration: none;
-    margin: 0 15px;
-    font-size: 16px;
-}
-
-header a:hover {
-    text-decoration: underline;
+	font-family: Arial, sans-serif;
+	text-align: center;
+	margin: 0;
+	padding: 0;
 }
 
 h1 {
-    color: #2c3e50;
-    margin: 20px 0;
-    font-size: 24px;
-}
-
-main {
-    width: 100%;
-    max-width: 900px;
-    text-align: center;
-    padding: 20px;
+	margin-top: 20px;
 }
 
-input[type="text"] {
-    width: 80%;
-    padding: 12px;
-    font-size: 16px;
-    margin: 10px 0;
-    border: 2px solid #ddd;
-    border-radius: 5px;
-    box-sizing: border-box;
-    outline: none;
+.scanner-container {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	margin: 20px auto;
+	max-width: 600px;
 }
 
-input[type="text"]:focus {
-    border-color: #3498db;
+#reader {
+	width: 100%;
+	max-width: 500px;
+	height: 400px;
+	border: 2px solid #ddd;
 }
 
 button {
-    padding: 10px 20px;
-    background-color: #3498db;
-    color: white;
-    border: none;
-    border-radius: 5px;
-    cursor: pointer;
-    font-size: 16px;
-    margin-top: 20px;
-    transition: background-color 0.3s ease;
-}
-
-button:hover {
-    background-color: #2980b9;
-}
-
-.scanner-container {
-    margin-top: 30px;
-    text-align: center;
-}
-
-#reader {
-    width: 100%;
-    max-width: 600px;
-    height: 400px;
-    border: 2px solid #ddd;
-    border-radius: 10px;
+	padding: 10px 20px;
+	font-size: 16px;
+	cursor: pointer;
 }
 
 table {
-    width: 90%;
-    margin: 30px auto;
-    border-collapse: collapse;
-    background-color: white;
-    border-radius: 10px;
-    overflow: hidden;
-    box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
+	width: 80%;
+	margin: 20px auto;
+	border-collapse: collapse;
 }
 
 th, td {
-    padding: 12px 15px;
-    text-align: center;
-    border: 1px solid #ddd;
-}
-
-th {
-    background-color: #f1f1f1;
-    font-size: 18px;
-}
-
-td {
-    font-size: 16px;
-}
-
-#stockInfo {
-    margin-top: 30px;
-    padding: 20px;
-    background-color: #eaf1f7;
-    border-radius: 5px;
-    box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
-}
-
-#stockInfo h3 {
-    font-size: 18px;
-    color: #2c3e50;
-}
-
-#cameraSelect {
-    padding: 10px;
-    font-size: 16px;
-    margin-top: 10px;
-    border: 1px solid #ddd;
-    border-radius: 5px;
-    outline: none;
+	border: 1px solid #ddd;
+	padding: 10px;
+	text-align: center;
 }
-
-#cameraSelect:focus {
-    border-color: #3498db;
-}
-
 </style>
 </head>
 <body>
-    <header>
-        <h1>실시간 입고 관리 시스템</h1>
-        <a href="/receiving/main">입고 메인</a>
-        <a href="/receiving/history">입고 내역</a>
-        <a href="/dashboard">대쉬보드</a>
-        <a href="/receiving/allScan">다중 스캔</a>
-    </header>
-    <main>
-        <div>
-            <label for="barcodeInput">바코드 입력:</label>
-            <input type="text" id="barcodeInput" placeholder="바코드를 입력하세요" autofocus />
-        </div>
-        <div id="stockInfo" style="margin-top: 20px;">
-            <h3>재고 정보가 여기에 표시됩니다.</h3>
-        </div>
-    </main>
-
-    <!-- 카메라 선택 및 제어 버튼 -->
-    <div class="scanner-container">
-        <select id="cameraSelect"></select>
-        <button id="toggleScannerBtn">웹캠 시작</button>
-        <div id="reader"></div>
-    </div>
-
-    <table>
-        <thead>
-            <tr>
-                <th>상품명</th>
-                <th>바코드</th>
-                <th>단가</th>
-                <th>수량</th>
-            </tr>
-        </thead>
-        <tbody id="productList"></tbody>
-    </table>
-
-    <script>
-    const cameraSelect = document.getElementById('cameraSelect');
-    const toggleScannerBtn = document.getElementById('toggleScannerBtn');
-    const productList = document.getElementById('productList');
-    const beepSound = new Audio("${pageContext.request.contextPath}/resources/audio/beep.mp3"); // 비프 소리 경로
-    let reader = new Html5Qrcode("reader");
-    let scannerRunning = false;
-    const scannedProducts = {}; // 스캔된 상품 수량 추적 객체
-    let isScanning = false; // 스캔 중복 방지 플래그
-
-    // 카메라 목록 불러오기
-    Html5Qrcode.getCameras().then(devices => {
-        if (devices && devices.length) {
-            devices.forEach((device, index) => {
-                const option = document.createElement('option');
-                option.value = device.id;
-                option.textContent = device.label || `Camera ${index + 1}`;
-                cameraSelect.appendChild(option);
-            });
-        }
-    }).catch(err => console.error("카메라 목록 불러오기 오류:", err));
-
-    // 스캐너 시작/종료 버튼 이벤트
-    toggleScannerBtn.addEventListener('click', () => {
-        if (scannerRunning) stopScanner();
-        else startScanner();
-    });
-
-    // 스캐너 시작
-    function startScanner() {
-        const cameraId = cameraSelect.value || { facingMode: "environment" }; // 기본 카메라 설정
-        reader.start(
-            cameraId,
-            { fps: 10, qrbox: 250 },
-            onScanSuccess,
-            onScanError
-        ).then(() => {
-            scannerRunning = true;
-            toggleScannerBtn.textContent = "웹캠 끄기";
-        }).catch(err => console.error("웹캠 시작 오류:", err));
-    }
-
-    // 스캐너 종료
-    function stopScanner() {
-        reader.stop().then(() => {
-            scannerRunning = false;
-            toggleScannerBtn.textContent = "웹캠 시작";
-        }).catch(err => console.error("웹캠 종료 오류:", err));
-    }
-
-    // 스캔 성공 시 호출
-    function onScanSuccess(decodedText) {
-        if (isScanning) return; // 중복 호출 방지
-        isScanning = true;
-
-        beepSound.play(); // 비프 소리 재생
-        if (scannedProducts[decodedText]) {
-            scannedProducts[decodedText].quantity++;
-            updateTableRow(decodedText);
-            isScanning = false; // 스캔 상태 초기화
-        } else {
-            fetch("/api/qrcode/scan", {
-                method: "POST",
-                headers: { "Content-Type": "application/json" },
-                body: JSON.stringify({ productId: decodedText })
-            })
-            .then(response => response.json())
-            .then(data => {
-                if (data.success) {
-                    scannedProducts[decodedText] = { ...data, quantity: 1 };
-                    addTableRow(scannedProducts[decodedText]);
-                } else {
-                    alert("상품 정보를 불러올 수 없습니다.");
-                }
-            })
-            .catch(error => console.error("오류:", error))
-            .finally(() => isScanning = false); // 상태 초기화
-        }
-    }
-
-    function onScanError(errorMessage) {
-        console.warn("스캔 오류:", errorMessage);
-    }
-
-    function addTableRow(product) {
-        const row = document.createElement('tr');
-        row.innerHTML = `
-            <td>${product.productName}</td>
-            <td>${product.productBarcode}</td>
-            <td>${product.productPrice}</td>
-            <td id="quantity-${product.productId}">1</td>
-        `;
-        productList.appendChild(row);
-    }
-
-    function updateTableRow(productId) {
-        const quantityCell = document.getElementById(`quantity-${productId}`);
-        quantityCell.textContent = scannedProducts[productId].quantity;
-    }
 	<h1>QR 코드 스캔 및 상품 정보</h1>
 
 	<!-- 카메라 선택 및 제어 버튼 -->
@@ -362,14 +82,14 @@ td {
 	    const cameraSelect = document.getElementById('cameraSelect');
 	    const toggleScannerBtn = document.getElementById('toggleScannerBtn');
 	    const productListBody = document.getElementById('productList');
-	    const beepSound = new Audio("/resources/audio/beep.mp3"); // 비프 소리 경로
+	    const beepSound = new Audio("/resources/audio/beep.mp3");
 
 	    let reader = new Html5Qrcode("reader");
 	    let scannerRunning = false;
-	    const scannedProducts = {}; // 스캔된 상품 수량 추적 객체
-	    let isScanning = false; // 중복 스캔 방지 플래그
+	    const scannedProducts = {}; // productId 기반 상품 추적 객체
+	    let lastScannedTime = 0;
 
-	    // **카메라 목록 불러오기**  
+	    // **카메라 목록 불러오기**
 	    Html5Qrcode.getCameras()
 	        .then(devices => {
 	            if (devices.length) {
@@ -383,20 +103,16 @@ td {
 	                alert("카메라를 찾을 수 없습니다. 권한을 확인해주세요.");
 	            }
 	        })
-	        .catch(err => {
-	            console.error("카메라 목록 불러오기 오류:", err);
-	            alert("카메라 정보를 불러오지 못했습니다. 브라우저 권한을 확인해주세요.");
-	        });
+	        .catch(err => console.error("카메라 목록 오류:", err));
 
-	    // **스캐너 시작/종료 버튼 이벤트**
+	    // **스캐너 시작/종료 이벤트**
 	    toggleScannerBtn.addEventListener('click', () => {
 	        if (scannerRunning) stopScanner();
 	        else startScanner();
 	    });
 
-	    // **스캐너 시작**  
 	    function startScanner() {
-	        const cameraId = cameraSelect.value || { facingMode: "environment" }; // 기본 설정  
+	        const cameraId = cameraSelect.value || { facingMode: "environment" };
 	        reader.start(
 	            cameraId,
 	            { fps: 10, qrbox: 250 },
@@ -405,73 +121,60 @@ td {
 	        ).then(() => {
 	            scannerRunning = true;
 	            toggleScannerBtn.textContent = "웹캠 끄기";
-	        }).catch(err => {
-	            console.error("스캐너 시작 오류:", err);
-	            alert("스캐너를 시작할 수 없습니다. 다른 카메라를 선택하거나 권한을 확인해주세요.");
-	        });
+	        }).catch(err => console.error("스캐너 오류:", err));
 	    }
 
-	    // **스캐너 종료**  
 	    function stopScanner() {
 	        reader.stop().then(() => {
 	            scannerRunning = false;
 	            toggleScannerBtn.textContent = "웹캠 시작";
-	        }).catch(err => console.error("스캐너 종료 오류:", err));
+	        });
 	    }
-	    
-		let lastScannedTime = 0; // 마지막 스캔 시간 저장
 
-	    // **스캔 성공 시 호출**  
+	    // **스캔 성공 시 호출**
 	    function onScanSuccess(decodedText) {
-	        const currentTime = new Date().getTime(); // 현재 시간 (밀리초)
-	        
-	        if (isScanning || currentTime - lastScannedTime < 1000) { 
-	            // 1초 내에 같은 QR 코드 중복 스캔 방지
-	            return;
-	        }
-	        
-	        isScanning = true;
-	        lastScannedTime = currentTime; // 마지막 스캔 시간 업데이트
+	        const currentTime = new Date().getTime();
+	        if (currentTime - lastScannedTime < 1000) return; // 1초 제한
+	        lastScannedTime = currentTime;
+
 	        beepSound.play();
-	        console.log("Scanned Text:", decodedText); // 디버깅 로그 추가
 
-	        if (scannedProducts[decodedText]) {
-	            scannedProducts[decodedText].quantity++;
-	            updateTableRow(decodedText);
-	            isScanning = false;
-	        } else {
-	            fetch("/api/qrcode/scan", {
-	                method: "POST",
-	                headers: { "Content-Type": "application/json" },
-	                body: JSON.stringify({ productId: decodedText }) // productId 전송
-	            })
-	            .then(response => response.json())
-	            .then(data => {
-	                console.log("Server Response:", data); // 서버 응답 확인 (디버깅)
-	                if (data.success) {
-	                    const product = {
+	        fetch("/api/qrcode/scan", {
+	            method: "POST",
+	            headers: { "Content-Type": "application/json" },
+	            body: JSON.stringify({ productId: decodedText }) // QR 코드 데이터 전송
+	        })
+	        .then(response => response.json())
+	        .then(data => {
+	            if (data.success) {
+	                const productId = data.productId; // 서버에서 반환된 productId 사용
+	                if (scannedProducts[productId]) {
+	                    // 이미 스캔된 상품의 수량 증가
+	                    scannedProducts[productId].quantity++;
+	                    updateTableRow(productId);
+	                } else {
+	                    // 새로운 상품 추가
+	                    scannedProducts[productId] = {
 	                        productName: data.productName,
 	                        productBarcode: data.productBarcode,
-	                        productPrice: data.productPrice
+	                        productPrice: data.productPrice,
+	                        quantity: 1
 	                    };
-	                    scannedProducts[decodedText] = { ...product, quantity: 1 };
-	                    addTableRow(decodedText, scannedProducts[decodedText]);
-	                } else {
-	                    alert("상품 정보를 찾을 수 없습니다.");
+	                    addTableRow(productId, scannedProducts[productId]);
 	                }
-	            })
-	            .catch(err => console.error("오류 발생:", err))
-	            .finally(() => isScanning = false);
-	        }
+	            } else {
+	                alert("상품 정보를 찾을 수 없습니다.");
+	            }
+	        })
+	        .catch(err => console.error("오류 발생:", err));
 	    }
 
-	    // **스캔 실패 시 호출**  
 	    function onScanError(errorMessage) {
 	        console.warn("스캔 오류:", errorMessage);
 	    }
 
-	    // **테이블에 상품 정보 추가**  
-	    function addTableRow(barcode, product) {
+	    // **테이블에 상품 정보 추가**
+	    function addTableRow(productId, product) {
 	        const tr = document.createElement('tr');
 
 	        const tdName = document.createElement('td');
@@ -484,8 +187,8 @@ td {
 	        tdPrice.textContent = product.productPrice || "N/A";
 
 	        const tdQuantity = document.createElement('td');
-	        tdQuantity.id = `quantity-${barcode}`;
-	        tdQuantity.textContent = "1";
+	        tdQuantity.id = `quantity-${productId}`;
+	        tdQuantity.textContent = product.quantity;
 
 	        tr.appendChild(tdName);
 	        tr.appendChild(tdBarcode);
@@ -495,12 +198,14 @@ td {
 	        productListBody.appendChild(tr);
 	    }
 
-	    // **수량 업데이트**  
-	    function updateTableRow(barcode) {
-	        const quantityCell = document.getElementById(`quantity-${barcode}`);
-	        quantityCell.textContent = scannedProducts[barcode].quantity;
+	    // **수량 업데이트**
+	    function updateTableRow(productId) {
+	        const quantityCell = document.getElementById(`quantity-${productId}`);
+	        if (quantityCell) {
+	            quantityCell.textContent = scannedProducts[productId].quantity;
+	        }
 	    }
 	});
     </script>
 </body>
-</html>
+</html>
\ No newline at end of file