diff --git a/stockMate/pom.xml b/stockMate/pom.xml
index d2e547c..6804024 100644
--- a/stockMate/pom.xml
+++ b/stockMate/pom.xml
@@ -142,6 +142,12 @@
 			<artifactId>mysql-connector-j</artifactId>
 			<version>8.0.32</version>
 		</dependency>
+		
+		<dependency>
+    		<groupId>com.sun.mail</groupId>
+    		<artifactId>javax.mail</artifactId>
+    		<version>1.6.2</version>
+		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.mybatis/mybatis -->
 		<dependency>
@@ -228,7 +234,7 @@
 			<version>3.0.0</version>
 		</dependency>
 
-		<dependency>
+    <dependency>
 		    <groupId>com.fasterxml.jackson.core</groupId>
 		    <artifactId>jackson-databind</artifactId>
 		    <version>2.12.3</version>
@@ -266,12 +272,18 @@
 		</dependency>
 		
 		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.12.3</version>
+    </dependency>
+    
+    <dependency>
 		    <groupId>org.springframework</groupId>
 		    <artifactId>spring-aspects</artifactId>
 		    <version>${org.springframework-version}</version>
 		</dependency>
 
-	    <dependency>
+	  <dependency>
 		    <groupId>com.google.code.gson</groupId>
 		    <artifactId>gson</artifactId>
 		    <version>2.10.1</version>
diff --git a/stockMate/src/main/java/com/stockm8/controller/ReceivingController.java b/stockMate/src/main/java/com/stockm8/controller/ReceivingController.java
index 7194a9e..6df06ab 100644
--- a/stockMate/src/main/java/com/stockm8/controller/ReceivingController.java
+++ b/stockMate/src/main/java/com/stockm8/controller/ReceivingController.java
@@ -20,7 +20,9 @@
 
 import com.stockm8.domain.vo.Criteria;
 import com.stockm8.domain.vo.PageVO;
+import com.stockm8.domain.vo.ProductVO;
 import com.stockm8.domain.vo.ReceivingShipmentVO;
+import com.stockm8.domain.vo.StockVO;
 import com.stockm8.domain.vo.UserVO;
 import com.stockm8.service.ReceivingService;
 import com.stockm8.service.UserService;
@@ -202,7 +204,7 @@ public String insert3POST(HttpServletRequest request) throws Exception {
 	
 	// http://localhost:8088/receiving/scan
 	@RequestMapping(value = "/scan", method = RequestMethod.GET)
-	public String scanneGET(HttpServletRequest request) throws Exception {
+	public String scanGET(HttpServletRequest request) throws Exception {
 		logger.info("scanGET() 호출");
 		
 		// 세션에서 userId 가져오기
@@ -219,7 +221,8 @@ public String scanneGET(HttpServletRequest request) throws Exception {
 	// http://localhost:8088/receiving/scan
 	@RequestMapping(value = "/scan", method = RequestMethod.POST)
 	@ResponseBody
-	public Map<String, Object> scannePOST(@RequestBody Map<String, String> bar, Model model, HttpServletRequest request) throws Exception {
+	public Map<String, Object> scanPOST(@RequestBody Map<String, String> bar, Model model, 
+											HttpServletRequest request) throws Exception {
 		logger.info("scanPOST() 호출");
         
         // 세션에서 userId 가져오기
@@ -241,10 +244,16 @@ public Map<String, Object> scannePOST(@RequestBody Map<String, String> bar, Mode
 	    }
 
 	    try {
+	    	rService.ReceivingStatusToComplete(businessId, barcode);
             int remainingStock = rService.increseStockByBarcode(businessId, barcode);
+            int reservedQuantity = rService.decreaseReservedQuantity(businessId, barcode);
+            ProductVO product = rService.productNameBarcode(businessId, barcode);
             if (remainingStock >= 0) {
                 response.put("success", true);
                 response.put("remainingStock", remainingStock);
+                response.put("reservedQuantity", reservedQuantity);
+                response.put("productName", product.getProductName());
+                response.put("productPrice", product.getProductPrice());
             } else {
                 response.put("success", false);
                 response.put("message", "유효하지 않은 바코드입니다.");
@@ -256,7 +265,23 @@ public Map<String, Object> scannePOST(@RequestBody Map<String, String> bar, Mode
         return response;
     }
 	
-
+	// http://localhost:8088/receiving/allScan
+	@RequestMapping(value = "/allScan", method = RequestMethod.GET)
+	public String allScanGET(HttpServletRequest request) throws Exception {
+		logger.info("allScanGET() 호출");
+		
+		// 세션에서 userId 가져오기
+	    HttpSession session = request.getSession(false);
+	    Long userId = (session != null) ? (Long)session.getAttribute("userId") : null;
+	    
+	    // userId로 사용자 정보 조회
+	    UserVO user = uService.getUserById(userId);
+	    int businessId = user.getBusinessId();
+	    
+	    
+        
+        return "/receiving/allScan";
+	}
 
    
 
diff --git a/stockMate/src/main/java/com/stockm8/controller/UserController.java b/stockMate/src/main/java/com/stockm8/controller/UserController.java
index 8aeca09..3f3cb18 100644
--- a/stockMate/src/main/java/com/stockm8/controller/UserController.java
+++ b/stockMate/src/main/java/com/stockm8/controller/UserController.java
@@ -1,9 +1,11 @@
 package com.stockm8.controller;
 
+import java.io.PrintWriter;
 import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import org.slf4j.Logger;
@@ -11,14 +13,24 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.SessionAttribute;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import org.springframework.web.servlet.support.RequestContextUtils;
 
 import com.stockm8.domain.vo.UserVO;
 import com.stockm8.service.UserService;
+import javax.mail.internet.MimeMessage;
+import javax.mail.Message;
+import javax.mail.Transport;
+import javax.mail.Session;
+import java.util.Properties;
+import javax.mail.PasswordAuthentication;
+
+
 
 @Controller
 @RequestMapping(value = "/user/*")
@@ -39,7 +51,7 @@ public class UserController {
 	// http://localhost:8088/user/main (o)
 	// http://localhost:8088/user/info1 (o)
 	// http://localhost:8088/user/info2 (o)
-	
+
 	// http://localhost:8088/dashboard (o)
 	// http://localhost:8088/user/info1 (o)
 	// http://localhost:8088/user/info2 (o)
@@ -83,78 +95,78 @@ public String userSignUpPOST(/* @ModelAttribute */ UserVO user) throws Exception
 	public String userSgininGET(HttpServletRequest request, Model model) {
 		logger.info("userSgininGET(HttpServletRequest request, Model model) 호출 ");
 		logger.info("!@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
-		
-		
+
 		// FlashMap에서 에러 메시지 확인
-	    Map<String, ?> flashMap = RequestContextUtils.getInputFlashMap(request);
-	    if (flashMap != null) {
-	        String errorMessage = (String) flashMap.get("errorMessage");
-	        if (errorMessage != null) {
-	            model.addAttribute("errorMessage", errorMessage);
-	        }
-	    }
-	    
-	    return "/user/signin";
+		Map<String, ?> flashMap = RequestContextUtils.getInputFlashMap(request);
+		if (flashMap != null) {
+			String errorMessage = (String) flashMap.get("errorMessage");
+			if (errorMessage != null) {
+				model.addAttribute("errorMessage", errorMessage);
+			}
+		}
+
+		return "/user/signin";
 	}
 
 	// 로그인 - 정보처리 / POST
 	@RequestMapping(value = "/signin", method = RequestMethod.POST)
 	public String userLoginPOST(UserVO user, RedirectAttributes rttr, HttpSession session) throws Exception {
-	    logger.info("userLoginPOST() 호출");
-
-	    // 입력받은 로그인 정보 출력
-	    logger.debug("입력된 로그인 정보: {}", user);
-
-	    // 서비스 계층에서 로그인 체크 호출
-	    UserVO resultVO = userService.userLogin(user);
-
-	    // 로그인 성공 처리
-	    if (resultVO != null) {
-	        logger.info("로그인 성공, 사용자 ID: {}", resultVO.getUserId());
-	        
-	        // 세션에 사용자 ID 저장
-	        session.setAttribute("userId", resultVO.getUserId()); 
-	        
-	        // 원래 요청 URL로 리다이렉트
-	        String redirectUrl = (String) session.getAttribute("redirectAfterLogin");
-	        
-	        if (redirectUrl != null) {
-	            session.removeAttribute("redirectAfterLogin"); // 세션에서 URL 삭제
-	            return "redirect:" + redirectUrl;
-	        }
-	        return "redirect:/dashboard";
-	    }
+		logger.info("userLoginPOST() 호출");
+
+		// 입력받은 로그인 정보 출력
+		logger.debug("입력된 로그인 정보: {}", user);
+
+		// 서비스 계층에서 로그인 체크 호출
+		UserVO resultVO = userService.userLogin(user);
 
-	    // 로그인 실패 처리
-	    logger.warn("로그인 실패, 사용자 정보를 찾을 수 없습니다.");
-	    rttr.addFlashAttribute("errorMessage", "로그인에 실패했습니다. 아이디와 비밀번호를 확인해주세요.");
-	    return "redirect:/user/signin"; // 로그인 페이지 이동
+		// 로그인 성공 처리
+		if (resultVO != null) {
+			logger.info("로그인 성공, 사용자 ID: {}", resultVO.getUserId());
+
+			// 세션에 사용자 ID 저장
+			session.setAttribute("userId", resultVO.getUserId());
+
+			// 원래 요청 URL로 리다이렉트
+//	        String redirectUrl = (String) session.getAttribute("redirectAfterLogin");
+//	        
+//	        if (redirectUrl != null) {
+//	            session.removeAttribute("redirectAfterLogin"); // 세션에서 URL 삭제
+//	            return "redirect:" + redirectUrl;
+//	        }
+			return "redirect:/dashboard";
+		}
+
+		// 로그인 실패 처리
+		logger.warn("로그인 실패, 사용자 정보를 찾을 수 없습니다.");
+		rttr.addFlashAttribute("errorMessage", "로그인에 실패했습니다. 아이디와 비밀번호를 확인해주세요.");
+		return "redirect:/user/signin"; // 로그인 페이지 이동
 	}
 
 	// 메인페이지 - GET
 	@RequestMapping(value = "/main", method = RequestMethod.GET)
 	public void mainGET(HttpServletRequest request, Model model) throws Exception {
 		logger.info(" mainGET() 호출 ");
-		
+
 		// FlashMap에서 에러 메시지 확인
-	    Map<String, ?> flashMap = RequestContextUtils.getInputFlashMap(request);
-	    if (flashMap != null) {
-	        String errorMessage = (String) flashMap.get("errorMessage");
-	        if (errorMessage != null) {
-	            model.addAttribute("errorMessage", errorMessage);
-	        }
-	    }
+		Map<String, ?> flashMap = RequestContextUtils.getInputFlashMap(request);
+		if (flashMap != null) {
+			String errorMessage = (String) flashMap.get("errorMessage");
+			if (errorMessage != null) {
+				model.addAttribute("errorMessage", errorMessage);
+			}
+		}
 
 		logger.info(" /user/main -> /user/main.jsp 연결 ");
 	}
 
 	// 대시보드 페이지 - GET
-//	@RequestMapping(value = "/dashboard", method = RequestMethod.GET)
-//	public void dashGET() {
-//		logger.info(" dashGET() 호출 ");
-//
-//		logger.info(" /user/main -> /user/dash.jsp 연결 ");
-//	}
+	@RequestMapping(value = "/dashboard", method = RequestMethod.GET)
+	public void dashGET() {
+
+		logger.info(" dashGET() 호출 ");
+
+		logger.info(" /user/main -> /user/dash.jsp 연결 ");
+	}
 
 	// 로그아웃 - GET
 	@RequestMapping(value = "/signout", method = RequestMethod.GET)
@@ -169,89 +181,101 @@ public String userLogoutGET(HttpSession session) throws Exception {
 		return "redirect:/user/main";
 	}
 
-	// 회원정보 조회 - /user/info1 (GET)
-	@RequestMapping(value = "/info1", method = RequestMethod.GET)
-	public String userInfo1GET(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);
-		model.addAttribute("resultVO", resultVO);
-		return "user/info1";
-	}
-	// 회원정보 조회 - /user/info1 (GET)
-		@RequestMapping(value = "/info2", method = RequestMethod.GET)
-		public String userInfo2GET(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);
-			model.addAttribute("resultVO", resultVO);
-			return "user/info2";
+
+	// 회원정보 수정
+	@RequestMapping(value = "/editinfo1", method = RequestMethod.GET)
+	public String userEditInfo1GET(HttpSession session, Model model) {
+		Long userId = (Long) session.getAttribute("userId");
+		if (userId == null) {
+			// 세션에 사용자 ID가 없으면 대시보드로 리다이렉트
+			return "redirect:/dashboard";
+			
+			
+			
 		}
+		return "/user/editinfo1"; // 비밀번호 입력 페이지로 이동
+	}
 	
+
+
+	@RequestMapping(value = "/editinfo1", method = RequestMethod.POST)
+	public String userEditInfo2POST(@RequestParam("password") String password, HttpSession session, RedirectAttributes rttr) {
+	    Long userId = (Long) session.getAttribute("userId");
+
+	    if (userId == null) {
+	        return "redirect:/dashboard";
+	    }
+
+	    try {
+	        UserVO userVO = userService.getUser(userId, password);
+
+	        if (userVO == null) {
+	            rttr.addFlashAttribute("errorMessage", "비밀번호가 일치하지 않습니다.");
+	            return "redirect:/user/editinfo1";
+	        }
+
+	        // RedirectAttributes에 사용자 정보 추가
+	        rttr.addFlashAttribute("userVO", userVO);
+	        return "redirect:/user/editinfo2";
+
+	    } catch (Exception e) {
+	        rttr.addFlashAttribute("errorMessage", "시스템 오류가 발생했습니다.");
+	        return "redirect:/user/editinfo1";
+	    }
+	}
+
+
 	
+	@RequestMapping(value = "/editinfo2", method = RequestMethod.GET)
+	public String userEditInfo2GET(HttpSession session, Model model) {
+	    if (!model.containsAttribute("userVO")) {
+	        return "redirect:/dashboard"; // 데이터가 없으면 대시보드로 리다이렉트
+	    }
+
+	    return "/user/editinfo2";
+	}
+
 	
-//	// 회원정보 조회 - /user/info1 (GET)
-//	@RequestMapping(value = "/info1", method = RequestMethod.GET)
-//	public void userInfo1GET(
-//			Model model
-//			,@SessionAttribute(name = "id") String id) {
-//		logger.info(" userInfo1GET() 호출");
-//		
-//		// 세션에 저장된 아이디 정보를 가져오기
-//		logger.info(" id : "+id);
-//		
-//		// 서비스 -> DAO 호출(회원정보 조회)
-//		userVO resultVO = userservice.getuser(id);
-//		// 결과정보를 저장 view페이지 전달 & 출력 (Model객체)		
-//		model.addAttribute("resultVO", resultVO);
-//		logger.info(" /user/info => /user/info1.jsp 연결");
-//	}
-//	
-
-		// 회원정보 수정 - /user/info1 (GET)
-		@RequestMapping(value = "/editinfo1", method = RequestMethod.GET)
-		public String usereditinfo1GET(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);
-			model.addAttribute("resultVO", resultVO);
-			return "user/editinfo1";
-		}
-		// 회원정보 수정 - /user/info1 (GET)
-			@RequestMapping(value = "/editinfo2", method = RequestMethod.POST)
-			public String usereditinfo2GET(Model model, HttpSession session) throws Exception {
-				
-				
-				logger.info("ㅇㄻ니");
-				Long userId = (Long) session.getAttribute("id");
-//			    if (id == null) {
-//			        // 세션에 id가 없으면 에러 처리
-//			        return "redirect:/user/main";
-//			    }
-				UserVO resultVO = userService.getUser(userId);
-				model.addAttribute("resultVO", resultVO);
-				return "/user/editinfo2";
-			}
-		
-		
-		
-			// 비밀번호 찾기 - get
-		    @RequestMapping(value = "/findPassword", method = RequestMethod.GET)
-		    public String findPasswordGet() {
-
-		        return "/user/findPassword";
-		    }
-		
-		
+	@RequestMapping(value = "/updateInfo2", method = RequestMethod.POST)
+	public void userUpdatePOST(@ModelAttribute UserVO user, HttpSession session, HttpServletResponse response) throws Exception {
+	    logger.info("userUpdatePOST() 실행");
+
+	    Long userId = (Long) session.getAttribute("userId");
+	    if (userId == null) {
+	        response.sendRedirect("/dashboard");
+	        return;
+	    }
+
+	    user.setUserId(userId); // userId 설정
+
+	    try {
+	        userService.updateUser(user); // 정보 업데이트
+	        logger.info("회원정보 수정 성공");
+
+	        // JavaScript로 알림창 띄우고 대시보드로 이동
+	        response.setContentType("text/html; charset=UTF-8");
+	        PrintWriter out = response.getWriter();
+	        out.println("<script>alert('변경완료'); location.href='/dashboard';</script>");
+	        out.flush();
+	    } catch (Exception e) {
+	        logger.error("회원정보 수정 실패", e);
+
+	        // 오류 발생 시 오류 메시지와 함께 돌아가기
+	        response.setContentType("text/html; charset=UTF-8");
+	        PrintWriter out = response.getWriter();
+	        out.println("<script>alert('오류가 발생했습니다. 다시 시도해주세요.'); history.back();</script>");
+	        out.flush();
+	    }
+	}
+
+
+	// 비밀번호 찾기 - get
+	@RequestMapping(value = "/findPassword", method = RequestMethod.GET)
+	public String findPasswordGet() {
+
+		return "/user/findPassword";
+	}
+
 //	// 회원정보 수정 - GET
 //	// (기존정보를 가져와서 보여주고, 수정할 정보를 입력)
 //	@RequestMapping(value = "/editinfo1", method = RequestMethod.GET)
@@ -270,53 +294,244 @@ public String findPasswordGet() {
 //		// /user/update.jsp 뷰페이지 연결
 //	}
 //
-//	// 회원정보 수정 - POST
-//	// (수정된 정보를 전달받아서 정보 수정)
-//	@RequestMapping(value = "/editinfo2", method = RequestMethod.POST)
-//	public String userUpdatePOST(UserVO user) throws Exception {
-//		logger.info(" userUpdatePOST() ");
-//
-//		// 전달정보(수정정보) 저장
-//		logger.info("vo : " + user);
-//
-//		// 서비스 -> DAO 호출 (회원정보 수정)
-//		userService.updateUser(user);
-//
-//		// 수정완료시 메인페이지로 이동
-//		return "redirect:/dashboard";
-//	}
 
-		 // 대시보드 사용법 - /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);
-				model.addAttribute("resultVO", resultVO);
-				return "user/consultation";
-			}	    
-		    
-			 // 비밀번호 변경 - /user/changepassword1 (GET)
-			@RequestMapping(value = "/changepassword1", method = RequestMethod.GET)
-			public String changepassword1GET(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);
-				model.addAttribute("resultVO", resultVO);
-				return "user/changepassword1";
-			}	    
-			
-			
-			
-			
-		    
-		    
+	// 회원정보 수정
+	@RequestMapping(value = "/changepassword1", method = RequestMethod.GET)
+	public String changepassword1GET(HttpSession session) {
+		Long userId = (Long) session.getAttribute("userId");
+		if (userId == null) {
+			// 세션에 사용자 ID가 없으면 대시보드로 리다이렉트
+			return "redirect:/dashboard";
+		}
+		return "/user/changepassword1"; // 비밀번호 입력 페이지로 이동
+	}
+	
+	
+	@RequestMapping(value = "/changepassword1", method = RequestMethod.POST)
+	public String changepassword2POST(@RequestParam("password") String password, RedirectAttributes rttr, HttpSession session) {
+	    Long userId = (Long) session.getAttribute("userId");
+
+	    if (userId == null) {
+	        return "redirect:/dashboard"; // 세션이 없는 경우 대시보드로 이동
+	    }
+
+	    try {
+	        // 사용자 정보 조회 및 비밀번호 확인
+	        UserVO userVO = userService.getUser(userId, password);
+
+	        if (userVO == null) {
+	            rttr.addFlashAttribute("errorMessage", "비밀번호가 일치하지 않습니다.");
+	            return "redirect:/user/changepassword1"; // 비밀번호 불일치 시 다시 이동
+	        }
+
+	        // 비밀번호를 모델에 추가 (FlashAttributes 사용)
+	        rttr.addFlashAttribute("userVO", userVO);
+	        rttr.addFlashAttribute("currentPassword", password); // 현재 비밀번호 추가
+	        return "redirect:/user/changepassword2";
+
+	    } catch (Exception e) {
+	        logger.error("비밀번호 확인 중 오류 발생: ", e);
+	        rttr.addFlashAttribute("errorMessage", "시스템 오류가 발생했습니다.");
+	        return "redirect:/user/changepassword1";
+	    }
+	}
+	
+	
+	@RequestMapping(value = "/changepassword2", method = RequestMethod.GET)
+	public String changepassword2GET(@ModelAttribute("currentPassword") String currentPassword, Model model) {
+	    if (currentPassword == null || currentPassword.isEmpty()) {
+	        return "redirect:/user/changepassword1"; // 비밀번호가 없는 경우 다시 이동
+	    }
+
+	    model.addAttribute("currentPassword", currentPassword);
+	    return "/user/changepassword2"; // JSP 페이지 반환
+	}
+	
+	@RequestMapping(value = "/changepassword2", method = RequestMethod.POST)
+	public void changePasswordPOST(
+	        @RequestParam("newPassword") String newPassword,
+	        @RequestParam("confirmPassword") String confirmPassword,
+	        HttpSession session, 
+	        HttpServletResponse response) throws Exception {
+	    
+	    Long userId = (Long) session.getAttribute("userId");
+
+	    if (userId == null) {
+	        response.sendRedirect("/dashboard"); // 세션 없으면 대시보드로 이동
+	        return;
+	    }
+
+	    // 비밀번호 일치 여부 확인
+	    if (!newPassword.equals(confirmPassword)) {
+	        // 비밀번호 불일치 시 오류 메시지와 함께 머무르기
+	        response.setContentType("text/html; charset=UTF-8");
+	        PrintWriter out = response.getWriter();
+	        out.println("<script>alert('비밀번호가 일치하지 않습니다. 다시 입력해주세요.'); history.back();</script>");
+	        out.flush();
+	        return;
+	    }
+
+	    // 비밀번호 업데이트
+	    try {
+	        userService.updatePassword(userId, newPassword); // 비밀번호 변경
+	        logger.info("비밀번호 변경 성공: userId = " + userId);
+
+	        // 성공 메시지와 함께 대시보드로 이동
+	        response.setContentType("text/html; charset=UTF-8");
+	        PrintWriter out = response.getWriter();
+	        out.println("<script>alert('정보 변경 완료'); location.href='/dashboard';</script>");
+	        out.flush();
+	    } catch (Exception e) {
+	        logger.error("비밀번호 변경 실패: ", e);
+
+	        // 오류 발생 시 메시지와 함께 이전 페이지로 이동
+	        response.setContentType("text/html; charset=UTF-8");
+	        PrintWriter out = response.getWriter();
+	        out.println("<script>alert('시스템 오류가 발생했습니다. 다시 시도해주세요.'); history.back();</script>");
+	        out.flush();
+	    }
+	}
+
+	
+	// 상담하기 - /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(
+	        @RequestParam("company") String company,
+	        @RequestParam("name") String name,
+	        @RequestParam("contact") String contact,
+	        @RequestParam("email") String email,
+	        @RequestParam("inquiry") String inquiry,
+	        RedirectAttributes rttr) {
+
+	    final String fromEmail = "zzangmait@naver.com"; // 네이버 이메일 계정
+	    final String password = "571TT3J3UMVY"; // 네이버 이메일 비밀번호
+
+	    String toEmail = "zzangmait@naver.com"; // 수신 이메일 주소
+
+	    // SMTP 설정
+	    Properties props = new Properties();
+	    props.put("mail.smtp.host", "smtp.naver.com");
+	    props.put("mail.smtp.port", "465");
+	    props.put("mail.smtp.auth", "true");
+	    props.put("mail.smtp.ssl.enable", "true"); // SSL 활성화
+	    props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
+
+	    Session session = Session.getInstance(props, new javax.mail.Authenticator() {
+	        protected PasswordAuthentication getPasswordAuthentication() {
+	            return new PasswordAuthentication(fromEmail, password);
+	        }
+	    });
+
+	    try {
+	        // 이메일 내용 설정
+	        MimeMessage message = new MimeMessage(session);
+	        message.setFrom(new javax.mail.internet.InternetAddress(fromEmail));
+	        message.addRecipient(Message.RecipientType.TO, new javax.mail.internet.InternetAddress(toEmail));
+	        message.setSubject("상담 신청 정보");
+
+	        // HTML 형식 이메일 본문
+	        String content = "<html>"
+	                + "<body style='font-family: Arial, sans-serif; margin: 0; padding: 0;'>"
+	                + "<div style='width: 100%; max-width: 600px; margin: 20px auto; border: 2px solid #005bac; border-radius: 10px; padding: 15px;'>"
+	                + "<h2 style='color: #005bac; text-align: center;'>상담 신청 정보</h2>"
+	                + "<table style='width: 100%; border-collapse: collapse;'>"
+	                + "  <tr style='background-color: #f2f9ff;'>"
+	                + "    <th style='text-align: left; padding: 8px; border: 1px solid #005bac; color: #005bac;'>회사명</th>"
+	                + "    <td style='padding: 8px; border: 1px solid #005bac;'>" + company + "</td>"
+	                + "  </tr>"
+	                + "  <tr>"
+	                + "    <th style='text-align: left; padding: 8px; border: 1px solid #005bac; color: #005bac;'>이름</th>"
+	                + "    <td style='padding: 8px; border: 1px solid #005bac;'>" + name + "</td>"
+	                + "  </tr>"
+	                + "  <tr style='background-color: #f2f9ff;'>"
+	                + "    <th style='text-align: left; padding: 8px; border: 1px solid #005bac; color: #005bac;'>연락처</th>"
+	                + "    <td style='padding: 8px; border: 1px solid #005bac;'>" + contact + "</td>"
+	                + "  </tr>"
+	                + "  <tr>"
+	                + "    <th style='text-align: left; padding: 8px; border: 1px solid #005bac; color: #005bac;'>이메일</th>"
+	                + "    <td style='padding: 8px; border: 1px solid #005bac;'>" + email + "</td>"
+	                + "  </tr>"
+	                + "  <tr style='background-color: #f2f9ff;'>"
+	                + "    <th style='text-align: left; padding: 8px; border: 1px solid #005bac; color: #005bac;'>문의 내용</th>"
+	                + "    <td style='padding: 8px; border: 1px solid #005bac;'>" + inquiry + "</td>"
+	                + "  </tr>"
+	                + "</table>"
+	                + "<p style='text-align: center; margin-top: 16px; color: #555;'>상담 신청해주셔서 감사합니다.</p>"
+	                + "</div>"
+	                + "</body></html>";
+
+	        // 이메일 본문을 HTML로 설정
+	        message.setContent(content, "text/html; charset=UTF-8");
+
+	        // 메일 전송
+	        Transport.send(message);
+	        rttr.addFlashAttribute("message", "상담 신청이 성공적으로 전송되었습니다.");
+	    } catch (Exception e) {
+	        e.printStackTrace();
+	        rttr.addFlashAttribute("error", "이메일 전송에 실패했습니다. 다시 시도해주세요.");
+	    }
+
+	    return "redirect:/user/consultation";
+	}
+
+
+	
+	
+	// 대시보드사용법 - /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 {
+		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/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)
 	public String userDeleteGET() throws Exception {
@@ -328,7 +543,8 @@ public String userDeleteGET() throws Exception {
 
 	// 회원정보 삭제 - 아이디/비밀번호 확인후 정보 삭제 (POST)
 	@RequestMapping(value = "/delete", method = RequestMethod.POST)
-	public String userDeletePOST(UserVO user, HttpSession session) throws Exception {
+	public String userDeletePOST(UserVO user, HttpSession session, @RequestParam("password") String password)
+			throws Exception {
 		logger.info(" userDeletePOST() 실행 ");
 
 		// 전달된 파라메터(id,pw)를 저장
diff --git a/stockMate/src/main/java/com/stockm8/domain/vo/UserVO.java b/stockMate/src/main/java/com/stockm8/domain/vo/UserVO.java
index 54a112c..7e33b51 100644
--- a/stockMate/src/main/java/com/stockm8/domain/vo/UserVO.java
+++ b/stockMate/src/main/java/com/stockm8/domain/vo/UserVO.java
@@ -27,3 +27,6 @@ public class UserVO {
 
 }
 
+
+
+
diff --git a/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAO.java b/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAO.java
index ac5d756..049fa10 100644
--- a/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAO.java
+++ b/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAO.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 import com.stockm8.domain.vo.Criteria;
+import com.stockm8.domain.vo.ProductVO;
 import com.stockm8.domain.vo.ReceivingShipmentVO;
 import com.stockm8.domain.vo.StockVO;
 
@@ -40,5 +41,14 @@ public interface ReceivingDAO {
  	
   	// 바코드로 재고 감소 실시간 조회
    	public int selectStockByBarcode(int businessId, String barcode) throws Exception;
+   	
+   	// 바코드 찍은 후 발주 수량 감소
+   	public int selectReservedQuantity(int businessId, String barcode) throws Exception;
+   	
+   	// 바코드 찍은 후 제품 이름 추출
+   	public ProductVO selectProductNameBarcode(int businessId, String barcode) throws Exception;
+   	
+   	// 수량 없을시 완료상태로 변경
+   	public void updateReceivingStatusToComplete(int businessId, String barcode) throws Exception;
 		
 } // ReceivingDAO end
\ No newline at end of file
diff --git a/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAOImpl.java b/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAOImpl.java
index ca5b550..1f1b1dc 100644
--- a/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAOImpl.java
+++ b/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAOImpl.java
@@ -12,6 +12,7 @@
 import org.springframework.stereotype.Repository;
 
 import com.stockm8.domain.vo.Criteria;
+import com.stockm8.domain.vo.ProductVO;
 import com.stockm8.domain.vo.ReceivingShipmentVO;
 import com.stockm8.domain.vo.StockVO;
 
@@ -131,6 +132,36 @@ public int selectStockByBarcode(int businessId, String barcode) throws Exception
 	    params.put("barcode", barcode);
 		return sqlSession.selectOne(NAMESPACE + "selectStockByBarcode", params);
 	}
+
+	@Override
+	public int selectReservedQuantity(int businessId, String barcode) throws Exception {
+		logger.info("selectReservedQuantity() 호출");
+		Map<String, Object> params = new HashMap<>();
+	    params.put("businessId", businessId);
+	    params.put("barcode", barcode);
+		return sqlSession.selectOne(NAMESPACE + "selectReservedQuantity", params);
+	}
+	
+	@Override
+	public ProductVO selectProductNameBarcode(int businessId, String barcode) throws Exception {
+		logger.info("selectProductNameBarcode() 호출");
+		Map<String, Object> params = new HashMap<>();
+		params.put("businessId", businessId);
+		params.put("barcode", barcode);
+		return sqlSession.selectOne(NAMESPACE + "selectProductNameBarcode", params);
+	}
+
+	@Override
+	public void updateReceivingStatusToComplete(int businessId, String barcode) throws Exception {
+		logger.info("updateReceivingStatusToComplete() 호출");
+		Map<String, Object> params = new HashMap<>();
+		params.put("businessId", businessId);
+		params.put("barcode", barcode);
+		sqlSession.update(NAMESPACE + "updateReceivingStatusToComplete", params);
+		
+	}
+	
+	
 	
 	
 	
diff --git a/stockMate/src/main/java/com/stockm8/persistence/UserDAO.java b/stockMate/src/main/java/com/stockm8/persistence/UserDAO.java
index bffd333..469609d 100644
--- a/stockMate/src/main/java/com/stockm8/persistence/UserDAO.java
+++ b/stockMate/src/main/java/com/stockm8/persistence/UserDAO.java
@@ -8,43 +8,39 @@
 
 import com.stockm8.domain.vo.UserVO;
 
+
 public interface UserDAO {
-	
-	// 회원가입 동작
-	public void userJoin(UserVO user);
-	
-	// 로그인 체크 동작
-	public UserVO userLogin(UserVO user);
-	
-	// 회원정보 조회동작
-	public UserVO getUser(Long userId);
-	
-	// 회원정보 수정동작
-	public void updateUser (UserVO user);
-	
+
+    // 회원가입 동작
+    public void userJoin(UserVO user);
+
+    // 로그인 체크 동작
+    public UserVO userLogin(UserVO user);
+
+    // 회원정보 조회동작
+    public UserVO getUser(Long userId , String password); //
+
+    // 회원정보 수정동작
+    public void updateUser (UserVO user);
+    
+    public UserVO getUserInfoById(Long userId) throws Exception;
+
+    void updatePassword(@Param("userId") Long userId, @Param("newPassword") String newPassword);
+
     // 사용자의 businessId 수정
-	int updateUserBusinessId(@Param("userId") Long userId, @Param("businessId") int businessId);
-	
-	// 회원정보 삭제동작
-	public int deleteUser (UserVO user);
-	
-	// 회원정보 목록(list)
-	public List<UserVO> getUserList();
-	
-	/**
-     * 유저 정보를 user_id로 조회합니다.
-     * @param userId 유저 ID
-     * @return UserVO 유저 정보
-     * @throws Exception 데이터베이스 작업 중 예외
-     */
-	@Select("SELECT * FROM users WHERE user_id = #{userId}")
+    int updateUserBusinessId(@Param("userId") Long userId, @Param("businessId") int businessId);
+
+    
+    // 회원정보 삭제동작
+    public int deleteUser (UserVO user);
+
+    // 회원정보 목록(list)
+    public List<UserVO> getUserList();
+
+    @Select("SELECT * FROM users WHERE user_id = #{userId}")
     UserVO getUserById(@Param("userId")Long userId) throws Exception;
-	
-    /**
-     * 유저의 삭제 여부를 가져옵니다.
-     * @param userId 유저 ID
-     * @return 삭제 여부 (1: 삭제됨, 0: 삭제되지 않음)
-     */
+
+
     int getIsDeleted(Long userId) throws Exception;
 
-}
+}
\ No newline at end of file
diff --git a/stockMate/src/main/java/com/stockm8/persistence/UserDAOImpl.java b/stockMate/src/main/java/com/stockm8/persistence/UserDAOImpl.java
index c220870..8017d22 100644
--- a/stockMate/src/main/java/com/stockm8/persistence/UserDAOImpl.java
+++ b/stockMate/src/main/java/com/stockm8/persistence/UserDAOImpl.java
@@ -39,18 +39,46 @@ public UserVO userLogin(UserVO user) {
 	}
 
 	@Override
-	public UserVO getUser(Long userId) {
-		logger.info("getUser 실행: user_id = " + userId);
-		return sqlSession.selectOne(NAMESPACE + "getUser", userId);
+	public UserVO getUser(Long userId, String password) {
+	    logger.info("getUser 실행: user_id = " + userId);
+
+	    // 비밀번호가 일치하는 사용자 정보 조회
+	    Map<String, Object> params = new HashMap<>();
+	    params.put("userId", userId);
+	    params.put("password", password);
+
+	    // 비밀번호와 사용자 ID를 사용하여 조회
+	    return sqlSession.selectOne(NAMESPACE + "getUser", params);
 	}
 
 	@Override
 	public void updateUser(UserVO user) {
-		logger.info("updateUser 실행: " + user);
-		sqlSession.update(NAMESPACE + "updateUser", user);
-		logger.info("회원정보 수정 완료!");
+		 logger.info("updateUser 실행: " + user);  // 전달되는 userVO 객체 확인
+		   sqlSession.update(NAMESPACE + "updateUser", user);
+		
+		   logger.info("회원정보 수정 완료!");
+		   
+		   
 	}
 	
+	@Override
+	public UserVO getUserInfoById(Long userId) throws Exception {
+	    return sqlSession.selectOne("UserMapper.getUserInfoById", userId);
+	}
+
+	@Override
+	public void updatePassword(Long userId, String newPassword) {
+	    logger.info("updatePassword 실행: userId = " + userId);
+
+	    Map<String, Object> params = new HashMap<>();
+	    params.put("userId", userId);
+	    params.put("newPassword", newPassword);
+
+	    sqlSession.update(NAMESPACE + "updatePassword", params);
+	    logger.info("비밀번호 변경 완료");
+	}
+
+	
 	@Override
 	public int updateUserBusinessId(Long userId, int businessId) {
 	    Map<String, Object> params = new HashMap<>();
@@ -61,6 +89,10 @@ public int updateUserBusinessId(Long userId, int businessId) {
 	    return sqlSession.update(NAMESPACE + "updateUserBusinessId", params);
 	}
 
+	
+	
+	
+	
 	@Override
 	public int deleteUser(UserVO user) {
 		logger.info("deleteUser 실행: " + user);
@@ -86,4 +118,4 @@ public UserVO getUserById(Long userId) throws Exception {
         return sqlSession.selectOne(NAMESPACE + "getUserById", userId);
     }
 
-}
+}
\ No newline at end of file
diff --git a/stockMate/src/main/java/com/stockm8/service/ReceivingService.java b/stockMate/src/main/java/com/stockm8/service/ReceivingService.java
index 283b221..b01ed0e 100644
--- a/stockMate/src/main/java/com/stockm8/service/ReceivingService.java
+++ b/stockMate/src/main/java/com/stockm8/service/ReceivingService.java
@@ -5,7 +5,9 @@
 import org.apache.ibatis.annotations.Mapper;
 
 import com.stockm8.domain.vo.Criteria;
+import com.stockm8.domain.vo.ProductVO;
 import com.stockm8.domain.vo.ReceivingShipmentVO;
+import com.stockm8.domain.vo.StockVO;
 
 @Mapper
 public interface ReceivingService {
@@ -36,5 +38,15 @@ public interface ReceivingService {
 	
 	// 바코드 찍은 후 재고수량 증가
 	public int increseStockByBarcode(int businessId, String barcode) throws Exception;
+	
+	// 바코드 찍은 후 발주 수량 감소
+	public int decreaseReservedQuantity(int businessId, String barcode) throws Exception;
+	
+	// 바코드 찍은 후 제품 이름 추출
+	public ProductVO productNameBarcode(int businessId, String barcode) throws Exception;
+	
+	// 수량 없을시 완료상태로 변경
+	public void ReceivingStatusToComplete(int businessId, String barcode) throws Exception;
+
 
 } // ReceivingService end
\ No newline at end of file
diff --git a/stockMate/src/main/java/com/stockm8/service/ReceivingServiceImpl.java b/stockMate/src/main/java/com/stockm8/service/ReceivingServiceImpl.java
index 3c1efbb..8195b71 100644
--- a/stockMate/src/main/java/com/stockm8/service/ReceivingServiceImpl.java
+++ b/stockMate/src/main/java/com/stockm8/service/ReceivingServiceImpl.java
@@ -14,7 +14,6 @@
 import com.stockm8.domain.vo.ReceivingShipmentVO;
 import com.stockm8.domain.vo.StockVO;
 import com.stockm8.persistence.ReceivingDAO;
-import com.stockm8.persistence.StockDAO;
 
 @Service
 public class ReceivingServiceImpl implements ReceivingService {
@@ -24,8 +23,6 @@ public class ReceivingServiceImpl implements ReceivingService {
 	@Inject
 	private ReceivingDAO rdao;
 	
-	@Inject
-	private StockDAO sdao;
 
 	// 메인 입고 리스트
 	@Override
@@ -94,6 +91,35 @@ public int increseStockByBarcode(int businessId, String barcode) throws Exceptio
         }
     }
 
+	@Override
+	public int decreaseReservedQuantity(int businessId, String barcode) throws Exception {
+		logger.info("decreaseReservedQuantity() 호출");
+		
+		return rdao.selectReservedQuantity(businessId, barcode);
+	}
+
+	@Override
+	public ProductVO productNameBarcode(int businessId, String barcode) throws Exception {
+		logger.info("productNameBarcode() 호출");
+		
+		return rdao.selectProductNameBarcode(businessId, barcode);
+	}
+	
+	@Override
+	public void ReceivingStatusToComplete(int businessId, String barcode) {
+	    try {
+	        // MyBatis 매퍼 호출
+	        rdao.updateReceivingStatusToComplete(businessId, barcode);
+	    } catch (Exception e) {
+	        // 예외 처리
+	        logger.error("입고 상태 업데이트 오류: " + e.getMessage());
+	    }
+	}
+	
+	
+	
+	
+
 
 
 } // ReceivingServiceImpl end
\ No newline at end of file
diff --git a/stockMate/src/main/java/com/stockm8/service/UserService.java b/stockMate/src/main/java/com/stockm8/service/UserService.java
index c4f556f..1ecc36f 100644
--- a/stockMate/src/main/java/com/stockm8/service/UserService.java
+++ b/stockMate/src/main/java/com/stockm8/service/UserService.java
@@ -7,42 +7,47 @@
 
 public interface UserService {
 
-	//실행하려는 동작 추상메서드로 구현
-	
-	// 회원가입
-	public void userJoin(UserVO user) throws Exception;
-	
-	// 로그인 체크
-	public UserVO userLogin(UserVO user) throws Exception;
-	
-	// 회원정보 조회
-	public UserVO getUser(Long userId) throws Exception;
-	
-	// 회원정보 수정
-	public void updateUser(UserVO user) throws Exception;
-	
-	// 회원정보에서 BusinessId 수정
-	public void updateUserBusinessId(Long userId, int businessId) throws Exception;
-	
-	// 회원정보 삭제
-	public int deleteUser(UserVO user) throws Exception;
-	
-	// 회원정보 목록조회
-	public List<UserVO> userList() throws Exception;
-	
-	/**
-	 * 유저 정보를 user_id로 조회합니다.
-	 * @param userId 유저 ID
-	 * @return UserVO 유저 정보
-	 * @throws Exception 서비스 작업 중 예외
-	 */
-	UserVO getUserById(Long userId) throws Exception;
-	
+   //실행하려는 동작 추상메서드로 구현
+   
+   // 회원가입
+   public void userJoin(UserVO user) throws Exception;
+   
+   // 로그인 체크
+   public UserVO userLogin(UserVO user) throws Exception;
+   
+   // 회원정보 조회
+   public UserVO getUser(Long userId,String password) throws Exception;
+   
+   // 회원정보 수정
+   public void updateUser(UserVO user) throws Exception;
+   
+   public UserVO getUserInfoById(Long userId) throws Exception;
+   
+   void updatePassword(Long userId, String newPassword) throws Exception;
+
+
+   // 회원정보에서 비밀번호 수정
+   public void updateUserBusinessId(Long userId, int businessId) throws Exception;
+   
+   // 회원정보 삭제
+   public int deleteUser(UserVO user) throws Exception;
+   
+   // 회원정보 목록조회
+   public List<UserVO> userList() throws Exception;
+   
+   /**
+    * 유저 정보를 user_id로 조회합니다.
+    * @param userId 유저 ID
+    * @return UserVO 유저 정보
+    * @throws Exception 서비스 작업 중 예외
+    */
+   UserVO getUserById(Long userId) throws Exception;
+   
     /**
      * 유저의 삭제 여부를 가져옵니다.
      * @param userId 유저 ID
      * @return 삭제 여부 (1: 삭제됨, 0: 삭제되지 않음)
      */
-	int getIsDeleted(Long userId) throws Exception;
+   int getIsDeleted(Long userId) throws Exception;
 
 }
\ No newline at end of file
diff --git a/stockMate/src/main/java/com/stockm8/service/UserServiceImpl.java b/stockMate/src/main/java/com/stockm8/service/UserServiceImpl.java
index 49f7529..321c80b 100644
--- a/stockMate/src/main/java/com/stockm8/service/UserServiceImpl.java
+++ b/stockMate/src/main/java/com/stockm8/service/UserServiceImpl.java
@@ -41,10 +41,10 @@ public UserVO userLogin(UserVO user) throws Exception {
 	}
 
 	@Override
-	public UserVO getUser(Long userId) throws Exception {
+	public UserVO getUser(Long userId, String password) throws Exception {
 		logger.info(" getuser(String user_id)호출 ");
 
-		return userDAO.getUser(userId);
+		return userDAO.getUser(userId, password);
 	}
 	
 	// 회원 정보 수정 
@@ -56,6 +56,17 @@ public void updateUser(UserVO user) throws Exception {
 		userDAO.updateUser(user);
 	}
 	
+	@Override
+	public UserVO getUserInfoById(Long userId) throws Exception {
+	    return userDAO.getUserInfoById(userId);
+	}
+	
+	@Override
+	public void updatePassword(Long userId, String newPassword) throws Exception {
+	    userDAO.updatePassword(userId, newPassword);
+	}
+
+
 	@Override
 	public void updateUserBusinessId(Long userId, int businessId) throws Exception {
 		logger.info("updateUserBusinessId() 실행");
@@ -93,4 +104,4 @@ public int getIsDeleted(Long userId) throws Exception {
     }
     
     
-}
+}
\ No newline at end of file
diff --git a/stockMate/src/main/resources/mappers/receivingMapper.xml b/stockMate/src/main/resources/mappers/receivingMapper.xml
index 38dd884..fed3709 100644
--- a/stockMate/src/main/resources/mappers/receivingMapper.xml
+++ b/stockMate/src/main/resources/mappers/receivingMapper.xml
@@ -214,19 +214,20 @@
    <!-- receiving scan을 위한 매퍼 -->
    <!-- 바코드로 제품 조회 -->
 <select id="selectQuantityCheckByBarcode" resultType="com.stockm8.domain.vo.StockVO">
-       SELECT s.product_id, p.product_name, s.total_quantity, s.warehouse_id
-       FROM stocks s
-       JOIN products p ON p.product_id = s.product_id
-       WHERE p.product_barcode = #{barcode} AND s.business_id = #{businessId}
+	SELECT s.product_id, p.product_name, s.total_quantity, s.warehouse_id
+	FROM stocks s
+	JOIN products p ON p.product_id = s.product_id
+	WHERE p.product_barcode = #{barcode} AND s.business_id = #{businessId}
 </select>
 
 <!-- 바코드로 재고 1 감소 -->
 <update id="updateIncreseStock">
     UPDATE stocks s
     JOIN products p on p.product_id = s.product_id
-    SET s.total_quantity = s.total_quantity + 1
+    SET s.total_quantity = s.total_quantity + 1,
+    s.reserved_quantity = s.reserved_quantity -1
     WHERE p.product_barcode = #{barcode} AND s.business_id = #{businessId}
-    AND s.total_quantity > 0
+    AND s.reserved_quantity > 0
 </update>
 
 <!-- 바코드로 남은 재고 조회 -->
@@ -236,6 +237,33 @@
     JOIN products p on p.product_id = s.product_id
     WHERE p.product_barcode = #{barcode} AND s.business_id = #{businessId}
 </select>
+
+<!-- 바코드로 남은 발주 수량 조회 -->
+<select id="selectReservedQuantity" resultType="int">
+    SELECT s.reserved_quantity
+    FROM stocks s
+    JOIN products p on p.product_id = s.product_id
+    WHERE p.product_barcode = #{barcode} AND s.business_id = #{businessId}
+</select>
+
+<!-- 바코드로 제품 이름 조회 -->
+<select id="selectProductNameBarcode" resultType="com.stockm8.domain.vo.ProductVO">
+    SELECT p.product_name, p.product_price
+    FROM stocks s
+    JOIN products p on p.product_id = s.product_id
+    WHERE p.product_barcode = #{barcode} AND s.business_id = #{businessId}
+</select>
+
+<update id="updateReceivingStatusToComplete">
+    UPDATE receiving_shipment r
+    JOIN products p ON r.product_id = p.product_id
+    JOIN stocks s ON s.product_id = p.product_id
+    SET r.status = 'COMPLETED'
+    WHERE p.product_barcode = #{barcode}
+    AND s.reserved_quantity = 1
+    AND r.status = 'PENDING'
+    AND s.business_id = #{businessId};
+</update>
 <!-- receiving scan을 위한 매퍼 -->
 
 </mapper>
diff --git a/stockMate/src/main/resources/mappers/userMapper.xml b/stockMate/src/main/resources/mappers/userMapper.xml
index f1ad100..92b02c0 100644
--- a/stockMate/src/main/resources/mappers/userMapper.xml
+++ b/stockMate/src/main/resources/mappers/userMapper.xml
@@ -65,7 +65,14 @@
         WHERE email = #{email} AND password = #{password}
     </select>
 
-    <!-- 회원정보 조회 -->
+
+   <!-- 회원정보 조회 -->
+<select id="getUser" resultMap="UserResultMap">
+    SELECT * FROM test_users
+    WHERE user_id = #{userId} AND password = #{password}
+</select>
+  
+      <!-- 회원정보 조회 -->
     <select id="getUser" 
         parameterType="long"
         resultMap="userResultMap">
@@ -74,7 +81,17 @@
         WHERE user_id = #{userId}
     </select>
 
-    <!-- 회원정보 수정 -->
+    <!-- 회원정보 수정 (비밀번호 수정하지 않음) -->
+<update id="updateUser">
+    UPDATE test_users
+    SET 
+        email = #{email},
+        name = #{name},
+        tel_number = #{telNumber}
+    WHERE user_id = #{userId}
+</update>
+  
+      <!-- 회원정보 수정 -->
     <update id="updateUser">
         UPDATE users
         SET 
@@ -86,6 +103,18 @@
             AND password = #{password}
     </update>
 
+<select id="getUserInfoById" parameterType="Long" resultType="com.stockm8.domain.vo.UserVO">
+    SELECT user_id AS userId, name, email, tel_number AS telNumber
+    FROM test_users
+    WHERE user_id = #{userId}
+</select>
+
+<update id="updatePassword" parameterType="map">
+    UPDATE test_users
+    SET password = #{newPassword}
+    WHERE user_id = #{userId}
+</update>
+ 
     <!-- 사용자의 businessId 수정 -->
     <update id="updateUserBusinessId" 
         parameterType="map">
@@ -112,7 +141,7 @@
         FROM users
     </select>
 
-    <!-- 유저 정보를 user_id로 조회 -->
+    <!-- 유저 정보를 user_id로 조회 -->	
     <select id="getUserById" 
         parameterType="long"
         resultMap="userResultMap">
@@ -133,6 +162,7 @@
         WHERE user_id = #{userId}
     </select>
 
+
     <!-- 유저의 삭제 여부 확인 -->
     <select id="getIsDeleted" 
         parameterType="long" 
diff --git a/stockMate/src/main/webapp/WEB-INF/views/category/list.jsp b/stockMate/src/main/webapp/WEB-INF/views/category/list.jsp
index a43b58e..9e9db19 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/category/list.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/category/list.jsp
@@ -1,13 +1,74 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <!DOCTYPE html>
 <html>
 <head>
-<meta charset="UTF-8">
-<title>카테고리 목록</title>
-</head>
+	<meta charset="UTF-8">
+	<title>카테고리 목록</title>
+	<style>
+        body {
+            font-family: Arial, sans-serif;
+            margin: 20px;
+            background-color: #f5f5f5;
+        }
+
+        h1 {
+            text-align: center;
+            color: #333;
+        }
+
+        table {
+            width: 100%;
+            border-collapse: collapse;
+            margin: 20px 0;
+            background-color: #fff;
+            table-layout: fixed;
+        }
+
+        th, td {
+            border: 1px solid #ddd;
+            padding: 10px;
+            text-align: center;
+            word-break: break-word;
+        }
+
+        th {
+            background-color: #007BFF;
+            color: #fff;
+            position: sticky;
+            top: 0;
+        }
+
+        tr:nth-child(even) {
+            background-color: #f9f9f9;
+        }
 
+        tr:hover {
+            background-color: #f1f1f1;
+        }
+
+        a {
+            color: #007BFF;
+            text-decoration: none;
+        }
+
+        a:hover {
+            text-decoration: underline;
+        }
+
+        .low-stock {
+            color: red;
+            font-weight: bold;
+        }
+
+        .container {
+            max-width: 1200px;
+            margin: 0 auto;
+            padding: 20px;
+        }
+    </style>
+</head>
 <body>
     <h1>/views/category/list.jsp</h1>
 
diff --git a/stockMate/src/main/webapp/WEB-INF/views/category/register.jsp b/stockMate/src/main/webapp/WEB-INF/views/category/register.jsp
index ff92db8..dc12105 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/category/register.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/category/register.jsp
@@ -6,11 +6,13 @@
 <head>
 <meta charset="UTF-8">
 <title>카테고리 등록</title>
+<link rel="stylesheet" href="<c:url value='/resources/css/CategoryregistStyle.css' />">
+<link rel="stylesheet" href="<c:url value='/resources/css/modalStyle.css' />">
 </head>
 <body>
-	<h1> /views/category/register.jsp </h1>
 	
 	<form action="/category/register" method="post">
+		<h2>카테고리 등록 페이지</h2>
 	    <!-- 상위 카테고리 선택 -->
 	    <label for="parentCategoryId">상위 카테고리:</label>
 	    <select id="parentCategoryId" name="parentId">
diff --git a/stockMate/src/main/webapp/WEB-INF/views/dashboard.jsp b/stockMate/src/main/webapp/WEB-INF/views/dashboard.jsp
index b7c59d7..489a246 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/dashboard.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/dashboard.jsp
@@ -190,6 +190,16 @@
             <div class="sidebar">
                 <div class="disabled">Dashboard</div>
                 <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>
+			<script>
+			function confirmLogout() {
+			    alert("로그아웃 되었습니다");
+			    return true; // 링크 이동을 계속 진행
+			}
+			</script>
                 <a href="warehouse/register">창고 등록</a>
                 <a href="stock/register">재고 등록</a>
                 <a href="profile">내정보 조회/수정</a>
@@ -197,7 +207,6 @@
                 <a href="help">대시보드 사용법</a>
                 <a href="user/signout" style="color: red;">Sign out</a>
             </div>
-
             <!-- Main Content -->
             <div class="main-content">
                 <h2>Order Time</h2>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/qrScanner.jsp b/stockMate/src/main/webapp/WEB-INF/views/qrScanner.jsp
index 02d2a63..40d3525 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/qrScanner.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/qrScanner.jsp
@@ -1,61 +1,341 @@
 <%@ 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://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>
 <style>
 body {
-	font-family: Arial, sans-serif;
-	text-align: center;
-	margin: 0;
-	padding: 0;
+    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;
 }
 
 h1 {
-	margin-top: 20px;
+    color: #2c3e50;
+    margin: 20px 0;
+    font-size: 24px;
 }
 
-.scanner-container {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	margin: 20px auto;
-	max-width: 600px;
+main {
+    width: 100%;
+    max-width: 900px;
+    text-align: center;
+    padding: 20px;
 }
 
-#reader {
-	width: 100%;
-	max-width: 500px;
-	height: 400px;
-	border: 2px solid #ddd;
+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;
+}
+
+input[type="text"]:focus {
+    border-color: #3498db;
 }
 
 button {
-	padding: 10px 20px;
-	font-size: 16px;
-	cursor: pointer;
+    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;
 }
 
 table {
-	width: 80%;
-	margin: 20px auto;
-	border-collapse: collapse;
+    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);
 }
 
 th, td {
-	border: 1px solid #ddd;
-	padding: 10px;
-	text-align: center;
+    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;
+}
+
+#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>
 
 	<!-- 카메라 선택 및 제어 버튼 -->
diff --git a/stockMate/src/main/webapp/WEB-INF/views/receiving/allScan.jsp b/stockMate/src/main/webapp/WEB-INF/views/receiving/allScan.jsp
new file mode 100644
index 0000000..023b0b6
--- /dev/null
+++ b/stockMate/src/main/webapp/WEB-INF/views/receiving/allScan.jsp
@@ -0,0 +1,341 @@
+<%@ page language="java" contentType="text/html; charset=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>
+<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;
+}
+
+h1 {
+    color: #2c3e50;
+    margin: 20px 0;
+    font-size: 24px;
+}
+
+main {
+    width: 100%;
+    max-width: 900px;
+    text-align: center;
+    padding: 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;
+}
+
+input[type="text"]:focus {
+    border-color: #3498db;
+}
+
+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;
+}
+
+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);
+}
+
+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;
+}
+
+#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;
+    }
+    </script>
+</body>
+</html>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/receiving/history.jsp b/stockMate/src/main/webapp/WEB-INF/views/receiving/history.jsp
index 505f9a1..31ea01a 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/receiving/history.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/receiving/history.jsp
@@ -292,7 +292,19 @@ tr:hover {
 					<td>${vo.transactionType }</td>
 					<td><fmt:formatDate value="${vo.createdAt}"
 							pattern="yyyy-MM-dd HH:mm:ss" /></td>
-					<td>${vo.status }</td>
+					<td>
+			            <c:choose>
+			                <c:when test="${vo.status == 'PENDING'}">
+			                    대기중
+			                </c:when>
+			                <c:when test="${vo.status == 'COMPLETED'}">
+			                    완료됨
+			                </c:when>
+			                <c:otherwise>
+			                    ${vo.status}
+			                </c:otherwise>
+			            </c:choose>
+			        </td>
 					<td>${vo.productId }</td>
 					<td>${vo.productName }</td>
 					<td>${vo.productDescription }</td>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/receiving/main.jsp b/stockMate/src/main/webapp/WEB-INF/views/receiving/main.jsp
index 7d6992b..edf7fc6 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/receiving/main.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/receiving/main.jsp
@@ -8,106 +8,129 @@
 <meta charset="UTF-8">
 <title>입고 메인</title>
 <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-    <style>
-        /* 전체 페이지 스타일 */
-        body {
-            font-family: 'Arial', sans-serif;
-            background-color: #f4f4f9;
-            color: #333;
-            margin: 0;
-            padding: 0;
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-        }
+<style>
+    /* 전체 페이지 스타일 */
+    body {
+        font-family: 'Arial', sans-serif;
+        background-color: #f4f4f9;
+        margin: 0;
+        padding: 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        color: #333;
+    }
 
-        h1 {
-            text-align: center;
-            margin-top: 30px;
-            color: #2c3e50;
-        }
+    h1 {
+        font-size: 36px;
+        font-weight: 700;
+        color: #2c3e50;
+        text-align: center;
+        margin-top: 40px;
+    }
 
-        a {
-            display: inline-block;
-            padding: 10px 20px;
-            margin: 20px 0;
-            font-size: 16px;
-            color: #fff;
-            background-color: #3498db;
-            text-decoration: none;
-            border-radius: 5px;
-            transition: background-color 0.3s;
-        }
+    a {
+        display: inline-block;
+        padding: 12px 25px;
+        margin: 20px;
+        font-size: 18px;
+        color: #fff;
+        background-color: #3498db;
+        text-decoration: none;
+        border-radius: 6px;
+        transition: background-color 0.3s ease;
+    }
 
-        a:hover {
-            background-color: #2980b9;
-        }
+    a:hover {
+        background-color: #2980b9;
+    }
 
-        /* 테이블 스타일 */
-        table {
-            width: 90%;
-            max-width: 1200px;
-            margin-bottom: 40px;
-            border-collapse: collapse;
-            background-color: #fff;
-            box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
-        }
+    form {
+        margin-bottom: 40px;
+    }
 
-        th, td {
-            padding: 12px;
-            text-align: center;
-            border: 1px solid #ddd;
-        }
+    input[type="submit"] {
+        padding: 12px 25px;
+        background-color: #3498db;
+        color: white;
+        font-size: 16px;
+        border: none;
+        border-radius: 6px;
+        cursor: pointer;
+        transition: background-color 0.3s ease;
+    }
 
-        th {
-            background-color: #3498db;
-            color: white;
-        }
+    input[type="submit"]:hover {
+        background-color: #2980b9;
+    }
 
-        tr:nth-child(even) {
-            background-color: #f2f2f2;
-        }
+    /* 테이블 스타일 */
+    table {
+        width: 90%;
+        max-width: 1200px;
+        margin-bottom: 40px;
+        border-collapse: collapse;
+        background-color: #fff;
+        box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+        border-radius: 6px;
+        overflow: hidden;
+    }
 
-        tr:hover {
-            background-color: #ecf0f1;
-        }
+    th, td {
+        padding: 12px;
+        text-align: center;
+        border: 1px solid #ddd;
+        font-size: 14px;
+    }
 
-        /* 테이블 헤더 크기 조정 */
-        th {
-            font-size: 14px;
-        }
+    th {
+        background-color: #3498db;
+        color: white;
+    }
 
-        td {
-            font-size: 13px;
+    tr:nth-child(even) {
+        background-color: #f9f9f9;
+    }
+
+    tr:hover {
+        background-color: #ecf0f1;
+    }
+
+    /* 구분선 */
+    hr {
+        width: 90%;
+        max-width: 1200px;
+        margin-top: 40px;
+        margin-bottom: 40px;
+        border: 0;
+        border-top: 1px solid #ddd;
+    }
+
+    /* 작은 화면에서 더 나은 보기 */
+    @media (max-width: 768px) {
+        h1 {
+            font-size: 28px;
         }
 
-        /* 추가된 구분선 */
-        hr {
-            width: 90%;
-            max-width: 1200px;
-            margin-top: 40px;
-            margin-bottom: 40px;
-            border: 0;
-            border-top: 1px solid #ddd;
+        table {
+            width: 100%;
+            font-size: 12px;
         }
 
-        /* 작은 화면에서 더 나은 보기 */
-        @media (max-width: 768px) {
-            table {
-                width: 100%;
-                font-size: 12px;
-            }
+        a {
+            font-size: 16px;
+        }
 
-            a {
-                font-size: 14px;
-            }
+        th, td {
+            padding: 10px;
+        }
 
-            th, td {
-                padding: 8px;
-            }
+        input[type="submit"] {
+            font-size: 14px;
+            padding: 10px 20px;
         }
-    </style>
+    }
+</style>
 </head>
 <body>
 
@@ -117,103 +140,119 @@
 <a href="/receiving/scan">실시간 입고</a>
 <a href="/dashboard">대쉬보드</a>
 <form action="/receiving/insert1" method="POST">
-   <input type="submit" value="새로고침">
+    <input type="submit" value="새로고침">
 </form>
 
 <!-- 오늘 입고 리스트 -->
+<h2>오늘 입고 리스트</h2>
 <table border="1">
-	<tr>
-		<th>입고 번호</th>
-		<th>입고 출고</th>
-		<th>입고 일자</th>
-		<th>입고 상태</th>
-		<th>제품 번호</th>
-		<th>제품명</th>
-		<th>옵션명</th>
-		<th>입고 수량</th>
-		<th>수량 단위</th>
-		<th>작업 메모</th>
-	</tr>
-	<c:forEach var="vo" items="${ReceivingList }">
-	<tr>
-		<td>${vo.receivingShipmentNo }</td>
-		<td>${vo.transactionType }</td>
-		<td><fmt:formatDate value="${vo.createdAt}" pattern="yyyy-MM-dd HH:mm:ss" /></td>
-		<td>${vo.status}</td>
-		<td>${vo.productId }</td>
-		<td>${vo.productName }</td>
-		<td>${vo.productDescription }</td>
-		<td>${vo.changeQuantity }</td>
-		<td>${vo.transactionUnit }</td>
-		<td>${vo.memo }</td>
-	</tr>
-	</c:forEach>
+    <tr>
+        <th>입고 번호</th>
+        <th>입고 출고</th>
+        <th>입고 일자</th>
+        <th>입고 상태</th>
+        <th>제품 번호</th>
+        <th>제품명</th>
+        <th>옵션명</th>
+        <th>입고 수량</th>
+        <th>수량 단위</th>
+        <th>작업 메모</th>
+    </tr>
+    <c:forEach var="vo" items="${ReceivingList}">
+        <tr>
+            <td>${vo.receivingShipmentNo}</td>
+            <td>${vo.transactionType}</td>
+            <td><fmt:formatDate value="${vo.createdAt}" pattern="yyyy-MM-dd HH:mm:ss" /></td>
+            <td>
+                <c:choose>
+                    <c:when test="${vo.status == 'PENDING'}">대기중</c:when>
+                    <c:when test="${vo.status == 'COMPLETED'}">완료됨</c:when>
+                    <c:otherwise>${vo.status}</c:otherwise>
+                </c:choose>
+            </td>
+            <td>${vo.productId}</td>
+            <td>${vo.productName}</td>
+            <td>${vo.productDescription}</td>
+            <td>${vo.changeQuantity}</td>
+            <td>${vo.transactionUnit}</td>
+            <td>${vo.memo}</td>
+        </tr>
+    </c:forEach>
 </table>
 
-
 <!-- 어제 입고 리스트 -->
+<h2>어제 입고 리스트</h2>
 <table border="1">
-	<tr>
-		<th>입고 번호</th>
-		<th>입고 출고</th>
-		<th>입고 일자</th>
-		<th>입고 상태</th>
-		<th>제품 번호</th>
-		<th>제품명</th>
-		<th>옵션명</th>
-		<th>입고 수량</th>
-		<th>수량 단위</th>
-		<th>작업 메모</th>
-	</tr>
-	<c:forEach var="vo" items="${YesterdayReceivingList }">
-	<tr>
-		<td>${vo.receivingShipmentNo }</td>
-		<td>${vo.transactionType }</td>
-		<td><fmt:formatDate value="${vo.createdAt}" pattern="yyyy-MM-dd HH:mm:ss" /></td>
-		<td>${vo.status }</td>
-		<td>${vo.productId }</td>
-		<td>${vo.productName }</td>
-		<td>${vo.productDescription }</td>
-		<td>${vo.changeQuantity }</td>
-		<td>${vo.transactionUnit }</td>
-		<td>${vo.memo }</td>
-	</tr>
-	</c:forEach>
+    <tr>
+        <th>입고 번호</th>
+        <th>입고 출고</th>
+        <th>입고 일자</th>
+        <th>입고 상태</th>
+        <th>제품 번호</th>
+        <th>제품명</th>
+        <th>옵션명</th>
+        <th>입고 수량</th>
+        <th>수량 단위</th>
+        <th>작업 메모</th>
+    </tr>
+    <c:forEach var="vo" items="${YesterdayReceivingList}">
+        <tr>
+            <td>${vo.receivingShipmentNo}</td>
+            <td>${vo.transactionType}</td>
+            <td><fmt:formatDate value="${vo.createdAt}" pattern="yyyy-MM-dd HH:mm:ss" /></td>
+            <td>
+                <c:choose>
+                    <c:when test="${vo.status == 'PENDING'}">대기중</c:when>
+                    <c:when test="${vo.status == 'COMPLETED'}">완료됨</c:when>
+                    <c:otherwise>${vo.status}</c:otherwise>
+                </c:choose>
+            </td>
+            <td>${vo.productId}</td>
+            <td>${vo.productName}</td>
+            <td>${vo.productDescription}</td>
+            <td>${vo.changeQuantity}</td>
+            <td>${vo.transactionUnit}</td>
+            <td>${vo.memo}</td>
+        </tr>
+    </c:forEach>
 </table>
 
-
-
 <!-- 그저께 입고 리스트 -->
+<h2>그저께 입고 리스트</h2>
 <table border="1">
-	<tr>
-		<th>입고 번호</th>
-		<th>입고 출고</th>
-		<th>입고 일자</th>
-		<th>입고 상태</th>
-		<th>제품 번호</th>
-		<th>제품명</th>
-		<th>옵션명</th>
-		<th>입고 수량</th>
-		<th>수량 단위</th>
-		<th>작업 메모</th>
-	</tr>
-	<c:forEach var="vo" items="${TDBYReceivingList }">
-	<tr>
-		<td>${vo.receivingShipmentNo }</td>
-		<td>${vo.transactionType }</td>
-		<td><fmt:formatDate value="${vo.createdAt}" pattern="yyyy-MM-dd HH:mm:ss" /></td>
-		<td>${vo.status }</td>
-		<td>${vo.productId }</td>
-		<td>${vo.productName }</td>
-		<td>${vo.productDescription }</td>
-		<td>${vo.changeQuantity }</td>
-		<td>${vo.transactionUnit }</td>
-		<td>${vo.memo }</td>
-	</tr>
-	</c:forEach>
+    <tr>
+        <th>입고 번호</th>
+        <th>입고 출고</th>
+        <th>입고 일자</th>
+        <th>입고 상태</th>
+        <th>제품 번호</th>
+        <th>제품명</th>
+        <th>옵션명</th>
+        <th>입고 수량</th>
+        <th>수량 단위</th>
+        <th>작업 메모</th>
+    </tr>
+    <c:forEach var="vo" items="${TDBYReceivingList}">
+        <tr>
+            <td>${vo.receivingShipmentNo}</td>
+            <td>${vo.transactionType}</td>
+            <td><fmt:formatDate value="${vo.createdAt}" pattern="yyyy-MM-dd HH:mm:ss" /></td>
+            <td>
+                <c:choose>
+                    <c:when test="${vo.status == 'PENDING'}">대기중</c:when>
+                    <c:when test="${vo.status == 'COMPLETED'}">완료됨</c:when>
+                    <c:otherwise>${vo.status}</c:otherwise>
+                </c:choose>
+            </td>
+            <td>${vo.productId}</td>
+            <td>${vo.productName}</td>
+            <td>${vo.productDescription}</td>
+            <td>${vo.changeQuantity}</td>
+            <td>${vo.transactionUnit}</td>
+            <td>${vo.memo}</td>
+        </tr>
+    </c:forEach>
 </table>
 
-
-
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/receiving/scan.jsp b/stockMate/src/main/webapp/WEB-INF/views/receiving/scan.jsp
index 2d567f8..023b0b6 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/receiving/scan.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/receiving/scan.jsp
@@ -1,11 +1,12 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <!DOCTYPE html>
-<html>
+<html lang="ko">
 <head>
 <meta charset="UTF-8">
-<title>실시간 입고 관리</title>
+<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 () {
@@ -20,12 +21,31 @@ $(document).ready(function () {
                     data: JSON.stringify({ barcode: barcode }),
                     success: function (response) {
                         if (response.success) {
-                            $("#stockInfo").html("재고 업데이트 성공! 남은 재고: <b>" + response.remainingStock + "</b>");
+                            $("#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 {
-                            $("#stockInfo").html("오류 발생: " + response.message);
-                            if (confirm("새 제품으로 등록하시겠습니까?")) {
-                                window.location.href = "/product/register";
-                        	}
+                            alert("더이상 입고할 수량이 없습니다.");
+                            if(confirm("발주를 새로 등록 하시겠습니까?")) {
+                                window.location.href = "/order/register";
+                            }
                         }
                     },
                     error: function () {
@@ -38,13 +58,155 @@ $(document).ready(function () {
     });
 });
 </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;
+}
+
+h1 {
+    color: #2c3e50;
+    margin: 20px 0;
+    font-size: 24px;
+}
+
+main {
+    width: 100%;
+    max-width: 900px;
+    text-align: center;
+    padding: 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;
+}
+
+input[type="text"]:focus {
+    border-color: #3498db;
+}
+
+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;
+}
+
+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);
+}
+
+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;
+}
+
+#cameraSelect:focus {
+    border-color: #3498db;
+}
+
+</style>
 </head>
 <body>
-   <header>
+    <header>
         <h1>실시간 입고 관리 시스템</h1>
-        <a href="/receiving/main">입고 메인</a> | 
-        <a href="/receiving/history">입고 내역</a> | 
+        <a href="/receiving/main">입고 메인</a>
+        <a href="/receiving/history">입고 내역</a>
         <a href="/dashboard">대쉬보드</a>
+        <a href="/receiving/allScan">다중 스캔</a>
     </header>
     <main>
         <div>
@@ -55,5 +217,125 @@ $(document).ready(function () {
             <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;
+    }
+    </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/receiving/search.jsp b/stockMate/src/main/webapp/WEB-INF/views/receiving/search.jsp
index 91c01d7..b283067 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/receiving/search.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/receiving/search.jsp
@@ -291,15 +291,26 @@ tr:hover {
 					<td>${vo.transactionType }</td>
 					<td><fmt:formatDate value="${vo.createdAt}"
 							pattern="yyyy-MM-dd HH:mm:ss" /></td>
-					<td>${vo.status}</td>
+					<td>
+			            <c:choose>
+			                <c:when test="${vo.status == 'PENDING'}">
+			                    대기중
+			                </c:when>
+			                <c:when test="${vo.status == 'COMPLETED'}">
+			                    완료됨
+			                </c:when>
+			                <c:otherwise>
+			                    ${vo.status}
+			                </c:otherwise>
+			            </c:choose>
+			        </td>
 					<td>${vo.productId }</td>
 					<td>${vo.productName }</td>
 					<td>${vo.productDescription }</td>
 					<td>${vo.changeQuantity }</td>
 					<td>${vo.transactionUnit }</td>
-					<td>${vo.warehouseId }</td>
-					<td>${vo.transactionUnit }</td>
 					<td>${vo.productPrice }</td>
+					<td>${vo.warehouseId }</td>
 					<td>${vo.memo }</td>
 				</tr>
 			</c:forEach>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/user/Howtouse.jsp b/stockMate/src/main/webapp/WEB-INF/views/user/Howtouse.jsp
deleted file mode 100644
index c4aea3b..0000000
--- a/stockMate/src/main/webapp/WEB-INF/views/user/Howtouse.jsp
+++ /dev/null
@@ -1,132 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>상담문의</title>
-    <style>
-        body {
-            font-family: Arial, sans-serif;
-            margin: 0;
-            padding: 0;
-        }
-
-        .container {
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            padding: 20px;
-        }
-
-        .content {
-            width: 60%;
-            margin-bottom: 20px;
-            background-color: #005bac;
-            color: white;
-            padding: 10px;
-            border-radius: 8px;
-        }
-
-        .content h1 {
-            color: white;
-            text-align: center;
-        }
-
-        .content h3 {
-            text-align: center;
-        }
-
-        .content p {
-            margin: 8px 0;
-            line-height: 1.4;
-            text-align: center;
-        }
-
-        .form-container {
-            width: 25%;
-            background-color: #005bac;
-            color: white;
-            padding: 10px;
-            border-radius: 8px;
-            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
-        }
-
-        .form-container h2 {
-            color: white;
-            text-align: center;
-            margin-bottom: 10px;
-        }
-
-        .form-container input, .form-container textarea, .form-container button {
-            width: 95.3%;
-            margin-bottom: 8px;
-            padding: 8px;
-            border: none;
-            border-radius: 5px;
-        }
-
-        .form-container input[type="radio"] {
-            width: auto;
-        }
-
-        .form-container button {
-            background-color: #ffcc00;
-            color: black;
-            font-weight: bold;
-            cursor: pointer;
-        }
-
-        .form-container button:hover {
-            background-color: #ffaa00;
-        }
-
-        .footer {
-            text-align: center;
-            margin-top: 10px;
-        }
-    </style>
-</head>
-<body>
-    <div class="container">
-        <div class="content">
-            <h1>상담을 통해 궁금한 점을 즉시 해결하세요.</h1>
-
-            <h3>궁금한 점을 빠르게 확인할 수 있습니다.</h3>
-            <p>
-                • 연락처를 남겨주시면 영업 시간 기준 1일~2일 이내에 연락 드립니다.<br>
-                • 전문가와의 상담을 통해 문의사항을 빠르고 정확하게 해결하세요.
-            </p>
-
-            <h3>효과적인 시스템을 느껴보세요</h3>
-            <p>
-                • 우리 회사의 업무에 어떻게 적용할 수 있을지 확인할 수 있습니다.<br>
-                • 프로그램 도입 여부를 빠르게 판단할 수 있습니다.
-            </p>
-        </div>
-
-        <div class="form-container">
-            <h2>상담문의</h2>
-            <form action="main" method="post">
-                <input type="text" name="company" placeholder="회사명" required>
-                <input type="text" name="name" placeholder="이름" required>
-                <input type="text" name="contact" placeholder="연락처" required>
-                <input type="email" name="email" placeholder="E-mail" required>
-                <div>
-                    <label><input type="radio" name="contactMethod" value="전화" required> 전화</label>
-                    <label><input type="radio" name="contactMethod" value="이메일"> 이메일</label>
-                </div>
-                <textarea name="message" placeholder="문의내용" rows="5" required></textarea>
-                <div>
-                    <input type="checkbox" name="privacyConsent" required> 개인정보 수집에 동의함 (필수)
-                </div>
-                <button type="submit">상담신청</button>
-            </form>
-
-            <div class="footer">
-                궁금한 점이 있다면 지금 확인하세요!<br>
-                <strong>1588-2929</strong>
-            </div>
-        </div>
-    </div>
-</body>
-</html>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/user/changepassword1.jsp b/stockMate/src/main/webapp/WEB-INF/views/user/changepassword1.jsp
index 7096947..f056012 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/user/changepassword1.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/user/changepassword1.jsp
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>비밀번호 변경</title>
+    <title>비밀번호 확인</title>
     <style>
         body {
             font-family: Arial, sans-serif;
@@ -27,17 +27,27 @@
             text-align: center;
         }
         .back-button {
-            text-align: left;
+            display: flex;
+            align-items: center;
+            justify-content: flex-start;
+            width: 100%;
             margin-bottom: 20px;
         }
         .back-button a {
             text-decoration: none;
-            color: #007BFF;
             font-size: 18px;
+            color: #007BFF;
+            font-weight: bold;
+            display: flex;
+            align-items: center;
         }
         .back-button a:hover {
             text-decoration: underline;
         }
+        .back-button svg {
+            margin-right: 5px;
+            fill: #007BFF;
+        }
         h1 {
             margin-bottom: 20px;
             font-size: 24px;
@@ -74,27 +84,27 @@
             width: 100%;
         }
     </style>
-    <script>
-        function redirectToDashboard(event) {
-            event.preventDefault(); // Form submission 막기
-            window.location.href = 'dashboard';
-        }
-    </script>
 </head>
 <body>
+    <!-- Container -->
     <div class="container">
         <div class="back-button">
-            <a href="dashboard">&larr; 뒤로 가기</a>
+            <a href="/dashboard">
+                <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24">
+                    <path d="M0 0h24v24H0z" fill="none"/>
+                    <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"/>
+                </svg>
+                뒤로 가기
+            </a>
         </div>
-        <h1>비밀번호 변경</h1>
-        <form id="passwordForm" onsubmit="redirectToDashboard(event)">
-            <input type="email" id="email" name="email" placeholder="현재 이메일" >
-            <input type="password" id="newPassword" name="newPassword" placeholder="변경할 비밀번호" >
-            <input type="password" id="confirmPassword" name="confirmPassword" placeholder="한 번 더 입력" >
-            <button type="submit">정보 변경 하기</button>
+        <h1>비밀번호를 입력하세요</h1>
+        <form method="post">
+            <input type="password" name="password" placeholder="비밀번호" required>
+            <button type="submit">내 정보 수정하기</button>
         </form>
     </div>
 
+    <!-- Footer -->
     <div class="footer">
         회사 정보 - 사업자 번호, 연락처 등 유의 내용
     </div>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/user/info2.jsp b/stockMate/src/main/webapp/WEB-INF/views/user/changepassword2.jsp
similarity index 58%
rename from stockMate/src/main/webapp/WEB-INF/views/user/info2.jsp
rename to stockMate/src/main/webapp/WEB-INF/views/user/changepassword2.jsp
index 9d9ba0f..3e2ef7d 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/user/info2.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/user/changepassword2.jsp
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>내 정보 조회</title>
+    <title>비밀번호 변경</title>
     <style>
         body {
             font-family: Arial, sans-serif;
@@ -27,47 +27,42 @@
             text-align: center;
         }
         .back-button {
-            text-align: left;
+            display: flex;
+            align-items: center;
+            justify-content: flex-start;
+            width: 100%;
             margin-bottom: 20px;
         }
         .back-button a {
             text-decoration: none;
-            color: #007BFF;
             font-size: 18px;
+            color: #007BFF;
+            font-weight: bold;
+            display: flex;
+            align-items: center;
         }
         .back-button a:hover {
             text-decoration: underline;
         }
+        .back-button svg {
+            margin-right: 5px;
+            fill: #007BFF;
+        }
         h1 {
             margin-bottom: 20px;
             font-size: 24px;
             color: #333;
         }
-        .info {
+        input {
             width: 80%;
-            margin-bottom: 20px;
-        }
-        .info input {
-            width: 100%;
             padding: 10px;
             margin: 10px 0;
             border: 1px solid #ccc;
             border-radius: 5px;
             font-size: 16px;
-            background-color: #f4f4f4;
-            color: #333;
-        }
-        .info input:disabled {
-            background-color: #e9ecef;
-            color: #6c757d;
         }
-        .buttons {
-            display: flex;
-            justify-content: space-around;
+        button {
             width: 80%;
-        }
-        .buttons button {
-            width: 45%;
             padding: 10px;
             background-color: #007BFF;
             color: white;
@@ -76,7 +71,7 @@
             font-size: 16px;
             cursor: pointer;
         }
-        .buttons button:hover {
+        button:hover {
             background-color: #0056b3;
         }
         .footer {
@@ -89,26 +84,40 @@
             width: 100%;
         }
     </style>
+    <script>
+        function redirectToDashboard(event) {
+            event.preventDefault(); // Form submission 막기
+            window.location.href = '/dashboard';
+        }
+    </script>
 </head>
 <body>
-    <!-- Container -->
     <div class="container">
         <div class="back-button">
-            <a href="dashboard.jsp">&larr; 뒤로 가기</a>
-        </div>
-        <h1>홍길동님의 회원정보</h1>
-        <div class="info">
-            <input type="text" value="itwill@naver.com" disabled>
-            <input type="text" value="홍길동" disabled>
-            <input type="text" value="010-1234-1234" disabled>
-        </div>
-        <div class="buttons">
-            <button onclick="location.href='editInfo.jsp'">수정하기</button>
-            <button onclick="location.href='logout.jsp'">나가기</button>
+            <a href="/dashboard">
+                <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24">
+                    <path d="M0 0h24v24H0z" fill="none"/>
+                    <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"/>
+                </svg>
+                뒤로 가기
+            </a>
         </div>
+        <h1>비밀번호 변경</h1>
+<form action="/user/changepassword2" method="post">
+    <div>
+        <label for="newPassword">변경할 비밀번호</label>
+        <input type="password" id="newPassword" name="newPassword" placeholder="변경할 비밀번호 입력" required>
+    </div>
+    <div>
+        <label for="confirmPassword">한 번 더 입력</label>
+        <input type="password" id="confirmPassword" name="confirmPassword" placeholder="한번 더 입력" required>
+    </div>
+    <button type="submit">정보 변경 하기</button>
+</form>
+
+
     </div>
 
-    <!-- Footer -->
     <div class="footer">
         회사 정보 - 사업자 번호, 연락처 등 유의 내용
     </div>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/user/consultation.jsp b/stockMate/src/main/webapp/WEB-INF/views/user/consultation.jsp
index c4aea3b..bf19f4f 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/user/consultation.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/user/consultation.jsp
@@ -88,6 +88,23 @@
 </head>
 <body>
     <div class="container">
+        <!-- 메시지 알림 -->
+        <% 
+            String message = (String) request.getAttribute("message");
+            String error = (String) request.getAttribute("error");
+        %>
+        <% if (message != null) { %>
+            <script>
+                alert("<%= message %>");
+            </script>
+        <% } %>
+        <% if (error != null) { %>
+            <script>
+                alert("<%= error %>");
+            </script>
+        <% } %>
+
+        <!-- 상단 내용 -->
         <div class="content">
             <h1>상담을 통해 궁금한 점을 즉시 해결하세요.</h1>
 
@@ -104,9 +121,10 @@
             </p>
         </div>
 
+        <!-- 상담 신청 폼 -->
         <div class="form-container">
             <h2>상담문의</h2>
-            <form action="main" method="post">
+            <form action="/user/sendConsultation" method="post">
                 <input type="text" name="company" placeholder="회사명" required>
                 <input type="text" name="name" placeholder="이름" required>
                 <input type="text" name="contact" placeholder="연락처" required>
@@ -115,7 +133,7 @@
                     <label><input type="radio" name="contactMethod" value="전화" required> 전화</label>
                     <label><input type="radio" name="contactMethod" value="이메일"> 이메일</label>
                 </div>
-                <textarea name="message" placeholder="문의내용" rows="5" required></textarea>
+                <textarea name="inquiry" placeholder="문의내용" rows="5" required></textarea>
                 <div>
                     <input type="checkbox" name="privacyConsent" required> 개인정보 수집에 동의함 (필수)
                 </div>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/user/editinfo1.jsp b/stockMate/src/main/webapp/WEB-INF/views/user/editinfo1.jsp
index ab3fd0e..ab19add 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/user/editinfo1.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/user/editinfo1.jsp
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>내 정보 수정</title>
+    <title>비밀번호 확인</title>
     <style>
         body {
             font-family: Arial, sans-serif;
@@ -27,26 +27,36 @@
             text-align: center;
         }
         .back-button {
-            text-align: left;
+            display: flex;
+            align-items: center;
+            justify-content: flex-start;
+            width: 100%;
             margin-bottom: 20px;
         }
         .back-button a {
             text-decoration: none;
-            color: #007BFF;
             font-size: 18px;
+            color: #007BFF;
+            font-weight: bold;
+            display: flex;
+            align-items: center;
         }
         .back-button a:hover {
             text-decoration: underline;
         }
+        .back-button svg {
+            margin-right: 5px;
+            fill: #007BFF;
+        }
         h1 {
             margin-bottom: 20px;
             font-size: 24px;
             color: #333;
         }
-        input[type="password"] {
+        input {
             width: 80%;
             padding: 10px;
-            margin: 20px 0;
+            margin: 10px 0;
             border: 1px solid #ccc;
             border-radius: 5px;
             font-size: 16px;
@@ -79,11 +89,17 @@
     <!-- Container -->
     <div class="container">
         <div class="back-button">
-            <a href="/user/dashboard">&larr; 뒤로 가기</a>
+            <a href="/dashboard">
+                <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24">
+                    <path d="M0 0h24v24H0z" fill="none"/>
+                    <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"/>
+                </svg>
+                뒤로 가기
+            </a>
         </div>
         <h1>비밀번호를 입력하세요</h1>
-        <form action="/user/editinfo2" method="post">
-            <input type="password" name="password" placeholder="비밀번호">
+        <form  method="post">
+            <input type="password" name="password" placeholder="비밀번호" required>
             <button type="submit">내 정보 수정하기</button>
         </form>
     </div>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/user/editinfo2.jsp b/stockMate/src/main/webapp/WEB-INF/views/user/editinfo2.jsp
index 2cc1055..70bbe9e 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/user/editinfo2.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/user/editinfo2.jsp
@@ -27,42 +27,67 @@
             text-align: center;
         }
         .back-button {
-            text-align: left;
+            display: flex;
+            align-items: center;
+            justify-content: flex-start;
+            width: 100%;
             margin-bottom: 20px;
         }
         .back-button a {
             text-decoration: none;
-            color: #007BFF;
             font-size: 18px;
+            color: #007BFF;
+            font-weight: bold;
+            display: flex;
+            align-items: center;
         }
         .back-button a:hover {
             text-decoration: underline;
         }
+        .back-button svg {
+            margin-right: 5px;
+            fill: #007BFF;
+        }
         h1 {
-            margin-bottom: 20px;
+            margin-bottom: 30px;
             font-size: 24px;
             color: #333;
         }
-        .info {
-            width: 80%;
-            margin-bottom: 20px;
+        .form-container {
+            display: flex;
+            flex-wrap: wrap;
+            gap: 20px;
+            justify-content: center;
+            width: 100%;
+        }
+        .form-group {
+            flex: 0 0 calc(50% - 10px);
+            display: flex;
+            flex-direction: column;
+            align-items: flex-start;
+        }
+        .form-group label {
+            font-size: 16px;
+            margin-bottom: 5px;
+            font-weight: bold;
         }
-        .info input {
+        .form-group input {
             width: 100%;
-            padding: 10px;
-            margin: 10px 0;
+            padding: 15px;
             border: 1px solid #ccc;
             border-radius: 5px;
-            font-size: 16px;
+            font-size: 18px;
+            box-sizing: border-box;
         }
         button {
-            width: 80%;
-            padding: 10px;
+            margin-top: 30px;
+            width: 100%;
+            padding: 15px;
             background-color: #007BFF;
             color: white;
             border: none;
             border-radius: 5px;
-            font-size: 16px;
+            font-size: 18px;
             cursor: pointer;
         }
         button:hover {
@@ -82,51 +107,45 @@
 <body>
     <!-- Container -->
     <div class="container">
+        <!-- 뒤로가기 버튼 -->
         <div class="back-button">
-            <a href="/user/dashboard">&larr; 뒤로 가기</a>
+            <a href="/dashboard">
+                <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24">
+                    <path d="M0 0h24v24H0z" fill="none"/>
+                    <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"/>
+                </svg>
+                뒤로 가기
+            </a>
         </div>
-        <h1>홍길동님의 회원정보</h1>
-        <form id="editInfoForm" action="editinfo2" method="post" onsubmit="return handleFormSubmit(event);">
-            <div class="info">
-                <label for="email">이메일</label>
-                <input type="email" id="email" name="email" value="itwill@naver.com" required>
-                <label for="name">이름</label>
-                <input type="text" id="name" name="name" value="홍길동" required>
-                <label for="phone">전화번호</label>
-                <input type="text" id="phone" name="phone" value="010-1234-1234" required>
-            </div>
-            <button type="submit">저장하기</button>
-        </form>
+
+        <!-- 제목 -->
+        <!-- 회원정보 수정 폼 -->
+        <h1>회원정보 수정</h1>
+<form action="/user/updateInfo2" method="post">
+    <div class="form-group">
+        <label for="email">이메일</label>
+        <input type="email" id="email" name="email" 
+               value="${userVO.email}" placeholder="이메일을 입력하세요" required>
+    </div>
+    <div class="form-group">
+        <label for="name">이름</label>
+        <input type="text" id="name" name="name" 
+               value="${userVO.name}" placeholder="이름을 입력하세요" required>
     </div>
+    <div class="form-group">
+        <label for="telNumber">전화번호</label>
+        <input type="tel" id="telNumber" name="telNumber" 
+               value="${userVO.telNumber}" placeholder="전화번호를 입력하세요" required>
+    </div>
+    <button type="submit">내 정보 수정하기</button>
+</form>       
+       
+       
+     
 
     <!-- Footer -->
     <div class="footer">
         회사 정보 - 사업자 번호, 연락처 등 유의 내용
     </div>
-
-    <script>
-    function handleFormSubmit(event) {
-        event.preventDefault(); // 기본 제출 방지
-        const form = event.target;
-
-        // 폼 데이터 서버로 전송
-        fetch(form.action, {
-            method: form.method,
-            body: new FormData(form),
-        })
-        .then(response => {
-            if (response.ok) {
-                // 성공 시 대시보드로 이동
-                window.location.href = "/user/dashboard";
-            } else {
-                alert("저장 실패: 다시 시도해주세요.");
-            }
-        })
-        .catch(error => {
-            console.error("저장 중 오류 발생:", error);
-            alert("오류가 발생했습니다. 관리자에게 문의해주세요.");
-        });
-    }
-    </script>
 </body>
 </html>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/user/howtouse.jsp b/stockMate/src/main/webapp/WEB-INF/views/user/howtouse.jsp
new file mode 100644
index 0000000..08fe0b8
--- /dev/null
+++ b/stockMate/src/main/webapp/WEB-INF/views/user/howtouse.jsp
@@ -0,0 +1,149 @@
+<%@ page language="java" contentType="text/html; charset=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>대시보드 사용법</title>
+    <style>
+        body {
+            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+            margin: 0;
+            padding: 0;
+            background-color: #f4f4f4;
+            color: #333;
+        }
+        .container {
+            max-width: 1500px;
+            margin: 50px auto;
+            padding: 20px;
+            background-color: #fff;
+            border-radius: 15px;
+            box-shadow: 0 6px 20px rgba(0, 0, 0, 0.2);
+            text-align: center;
+        }
+        .header {
+            background-color: #007BFF;
+            color: #fff;
+            padding: 20px;
+            border-radius: 15px 15px 0 0;
+            margin-bottom: 20px;
+        }
+        .header h1 {
+            font-size: 36px;
+            font-family: 'Roboto', sans-serif;
+            margin: 0;
+        }
+        .menu {
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(500px, 1fr));
+            gap: 30px;
+            text-align: left;
+            padding: 20px;
+        }
+        .menu-item {
+            padding: 20px;
+            background-color: #f9f9f9;
+            border-radius: 10px;
+            box-shadow: 0 4px 15px rgba(0, 0, 0, 0.1);
+            transition: transform 0.3s, box-shadow 0.3s;
+            font-family: 'Open Sans', sans-serif;
+        }
+        .menu-item:hover {
+            transform: translateY(-10px);
+            box-shadow: 0 6px 20px rgba(0, 0, 0, 0.2);
+        }
+        .menu-item strong {
+            font-size: 22px;
+            color: #333;
+            display: block;
+            text-align: center;
+            margin-bottom: 10px;
+        }
+        .menu-item p {
+            font-size: 18px;
+            color: #555;
+            line-height: 1.8;
+            margin: 0;
+            word-break: break-word;
+        }
+        .menu-item p:not(:last-child) {
+            margin-bottom: 10px;
+        }
+        .back-button {
+            margin-top: 30px;
+        }
+        .back-button a {
+            text-decoration: none;
+            padding: 15px 30px;
+            background-color: #007BFF;
+            color: #fff;
+            border-radius: 10px;
+            font-size: 20px;
+            font-weight: bold;
+            font-family: 'Roboto', sans-serif;
+            transition: background-color 0.3s ease, transform 0.3s ease;
+        }
+        .back-button a:hover {
+            background-color: #0056b3;
+            transform: scale(1.05);
+        }
+    </style>
+    <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&family=Open+Sans:wght@400;600&display=swap" rel="stylesheet">
+</head>
+<body>
+    <div class="container">
+        <div class="header">
+            <h1>대시보드 사용법</h1>
+        </div>
+        <div class="menu">
+            <div class="menu-item">
+                <strong>출고</strong>
+                <p>업무 상황에 맞는 판매입력 방식입니다.</p>
+                <p>주문, 구매 내역을 불러와 판매 전표를 작성할 수 있습니다.</p>
+                <p>바코드를 스캔하여 출고 처리를 할 수 있습니다.</p>
+            </div>
+            <div class="menu-item">
+                <strong>발주</strong>
+                <p>다양한 구매입력 방식입니다.</p>
+                <p>발주서, 주문서 내역을 불러와 간편하게 구매 전표로 저장할 수 있습니다.</p>
+                <p>바코드를 스캔하여 손쉽게 입고 처리가 가능합니다.</p>
+            </div>
+            <div class="menu-item">
+                <strong>창고 사용법</strong>
+                <p>창고 관리의 기본과 고급 기능을 익히세요.</p>
+                <p>재고 관리, 위치 설정, 이동 기록 등을 활용하여 효율적인 창고 운영이 가능합니다.</p>
+            </div>
+            <div class="menu-item">
+                <strong>입고</strong>
+                <p>입고 데이터의 자동화와 정확성 향상입니다.</p>
+                <p>입고 확인서와 주문서를 기반으로 빠르고 정확한 재고 처리가 가능합니다.</p>
+            </div>
+            <div class="menu-item">
+                <strong>주문</strong>
+                <p>주문 내역 관리 및 처리입니다.</p>
+                <p>고객 주문 데이터를 실시간으로 확인하고 처리할 수 있습니다.</p>
+                <p>주문 상태를 추적하여 고객 만족도를 높일 수 있습니다.</p>
+            </div>
+            <div class="menu-item">
+                <strong>관리자 페이지</strong>
+                <p>시스템 설정과 사용자 관리입니다.</p>
+                <p>사용자 권한 설정, 시스템 로그 확인, 전체 설정 변경이 가능합니다.</p>
+            </div>
+            <div class="menu-item">
+                <strong>회원가입</strong>
+                <p>신규 사용자 등록 및 권한 설정입니다.</p>
+                <p>간단한 양식을 통해 새로운 사용자를 추가하고 권한을 부여할 수 있습니다.</p>
+            </div>
+            <div class="menu-item">
+                <strong>상담 문의</strong>
+                <p>사용자 문의사항 처리입니다.</p>
+                <p>실시간 상담 요청을 확인하고 고객의 질문에 답변할 수 있습니다.</p>
+            </div>
+        </div>
+        <div class="back-button">
+            <a href="/user/main">뒤로 돌아가기</a>
+        </div>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/stockMate/src/main/webapp/WEB-INF/views/user/howtouse2.jsp b/stockMate/src/main/webapp/WEB-INF/views/user/howtouse2.jsp
new file mode 100644
index 0000000..ab712eb
--- /dev/null
+++ b/stockMate/src/main/webapp/WEB-INF/views/user/howtouse2.jsp
@@ -0,0 +1,149 @@
+<%@ page language="java" contentType="text/html; charset=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>대시보드 사용법2</title>
+    <style>
+        body {
+            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+            margin: 0;
+            padding: 0;
+            background-color: #f4f4f4;
+            color: #333;
+        }
+        .container {
+            max-width: 1500px;
+            margin: 50px auto;
+            padding: 20px;
+            background-color: #fff;
+            border-radius: 15px;
+            box-shadow: 0 6px 20px rgba(0, 0, 0, 0.2);
+            text-align: center;
+        }
+        .header {
+            background-color: #007BFF;
+            color: #fff;
+            padding: 20px;
+            border-radius: 15px 15px 0 0;
+            margin-bottom: 20px;
+        }
+        .header h1 {
+            font-size: 36px;
+            font-family: 'Roboto', sans-serif;
+            margin: 0;
+        }
+        .menu {
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(500px, 1fr));
+            gap: 30px;
+            text-align: left;
+            padding: 20px;
+        }
+        .menu-item {
+            padding: 20px;
+            background-color: #f9f9f9;
+            border-radius: 10px;
+            box-shadow: 0 4px 15px rgba(0, 0, 0, 0.1);
+            transition: transform 0.3s, box-shadow 0.3s;
+            font-family: 'Open Sans', sans-serif;
+        }
+        .menu-item:hover {
+            transform: translateY(-10px);
+            box-shadow: 0 6px 20px rgba(0, 0, 0, 0.2);
+        }
+        .menu-item strong {
+            font-size: 22px;
+            color: #333;
+            display: block;
+            text-align: center;
+            margin-bottom: 10px;
+        }
+        .menu-item p {
+            font-size: 18px;
+            color: #555;
+            line-height: 1.8;
+            margin: 0;
+            word-break: break-word;
+        }
+        .menu-item p:not(:last-child) {
+            margin-bottom: 10px;
+        }
+        .back-button {
+            margin-top: 30px;
+        }
+        .back-button a {
+            text-decoration: none;
+            padding: 15px 30px;
+            background-color: #007BFF;
+            color: #fff;
+            border-radius: 10px;
+            font-size: 20px;
+            font-weight: bold;
+            font-family: 'Roboto', sans-serif;
+            transition: background-color 0.3s ease, transform 0.3s ease;
+        }
+        .back-button a:hover {
+            background-color: #0056b3;
+            transform: scale(1.05);
+        }
+    </style>
+    <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&family=Open+Sans:wght@400;600&display=swap" rel="stylesheet">
+</head>
+<body>
+    <div class="container">
+        <div class="header">
+            <h1>대시보드 사용법</h1>
+        </div>
+        <div class="menu">
+            <div class="menu-item">
+                <strong>출고</strong>
+                <p>업무 상황에 맞는 판매입력 방식입니다.</p>
+                <p>주문, 구매 내역을 불러와 판매 전표를 작성할 수 있습니다.</p>
+                <p>바코드를 스캔하여 출고 처리를 할 수 있습니다.</p>
+            </div>
+            <div class="menu-item">
+                <strong>발주</strong>
+                <p>다양한 구매입력 방식입니다.</p>
+                <p>발주서, 주문서 내역을 불러와 간편하게 구매 전표로 저장할 수 있습니다.</p>
+                <p>바코드를 스캔하여 손쉽게 입고 처리가 가능합니다.</p>
+            </div>
+            <div class="menu-item">
+                <strong>창고 사용법</strong>
+                <p>창고 관리의 기본과 고급 기능을 익히세요.</p>
+                <p>재고 관리, 위치 설정, 이동 기록 등을 활용하여 효율적인 창고 운영이 가능합니다.</p>
+            </div>
+            <div class="menu-item">
+                <strong>입고</strong>
+                <p>입고 데이터의 자동화와 정확성 향상입니다.</p>
+                <p>입고 확인서와 주문서를 기반으로 빠르고 정확한 재고 처리가 가능합니다.</p>
+            </div>
+            <div class="menu-item">
+                <strong>주문</strong>
+                <p>주문 내역 관리 및 처리입니다.</p>
+                <p>고객 주문 데이터를 실시간으로 확인하고 처리할 수 있습니다.</p>
+                <p>주문 상태를 추적하여 고객 만족도를 높일 수 있습니다.</p>
+            </div>
+            <div class="menu-item">
+                <strong>관리자 페이지</strong>
+                <p>시스템 설정과 사용자 관리입니다.</p>
+                <p>사용자 권한 설정, 시스템 로그 확인, 전체 설정 변경이 가능합니다.</p>
+            </div>
+            <div class="menu-item">
+                <strong>회원가입</strong>
+                <p>신규 사용자 등록 및 권한 설정입니다.</p>
+                <p>간단한 양식을 통해 새로운 사용자를 추가하고 권한을 부여할 수 있습니다.</p>
+            </div>
+            <div class="menu-item">
+                <strong>상담 문의</strong>
+                <p>사용자 문의사항 처리입니다.</p>
+                <p>실시간 상담 요청을 확인하고 고객의 질문에 답변할 수 있습니다.</p>
+            </div>
+        </div>
+        <div class="back-button">
+            <a href="/dashboard">뒤로 돌아가기</a>
+        </div>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/stockMate/src/main/webapp/WEB-INF/views/user/info1.jsp b/stockMate/src/main/webapp/WEB-INF/views/user/info1.jsp
deleted file mode 100644
index 0408d8f..0000000
--- a/stockMate/src/main/webapp/WEB-INF/views/user/info1.jsp
+++ /dev/null
@@ -1,96 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=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>내 정보 조회</title>
-    <style>
-        body {
-            font-family: Arial, sans-serif;
-            margin: 0;
-            padding: 0;
-            background-color: #f4f4f4;
-            color: #333;
-        }
-        .container {
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            justify-content: center;
-            height: 100vh;
-            background-color: #fff;
-            margin: 0 15%;
-            border-radius: 10px;
-            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-            padding: 30px;
-            text-align: center;
-        }
-        .back-button {
-            text-align: left;
-            margin-bottom: 20px;
-        }
-        .back-button a {
-            text-decoration: none;
-            color: #007BFF;
-            font-size: 18px;
-        }
-        .back-button a:hover {
-            text-decoration: underline;
-        }
-        h1 {
-            margin-bottom: 20px;
-            font-size: 24px;
-            color: #333;
-        }
-        input[type="password"] {
-            width: 80%;
-            padding: 10px;
-            margin: 20px 0;
-            border: 1px solid #ccc;
-            border-radius: 5px;
-            font-size: 16px;
-        }
-        button {
-            width: 80%;
-            padding: 10px;
-            background-color: #007BFF;
-            color: white;
-            border: none;
-            border-radius: 5px;
-            font-size: 16px;
-            cursor: pointer;
-        }
-        button:hover {
-            background-color: #0056b3;
-        }
-        .footer {
-            background-color: #222;
-            color: #ccc;
-            text-align: center;
-            padding: 10px;
-            position: fixed;
-            bottom: 0;
-            width: 100%;
-        }
-    </style>
-</head>
-<body>
-    <!-- Container -->
-    <div class="container">
-        <div class="back-button">
-            <a href="dashboard.jsp">&larr; 뒤로 가기</a>
-        </div>
-        <h1>비밀번호를 입력하세요</h1>
-        <form action="infoResult.jsp" method="post">
-            <input type="password" name="password" placeholder="비밀번호" required>
-            <button type="submit">내 정보 조회하기</button>
-        </form>
-    </div>
-
-    <!-- Footer -->
-    <div class="footer">
-        회사 정보 - 사업자 번호, 연락처 등 유의 내용
-    </div>
-</body>
-</html>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/user/intro.jsp b/stockMate/src/main/webapp/WEB-INF/views/user/intro.jsp
index c4aea3b..90bc418 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/user/intro.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/user/intro.jsp
@@ -1,131 +1,116 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <!DOCTYPE html>
-<html>
+<html lang="ko">
 <head>
     <meta charset="UTF-8">
-    <title>상담문의</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>회사 소개</title>
     <style>
         body {
-            font-family: Arial, sans-serif;
+            font-family: 'Roboto', Arial, sans-serif;
             margin: 0;
             padding: 0;
+            background-color: #f9f9f9;
+            color: #333;
+            line-height: 1.6;
         }
-
         .container {
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            padding: 20px;
-        }
-
-        .content {
-            width: 60%;
-            margin-bottom: 20px;
-            background-color: #005bac;
-            color: white;
-            padding: 10px;
-            border-radius: 8px;
-        }
-
-        .content h1 {
-            color: white;
-            text-align: center;
+            max-width: 1300px;
+            margin: 50px auto;
+            padding: 30px;
+            background-color: #fff;
+            border-radius: 15px;
+            box-shadow: 0 6px 20px rgba(0, 0, 0, 0.15);
         }
-
-        .content h3 {
+        .header {
             text-align: center;
+            margin-bottom: 30px;
+            background-color: #007BFF;
+            color: #fff;
+            padding: 20px;
+            border-radius: 15px;
         }
-
-        .content p {
-            margin: 8px 0;
-            line-height: 1.4;
-            text-align: center;
+        .header h1 {
+            font-size: 42px;
+            font-weight: bold;
+            margin: 0;
         }
-
-        .form-container {
-            width: 25%;
-            background-color: #005bac;
-            color: white;
-            padding: 10px;
-            border-radius: 8px;
-            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+        .section {
+            margin-bottom: 30px;
+            padding: 20px;
+            background-color: #f9f9f9;
+            border-radius: 10px;
+            box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
         }
-
-        .form-container h2 {
-            color: white;
-            text-align: center;
-            margin-bottom: 10px;
+        .section h2 {
+            font-size: 28px;
+            color: #0056b3;
+            border-bottom: 2px solid #007BFF;
+            padding-bottom: 10px;
+            margin-bottom: 20px;
         }
-
-        .form-container input, .form-container textarea, .form-container button {
-            width: 95.3%;
-            margin-bottom: 8px;
-            padding: 8px;
-            border: none;
-            border-radius: 5px;
+        .section p {
+            margin: 10px 0;
+            text-align: justify;
+            font-size: 18px;
+            line-height: 1.8;
         }
-
-        .form-container input[type="radio"] {
-            width: auto;
+        .back-button {
+            text-align: center;
+            margin-top: 30px;
         }
-
-        .form-container button {
-            background-color: #ffcc00;
-            color: black;
+        .back-button a {
+            text-decoration: none;
+            display: inline-block;
+            padding: 15px 30px;
+            background-color: #007BFF;
+            color: white;
+            border-radius: 10px;
+            font-size: 20px;
             font-weight: bold;
-            cursor: pointer;
+            transition: background-color 0.3s ease, transform 0.3s ease;
         }
-
-        .form-container button:hover {
-            background-color: #ffaa00;
-        }
-
-        .footer {
-            text-align: center;
-            margin-top: 10px;
+        .back-button a:hover {
+            background-color: #0056b3;
+            transform: scale(1.05);
         }
     </style>
+    <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap" rel="stylesheet">
 </head>
 <body>
     <div class="container">
-        <div class="content">
-            <h1>상담을 통해 궁금한 점을 즉시 해결하세요.</h1>
-
-            <h3>궁금한 점을 빠르게 확인할 수 있습니다.</h3>
-            <p>
-                • 연락처를 남겨주시면 영업 시간 기준 1일~2일 이내에 연락 드립니다.<br>
-                • 전문가와의 상담을 통해 문의사항을 빠르고 정확하게 해결하세요.
-            </p>
-
-            <h3>효과적인 시스템을 느껴보세요</h3>
-            <p>
-                • 우리 회사의 업무에 어떻게 적용할 수 있을지 확인할 수 있습니다.<br>
-                • 프로그램 도입 여부를 빠르게 판단할 수 있습니다.
-            </p>
+        <div class="header">
+            <h1>회사 소개</h1>
+        </div>
+        <div class="section">
+            <h2>회사 정보</h2>
+            <p><strong>회사명:</strong> ㈜stockmate</p>
+            <p><strong>대표이사:</strong> 黃仁成</p>
+            <p><strong>설립일:</strong> 1999년 8월</p>
+            <p><strong>주사업:</strong> 웹 기반 ERP, 그룹웨어, 웹메일 개발 및 서비스</p>
+            <p><strong>사업장:</strong> 부산 부산진구 동천로 109 삼한골든게이트  ㈜stockmate</p>
+        </div>
+        <div class="section">
+            <h2>고객 지원팀</h2>
+            <p>고객님과의 최접점 고객지원팀이 있습니다.</p>
+            <p>고객지원팀은 고객사와의 상담업무를 주된 업무로 하며 다양한 문의를 처리합니다.</p>
+            <p>전화 상담 요청 및 지정된 전문 상담사를 통해 고객님의 궁금증을 해결합니다.</p>
+            <p>고객의 "고맙습니다"라는 말이 가장 큰 보람입니다.</p>
+        </div>
+        <div class="section">
+            <h2>DB팀</h2>
+            <p>DB팀은 프로그램의 기본 뼈대를 튼튼히 잡아주는 중요한 팀입니다.</p>
+            <p>데이터를 설계하고 보안을 유지하며 고객사 자료를 안전하게 관리합니다.</p>
+            <p>DA(Data Architect)와 DBA(DataBase Admin)로 나누어져 있으며, 새로운 기능 기획안을 기반으로 DB 설계와 도면을 작성합니다.</p>
+        </div>
+        <div class="section">
+            <h2>개발팀</h2>
+            <p>개발팀은 이카운트 ERP의 모든 기능을 구현합니다.</p>
+            <p>고객사 제안과 전략적 개발 기능을 기반으로 개발 스케줄을 잡고 기능을 개발합니다.</p>
+            <p>완성된 기능이 무사히 업그레이드되었을 때의 뿌듯함을 느끼며, 고객 만족도를 위해 지속적으로 노력하고 있습니다.</p>
         </div>
-
-        <div class="form-container">
-            <h2>상담문의</h2>
-            <form action="main" method="post">
-                <input type="text" name="company" placeholder="회사명" required>
-                <input type="text" name="name" placeholder="이름" required>
-                <input type="text" name="contact" placeholder="연락처" required>
-                <input type="email" name="email" placeholder="E-mail" required>
-                <div>
-                    <label><input type="radio" name="contactMethod" value="전화" required> 전화</label>
-                    <label><input type="radio" name="contactMethod" value="이메일"> 이메일</label>
-                </div>
-                <textarea name="message" placeholder="문의내용" rows="5" required></textarea>
-                <div>
-                    <input type="checkbox" name="privacyConsent" required> 개인정보 수집에 동의함 (필수)
-                </div>
-                <button type="submit">상담신청</button>
-            </form>
-
-            <div class="footer">
-                궁금한 점이 있다면 지금 확인하세요!<br>
-                <strong>1588-2929</strong>
-            </div>
+        <div class="back-button">
+            <a href="/user/main">뒤로 돌아가기</a>
         </div>
     </div>
 </body>
diff --git a/stockMate/src/main/webapp/WEB-INF/views/user/signin.jsp b/stockMate/src/main/webapp/WEB-INF/views/user/signin.jsp
index 27deab6..abf1c50 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/user/signin.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/user/signin.jsp
@@ -88,7 +88,12 @@
             text-decoration: underline;
         }
     </style>
-
+    <script>
+        function redirectToDashboard(event) {
+//             event.preventDefault(); // Form submission 막기
+//             window.location.href = 'dashboard';
+        }
+    </script>
 </head>
 <body>
     <div class="container">
@@ -98,7 +103,7 @@
         </c:if>
 
         <div class="login-box">
-            <form action="/user/signin" id="loginForm" method="post">
+            <form id="loginForm" method="post">
                 <!-- 이메일 필드 -->
                 <input type="email" name="email" placeholder="이메일" required="required" autofocus="autofocus" aria-label="이메일 입력 필드" autocomplete="email">
 
diff --git a/stockMate/src/main/webapp/resources/css/CategoryregistStyle.css b/stockMate/src/main/webapp/resources/css/CategoryregistStyle.css
new file mode 100644
index 0000000..973dc14
--- /dev/null
+++ b/stockMate/src/main/webapp/resources/css/CategoryregistStyle.css
@@ -0,0 +1,117 @@
+@charset "UTF-8";
+
+/* 전체 페이지 스타일 */
+body {
+    font-family: 'Arial', sans-serif;
+    background-color: #f8f9fa;
+    margin: 0;
+    padding: 0;
+    display: flex;
+    justify-content: center;
+    align-items: flex-start; /* 상단 정렬 */
+    min-height: 100vh;
+    padding-top: 50px; /* 상단 여백 추가 */
+}
+
+/* 메인 컨테이너 스타일 */
+.container {
+    width: 400px;
+    background-color: #ffffff;
+    padding: 20px 30px;
+    border-radius: 8px;
+    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+    text-align: left;
+    margin-top: 30px; /* 컨테이너 상단 여백 */
+}
+
+/* 제목 스타일 */
+h1 {
+    text-align: center;
+    color: #333;
+    font-size: 24px;
+    margin-bottom: 20px;
+}
+
+/* 라벨 스타일 */
+label {
+    font-weight: bold;
+    color: #555;
+    display: block;
+    margin-bottom: 5px;
+    font-size: 14px;
+}
+
+/* 입력 필드 스타일 */
+input[type="text"],
+textarea,
+select {
+    width: 100%;
+    padding: 10px;
+    margin-bottom: 15px;
+    border: 1px solid #ddd;
+    border-radius: 5px;
+    font-size: 14px;
+    box-sizing: border-box;
+    transition: border-color 0.2s ease-in-out;
+}
+
+input[type="text"]:focus,
+textarea:focus,
+select:focus {
+    border-color: #007bff;
+    outline: none;
+}
+
+/* 버튼 스타일 */
+button,
+a.btn {
+    display: inline-block;
+    padding: 10px 15px;
+    margin-top: 5px;
+    font-size: 14px;
+    text-align: center;
+    color: white;
+    background-color: #007bff;
+    border: none;
+    border-radius: 5px;
+    cursor: pointer;
+    text-decoration: none;
+    transition: background-color 0.3s ease;
+}
+
+button:hover,
+a.btn:hover {
+    background-color: #0056b3;
+}
+
+/* 자동 생성 버튼 스타일 */
+button.auto-generate {
+    background-color: #17a2b8;
+    font-size: 12px;
+    padding: 5px 8px;
+    display: inline-block;
+    margin-left: 10px;
+}
+
+button.auto-generate:hover {
+    background-color: #138496;
+}
+
+/* 텍스트 영역 스타일 */
+textarea {
+    height: 80px;
+    resize: none;
+}
+
+/* 링크 스타일 */
+a {
+    color: #007bff;
+    text-decoration: none;
+    font-size: 14px;
+    margin-bottom: 15px;
+    display: inline-block;
+}
+
+a:hover {
+    text-decoration: underline;
+}