diff --git a/stockMate/src/main/java/com/stockm8/controller/ReceivingController.java b/stockMate/src/main/java/com/stockm8/controller/ReceivingController.java
index 1e20500..271335d 100644
--- a/stockMate/src/main/java/com/stockm8/controller/ReceivingController.java
+++ b/stockMate/src/main/java/com/stockm8/controller/ReceivingController.java
@@ -43,59 +43,132 @@ public void mainGET(Model model) throws Exception {
 		model.addAttribute("ReceivingList", ReceivingList);
 		model.addAttribute("YesterdayReceivingList", YesterdayReceivingList);
 		model.addAttribute("TDBYReceivingList", TDBYReceivingList);
-		
 	}
 	
+	// http://localhost:8088/receiving/history
 	@RequestMapping(value = "/history", method = RequestMethod.GET)
-	public String historyGET(@RequestParam(value = "startDate", required = false) String startDate,
-	                         @RequestParam(value = "endDate", required = false) String endDate,
-	                         @RequestParam(value = "keyword", required = false) String keyword,
-	                         Criteria cri,
-	                         Model model) throws Exception {
+	public void historyGET(@RequestParam(value = "startDate", required = false) String startDate,
+	                       @RequestParam(value = "endDate", required = false) String endDate,
+	                       @RequestParam(value = "keyword", required = false) String keyword,
+	                       Criteria cri,
+	                       Model model) throws Exception {
 	    logger.info("historyGET() 호출");
 
 	    List<ReceivingShipmentVO> ReceivingList;
 	    
+	    int totalCount = 0;
+	    
+        ReceivingList = rService.getReceivingHistoryList(cri);
+        totalCount = rService.getTotalCount(); // 전체 개수
+	        
+	    PageVO pageVO = new PageVO();
+        pageVO.setCri(cri);
+        pageVO.setTotalCount(totalCount);
+        model.addAttribute("pageVO", pageVO);
+		
+	    logger.info(ReceivingList.size() + "개");
+	    model.addAttribute("ReceivingList", ReceivingList);
+	}
+	
+	// http://localhost:8088/receiving/search
+	@RequestMapping(value = "/search", method = RequestMethod.GET)
+	public void searchGET(@RequestParam(value = "startDate", required = false) String startDate,
+	                      @RequestParam(value = "endDate", required = false) String endDate,
+	                      @RequestParam(value = "keyword", required = false) String keyword,
+	                      Criteria cri,
+	                      Model model) throws Exception {
+	    logger.info("searchGET() 호출");
+
+	    List<ReceivingShipmentVO> ReceivingList;
+	    
+	    int totalCount = 0;
+	    
 	    // 날짜와 키워드가 모두 있는 경우
 	    if (startDate != null && endDate != null && keyword != null) {
 	        ReceivingList = rService.getHistoryByDateRange(startDate, endDate, keyword, cri);
-	        int totalCount = rService.getTotalCountBySearch(startDate, endDate, keyword, cri);
-	        PageVO pageVO = new PageVO();
-	        pageVO.setCri(cri);
-	        pageVO.setTotalCount(totalCount); // 총 개수를 검색 조건에 맞게 계산
-	        model.addAttribute("pageVO", pageVO);
+	        totalCount = rService.getTotalCountBySearch(startDate, endDate, keyword);
+	        
 	    } else if (keyword != null) {
 	        ReceivingList = rService.getHistoryByDateRange(null, null, keyword, cri);
-	        int totalCount = rService.getTotalCountBySearch(null, null, keyword, cri);
-	        PageVO pageVO = new PageVO();
-	        pageVO.setCri(cri);
-	        pageVO.setTotalCount(totalCount);
-	        model.addAttribute("pageVO", pageVO);
+	        totalCount = rService.getTotalCountBySearch(null, null, keyword);
+	       
 	    } else if (startDate != null && endDate != null) {
 	        ReceivingList = rService.getHistoryByDateRange(startDate, endDate, null, cri);
-	        int totalCount = rService.getTotalCountBySearch(startDate, endDate, null, cri);
-	        PageVO pageVO = new PageVO();
-	        pageVO.setCri(cri);
-	        pageVO.setTotalCount(totalCount);
-	        model.addAttribute("pageVO", pageVO);
+	        totalCount = rService.getTotalCountBySearch(startDate, endDate, null);
+	        
 	    } else {
 	        ReceivingList = rService.getReceivingHistoryList(cri);
-	        int totalCount = rService.getTotalCount(); // 전체 개수
-	        PageVO pageVO = new PageVO();
-	        pageVO.setCri(cri);
-	        pageVO.setTotalCount(totalCount);
-	        model.addAttribute("pageVO", pageVO);
+	        totalCount = rService.getTotalCount(); // 전체 개수
+	        
 	    }
+	    
+	    PageVO pageVO = new PageVO();
+        pageVO.setCri(cri);
+        pageVO.setTotalCount(totalCount);
+        model.addAttribute("pageVO", pageVO);
 		
 	    logger.info(ReceivingList.size() + "개");
 	    model.addAttribute("ReceivingList", ReceivingList);
-	    
-	    return "/receiving/history";
 	}
 	
+	// 새로고침
+	@RequestMapping(value = "/insert1", method = RequestMethod.POST)
+	public String insert1POST() throws Exception {
+		logger.info("insertPOST() 호출");
+		
+		rService.insertReceiving();
+		
+		return "redirect:/receiving/main";
+	}
+	
+	// 새로고침
+	@RequestMapping(value = "/insert2", method = RequestMethod.POST)
+	public String insert2POST() throws Exception {
+		logger.info("insertPOST() 호출");
+		
+		rService.insertReceiving();
+		
+		return "redirect:/receiving/history";
+	}	
+	
+	// 새로고침
+	@RequestMapping(value = "/insert3", method = RequestMethod.POST)
+	public String insert3POST() throws Exception {
+		logger.info("insertPOST() 호출");
+		
+		rService.insertReceiving();
+		
+		return "redirect:/receiving/search";
+	}
 	
-	   
+	// http://localhost:8088/receiving/scanner
+	@RequestMapping(value = "/scanner", method = RequestMethod.GET)
+	public String scannerGET(@RequestParam(value = "qrData", required = false) String qrData, Model model) throws Exception {
+		logger.info("scannerGET() 호출");
+        // QR 코드 데이터 처리 로직 (예: 데이터 저장, 검증 등)
+        logger.info("받은 QR 코드 데이터: " + qrData);
+
+        // 처리 결과를 JSP로 전달
+        model.addAttribute("qrData", qrData);	
+        
+        return "/receiving/scanner";
+	}
+	
+	@RequestMapping(value = "/scanner", method = RequestMethod.POST)
+	public String scannePOST(@RequestParam(value = "qrData", required = false) String qrData, Model model) throws Exception {
+		logger.info("scannerGET() 호출");
+        // QR 코드 데이터 처리 로직 (예: 데이터 저장, 검증 등)
+        logger.info("받은 QR 코드 데이터: " + qrData);
+
+        // 처리 결과를 JSP로 전달
+        model.addAttribute("qrData", qrData);	
+        
+        return "/receiving/scanner";
+	}
+
+
+   
 
 	
 
-} // ReceivingController end
+} // ReceivingController end
\ No newline at end of file
diff --git a/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAO.java b/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAO.java
index 9117ff8..d8cd814 100644
--- a/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAO.java
+++ b/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAO.java
@@ -23,9 +23,12 @@ public interface ReceivingDAO {
 	public List<ReceivingShipmentVO> selectHistoryByDateRange(String startDate, String endDate, String keyword, Criteria cri) throws Exception;
 
 	// 검색시 모든 리스트 개수
-	public int selectTotalCountBySearch(String startDate, String endDate, String keyword, Criteria cri) throws Exception;
+	public int selectTotalCountBySearch(String startDate, String endDate, String keyword) throws Exception;
 	
 	// 리스트 모든 개수
 	public int selectTotalCount() throws Exception;
+	
+	// rs 테이블 insert
+	public void insertReceiving() 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 ac9220b..ee4c735 100644
--- a/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAOImpl.java
+++ b/stockMate/src/main/java/com/stockm8/persistence/ReceivingDAOImpl.java
@@ -72,13 +72,12 @@ public List<ReceivingShipmentVO> selectHistoryByDateRange(String startDate, Stri
 	}
 
 	@Override
-	public int selectTotalCountBySearch(String startDate, String endDate, String keyword, Criteria cri) throws Exception {
+	public int selectTotalCountBySearch(String startDate, String endDate, String keyword) throws Exception {
 	    
 		Map<String, Object> paramMap = new HashMap<>();
 	    paramMap.put("startDate", startDate);
 	    paramMap.put("endDate", endDate);
 	    paramMap.put("keyword", keyword);
-	    paramMap.put("cri", cri);
 	    return sqlSession.selectOne(NAMESPACE + "getTotalCountBySearch", paramMap);
 	}
 	
@@ -88,6 +87,14 @@ public int selectTotalCount() throws Exception {
 		
 		return sqlSession.selectOne(NAMESPACE + "getTotalCount");
 	}
+
+	@Override
+	public void insertReceiving() throws Exception {
+		logger.info("insertReceiving() 호출");
+		sqlSession.insert(NAMESPACE + "insertReceiving");
+	}
+	
+	
 	
 	
 	
diff --git a/stockMate/src/main/java/com/stockm8/service/ReceivingService.java b/stockMate/src/main/java/com/stockm8/service/ReceivingService.java
index b9b8592..3d2c2bc 100644
--- a/stockMate/src/main/java/com/stockm8/service/ReceivingService.java
+++ b/stockMate/src/main/java/com/stockm8/service/ReceivingService.java
@@ -2,10 +2,12 @@
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Mapper;
+
 import com.stockm8.domain.vo.Criteria;
 import com.stockm8.domain.vo.ReceivingShipmentVO;
 
-
+@Mapper
 public interface ReceivingService {
 	
 	// 메인 입고 리스트
@@ -24,9 +26,12 @@ public interface ReceivingService {
 	public List<ReceivingShipmentVO> getHistoryByDateRange(String startDate, String endDate, String keyword, Criteria cri) throws Exception;
 	
 	// 입고 내역 검색
-	public int getTotalCountBySearch(String startDate, String endDate, String keyword, Criteria cri) throws Exception;
+	public int getTotalCountBySearch(String startDate, String endDate, String keyword) throws Exception;
 		
 	// 글 모든 개수
 	public int getTotalCount() throws Exception;
+	
+	// rs 테이블 insert
+	public void insertReceiving() 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 dda4167..9de00ef 100644
--- a/stockMate/src/main/java/com/stockm8/service/ReceivingServiceImpl.java
+++ b/stockMate/src/main/java/com/stockm8/service/ReceivingServiceImpl.java
@@ -52,10 +52,9 @@ public List<ReceivingShipmentVO> getHistoryByDateRange(String startDate, String
 	}
 	
 	@Override
-	public int getTotalCountBySearch(String startDate, String endDate, String keyword,
-			Criteria cri) throws Exception {
+	public int getTotalCountBySearch(String startDate, String endDate, String keyword) throws Exception {
 		logger.info("getTotalCountBySearch() 호출");
-		return rdao.selectTotalCountBySearch(startDate, endDate, keyword, cri);
+		return rdao.selectTotalCountBySearch(startDate, endDate, keyword);
 	}
 
 	@Override
@@ -63,6 +62,13 @@ public int getTotalCount() throws Exception {
 		logger.info("getTotalCount() 호출");
 		return rdao.selectTotalCount();
 	}
+
+	@Override
+	public void insertReceiving() throws Exception {
+		logger.info("insertReceiving() 호출");
+		rdao.insertReceiving();
+	}
+	
 	
 	
 
diff --git a/stockMate/src/main/resources/mappers/receivingMapper.xml b/stockMate/src/main/resources/mappers/receivingMapper.xml
index 77659d0..c096d32 100644
--- a/stockMate/src/main/resources/mappers/receivingMapper.xml
+++ b/stockMate/src/main/resources/mappers/receivingMapper.xml
@@ -25,8 +25,36 @@
     <result property="price" column="price"/>
   </resultMap>
   
-  
 
+<!-- 테이블에 입고 데이터 입력 -->
+<insert id="insertReceiving">
+	INSERT INTO receiving_shipment (
+	transaction_type, 
+	status, 
+	product_id, 
+	change_quantity, 
+	transaction_unit,
+	order_item_id,
+	stock_id,
+	warehouse_id,
+    created_by
+	)
+	SELECT 
+	'in', 
+	'pending',
+	p.product_id, 
+	o.quantity, 
+	p.base_unit,
+	o.order_item_id,
+	s.stock_id,
+	o.warehouse_id,
+    u.created_by
+	FROM products p
+	JOIN order_items o ON o.product_id = p.product_id
+	JOIN stocks s ON s.product_id = p.product_id
+    JOIN users u ON u.business_id = p.business_id;
+</insert>
+	
 <!-- 오늘 입고 예정 리스트 -->
 <select id="getReceivingList" resultMap="receivingshipmentMap">
 	select
@@ -40,9 +68,9 @@
 	r.change_quantity, 
 	r.transaction_unit,
 	r.memo
-	from test_receiving_shipment r
-	join test_products p on r.product_id = p.product_id
-	join test_warehouses w on w.warehouse_id = r.warehouse_id
+	from receiving_shipment r
+	join products p on r.product_id = p.product_id
+	join warehouses w on w.warehouse_id = r.warehouse_id
 	where Date(r.created_at) = CURRENT_DATE and r.status = 'pending' and r.transaction_type = 'in'
 	order by r.receiving_shipment_no desc
 	limit 0, 20
@@ -61,9 +89,9 @@
 	r.change_quantity, 
 	r.transaction_unit,
 	r.memo
-	from test_receiving_shipment r
-	join test_products p on r.product_id = p.product_id
-	join test_warehouses w on w.warehouse_id = r.warehouse_id
+	from receiving_shipment r
+	join products p on r.product_id = p.product_id
+	join warehouses w on w.warehouse_id = r.warehouse_id
 	where Date(r.created_at) = DATE_ADD(CURRENT_DATE, INTERVAL -1 DAY) 
 	order by r.receiving_shipment_no desc
 	limit 0, 20
@@ -82,9 +110,9 @@
 	r.change_quantity, 
 	r.transaction_unit,
 	r.memo
-	from test_receiving_shipment r
-	join test_products p on r.product_id = p.product_id
-	join test_warehouses w on w.warehouse_id = r.warehouse_id
+	from receiving_shipment r
+	join products p on r.product_id = p.product_id
+	join warehouses w on w.warehouse_id = r.warehouse_id
 	where Date(r.created_at) = DATE_ADD(CURRENT_DATE, INTERVAL -2 DAY) 
 	order by r.receiving_shipment_no desc
 	limit 0, 20
@@ -104,9 +132,9 @@
 	r.transaction_unit,
 	p.price,
 	r.memo
-	from test_receiving_shipment r
-	join test_products p on r.product_id = p.product_id
-	join test_warehouses w on w.warehouse_id = r.warehouse_id
+	from receiving_shipment r
+	join products p on r.product_id = p.product_id
+	join warehouses w on w.warehouse_id = r.warehouse_id
 	where transaction_type = 'in'
 	order by r.receiving_shipment_no desc
 	limit #{startPage},#{pageSize};
@@ -126,9 +154,9 @@
     r.transaction_unit,
     p.price,
     r.memo
-    FROM test_receiving_shipment r
-    JOIN test_products p ON r.product_id = p.product_id
-    JOIN test_warehouses w ON w.warehouse_id = r.warehouse_id
+    FROM receiving_shipment r
+    JOIN products p ON r.product_id = p.product_id
+    JOIN warehouses w ON w.warehouse_id = r.warehouse_id
     <where>
         <if test="startDate != ''">
             r.created_at &gt;= #{startDate}
@@ -148,8 +176,8 @@
 <!-- 키워드 검색시 모든 개수 카운트 -->
 <select id="getTotalCountBySearch" parameterType="map" resultType="int">
     SELECT COUNT(*) 
-    FROM test_receiving_shipment r
-    JOIN test_products p ON r.product_id = p.product_id
+    FROM receiving_shipment r
+    JOIN products p ON r.product_id = p.product_id
     <where>
         <if test="startDate != ''">
             r.created_at &gt;= #{startDate}
@@ -168,7 +196,7 @@
 <!-- 입출고 모든 개수 카운트 -->
 <select id="getTotalCount" resultType="int">
 	select count(*)
-	from test_receiving_shipment
+	from receiving_shipment
 	where transaction_type = 'in'
 </select>
   	
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 76c8bc2..e64fad0 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/receiving/history.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/receiving/history.jsp
@@ -239,14 +239,18 @@ tr:hover {
 
 	<h1>입고 내역</h1>
 	<a href="/receiving/main">입고 메인</a>
+	<form action="/receiving/insert2" method="POST">
+    	<input type="submit" value="새로고침">
+	</form>
+	
 
 	<!-- 기간별 검색 및 키워드 검색 폼 -->
-	<form action="/receiving/history" method="get"
+	<form action="/receiving/search" method="get"
 		onsubmit="return validateForm()" id="searchForm">
 		<label for="startDate">시작 날짜:</label> <input type="date"
 			id="startDate" name="startDate" value="${param.startDate}"> <label
 			for="endDate">종료 날짜:</label> <input type="date" id="endDate"
-			name="endDate" value="${param.endDate}"> <label for="keyword">키워드:</label>
+			name="endDate" value="${param.endDate}"> <label for="keyword">상품명:</label>
 		<input type="text" id="keyword" name="keyword"
 			value="${param.keyword}">
 
@@ -259,6 +263,7 @@ tr:hover {
 				// 날짜 input 초기화 (브라우저에서 기본값으로 설정됨)
 				document.getElementById('startDate').value = '';
 				document.getElementById('endDate').value = '';
+				document.getElementById('keyword').value = '';
 			}
 		</script>
 
@@ -309,17 +314,17 @@ tr:hover {
 	    <ul class="pagination">
 	        <c:if test="${pageVO.prev}">
 	            <li class="paginate_button previous">
-	                <a href="/receiving/history?page=${pageVO.startPage - 10}&pageSize=${pageVO.cri.pageSize}&startDate=${param.startDate}&endDate=${param.endDate}&keyword=${param.keyword}" aria-controls="example2" data-dt-idx="0" tabindex="0">Previous</a>
+	                <a href="/receiving/history?page=${pageVO.startPage - 10}&pageSize=${pageVO.cri.pageSize}" aria-controls="example2" data-dt-idx="0" tabindex="0">Previous</a>
 	            </li>
 	        </c:if>
 	        <c:forEach var="i" begin="${pageVO.startPage}" end="${pageVO.endPage}">
 	            <li class="paginate_button ${(i == pageVO.cri.page) ? 'active' : ''}">
-	                <a href="/receiving/history?page=${i}&pageSize=${pageVO.cri.pageSize}&startDate=${param.startDate}&endDate=${param.endDate}&keyword=${param.keyword}" aria-controls="example2" data-dt-idx="1" tabindex="0">${i}</a>
+	                <a href="/receiving/history?page=${i}&pageSize=${pageVO.cri.pageSize}" aria-controls="example2" data-dt-idx="1" tabindex="0">${i}</a>
 	            </li>
 	        </c:forEach>
 	        <c:if test="${pageVO.next}">
 	            <li class="paginate_button">
-	                <a href="/receiving/history?page=${pageVO.startPage + 1}&pageSize=${pageVO.cri.pageSize}&startDate=${param.startDate}&endDate=${param.endDate}&keyword=${param.keyword}" aria-controls="example2" data-dt-idx="7" tabindex="0">Next</a>
+	                <a href="/receiving/history?page=${pageVO.startPage + 1}&pageSize=${pageVO.cri.pageSize}" aria-controls="example2" data-dt-idx="7" tabindex="0">Next</a>
 	            </li>
 	        </c:if>
 	    </ul>
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 01b1077..c08c4cd 100644
--- a/stockMate/src/main/webapp/WEB-INF/views/receiving/main.jsp
+++ b/stockMate/src/main/webapp/WEB-INF/views/receiving/main.jsp
@@ -114,6 +114,10 @@
 <h1>입고 메인</h1>
 
 <a href="/receiving/history">입고 내역</a>
+<a href="/receiving/scanner">입고 스캔</a>
+<form action="/receiving/insert1" method="POST">
+   <input type="submit" value="새로고침">
+</form>
 
 <!-- 오늘 입고 리스트 -->
 <table border="1">
diff --git a/stockMate/src/main/webapp/WEB-INF/views/receiving/scanner.jsp b/stockMate/src/main/webapp/WEB-INF/views/receiving/scanner.jsp
new file mode 100644
index 0000000..a22423a
--- /dev/null
+++ b/stockMate/src/main/webapp/WEB-INF/views/receiving/scanner.jsp
@@ -0,0 +1,53 @@
+<%@ 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://unpkg.com/html5-qrcode/minified/html5-qrcode.min.js"></script>
+</head>
+<body>
+    <h1>QR 코드 및 바코드 스캔</h1>
+    <button id="start-scan">QR 코드/바코드 스캔 시작</button>
+    
+    <div id="reader" style="width: 300px; display: none;"></div>
+    
+    <p>스캔된 데이터: <span id="scan-result">여기에 스캔 결과가 표시됩니다.</span></p>
+    
+    <form id="qr-form" action="scanner" method="post" style="display: none;">
+        <input type="hidden" id="qr-data" name="qrData">
+        <button type="submit" id="submit-btn">서버로 전송</button>
+    </form>
+
+    <script>
+        let scanner;
+
+        // 스캔 시작 버튼 클릭 시
+        document.getElementById('start-scan').addEventListener('click', () => {
+            const readerDiv = document.getElementById('reader');
+            readerDiv.style.display = 'block'; // QR 코드 및 바코드 스캔 영역 표시
+
+            // Html5Qrcode 객체 초기화
+            scanner = new Html5Qrcode("reader");
+
+            scanner.start(
+                { facingMode: "environment" }, // 후면 카메라 사용
+                { fps: 10, qrbox: 250 }, // FPS 및 QR 코드 박스 크기 설정
+                (decodedText) => {
+                    // 스캔된 결과 출력
+                    document.getElementById('scan-result').textContent = decodedText;
+                    document.getElementById('qr-data').value = decodedText; // 결과를 hidden input에 저장
+                    document.getElementById('qr-form').style.display = 'block'; // 서버로 전송할 수 있도록 버튼 표시
+                    scanner.stop(); // 스캔이 끝난 후 중지
+                },
+                (error) => {
+                    console.warn("스캔 오류:", error);
+                }
+            ).catch(err => {
+                console.error("스캐너 초기화 오류:", err); // 초기화 오류
+            });
+        });
+    </script>
+</body>
+</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
new file mode 100644
index 0000000..14ada32
--- /dev/null
+++ b/stockMate/src/main/webapp/WEB-INF/views/receiving/search.jsp
@@ -0,0 +1,333 @@
+<%@ 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>
+<style>
+/* 전체 페이지 스타일 */
+/* 페이지네이션 컨테이너 스타일 */
+.dataTables_paginate {
+    text-align: center;
+    margin-top: 20px;
+}
+
+/* 페이지네이션 목록 스타일 */
+.dataTables_paginate ul.pagination {
+    display: inline-flex;
+    padding-left: 0;
+    list-style: none;
+    margin: 0;
+}
+
+/* 페이지 번호 버튼 스타일 */
+.dataTables_paginate ul.pagination .paginate_button {
+    padding: 8px 16px;
+    margin: 0 4px;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    background-color: #fff;
+    color: #3498db;
+    font-size: 14px;
+    cursor: pointer;
+    transition: background-color 0.3s ease, border-color 0.3s ease;
+}
+
+/* 활성 페이지 번호 스타일 */
+.dataTables_paginate ul.pagination .paginate_button.active {
+    background-color: #3498db;
+    color: #fff;
+    border-color: #3498db;
+}
+
+/* 비활성화된(이전/다음) 버튼 스타일 */
+.dataTables_paginate ul.pagination .paginate_button.disabled {
+    background-color: #f4f4f4;
+    color: #ccc;
+    cursor: not-allowed;
+    border-color: #ddd;
+}
+
+/* 이전 및 다음 버튼 스타일 */
+.dataTables_paginate ul.pagination .paginate_button.previous,
+.dataTables_paginate ul.pagination .paginate_button.next {
+    font-weight: bold;
+}
+
+/* 이전/다음 버튼의 hover 효과 */
+.dataTables_paginate ul.pagination .paginate_button:hover {
+    background-color: #2980b9;
+    color: white;
+    border-color: #2980b9;
+}
+
+/* 이전/다음 버튼 활성화 시 색상 */
+.dataTables_paginate ul.pagination .paginate_button.previous:not(.disabled),
+.dataTables_paginate ul.pagination .paginate_button.next:not(.disabled) {
+    background-color: #3498db;
+    color: #fff;
+}
+
+/* 페이지 번호 클릭 시 효과 */
+.dataTables_paginate ul.pagination .paginate_button:focus,
+.dataTables_paginate ul.pagination .paginate_button:hover {
+    outline: none;
+    background-color: #2980b9;
+    color: white;
+}
+
+/* 반응형 스타일 - 모바일에서 페이지네이션 크기 조정 */
+@media (max-width: 768px) {
+    .dataTables_paginate ul.pagination .paginate_button {
+        font-size: 12px;
+        padding: 6px 12px;
+    }
+}
+
+
+body {
+	font-family: 'Arial', sans-serif;
+	background-color: #f4f4f9;
+	margin: 0;
+	padding: 0;
+	color: #333;
+}
+
+/* 타이틀 스타일 */
+h1 {
+	text-align: center;
+	margin-top: 30px;
+	color: #2c3e50;
+	font-size: 36px;
+	font-weight: 700;
+	text-transform: uppercase;
+	letter-spacing: 1.5px;
+}
+
+h1 a {
+	text-decoration: none;
+	color: #3498db;
+	font-size: 20px;
+	display: block;
+	margin-top: 10px;
+	text-align: center;
+}
+
+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;
+}
+
+h1 a:hover {
+	color: #2980b9;
+}
+
+/* 검색 폼 스타일 */
+form {
+	width: 80%;
+	max-width: 1000px;
+	margin: 30px auto;
+	padding: 20px;
+	background-color: #fff;
+	border-radius: 8px;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+label {
+	margin-right: 10px;
+	font-size: 14px;
+}
+
+input[type="date"], input[type="text"] {
+	padding: 8px;
+	margin-right: 20px;
+	font-size: 14px;
+	border: 1px solid #ddd;
+	border-radius: 4px;
+	width: 180px;
+}
+
+button {
+	padding: 8px 15px;
+	background-color: #3498db;
+	color: #fff;
+	border: none;
+	border-radius: 4px;
+	cursor: pointer;
+	font-size: 14px;
+	transition: background-color 0.3s ease;
+}
+
+button:hover {
+	background-color: #2980b9;
+}
+
+/* 테이블 스타일 */
+table {
+	width: 90%;
+	margin: 40px auto;
+	border-collapse: collapse;
+	background-color: #fff;
+	box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+}
+
+th, td {
+	padding: 12px;
+	text-align: center;
+	border: 1px solid #ddd;
+}
+
+th {
+	background-color: #3498db;
+	color: white;
+}
+
+tr:nth-child(even) {
+	background-color: #f9f9f9;
+}
+
+tr:hover {
+	background-color: #ecf0f1;
+}
+
+/* 결과가 없을 경우 메시지 스타일 */
+.no-results {
+	text-align: center;
+	font-size: 18px;
+	color: #e74c3c;
+	margin-top: 30px;
+}
+
+/* 반응형 스타일 */
+@media ( max-width : 768px) {
+	form {
+		width: 95%;
+	}
+	table {
+		width: 100%;
+	}
+	th, td {
+		font-size: 12px;
+	}
+	label {
+		font-size: 12px;
+	}
+	input[type="date"], input[type="text"] {
+		font-size: 12px;
+		padding: 6px;
+		width: 150px;
+	}
+	button {
+		font-size: 12px;
+		padding: 6px 12px;
+	}
+	
+}
+</style>
+</head>
+<body>
+
+	<h1>입고 내역</h1>
+	<a href="/receiving/main">입고 메인</a>
+	<form action="/receiving/insert3" method="POST">
+    	<input type="submit" value="새로고침">
+	</form>
+
+	<!-- 기간별 검색 및 키워드 검색 폼 -->
+	<form action="/receiving/search" method="get"
+		onsubmit="return validateForm()" id="searchForm">
+		<label for="startDate">시작 날짜:</label> <input type="date"
+			id="startDate" name="startDate" value="${param.startDate}"> <label
+			for="endDate">종료 날짜:</label> <input type="date" id="endDate"
+			name="endDate" value="${param.endDate}"> <label for="keyword">상품명:</label>
+		<input type="text" id="keyword" name="keyword"
+			value="${param.keyword}">
+
+		<button type="submit">검색</button>
+		<button type="button" onclick="resetForm()">초기화</button>
+		<script>
+			// 폼 초기화 함수
+			function resetForm() {
+				document.getElementById('searchForm').reset(); // 폼의 모든 입력값을 초기화
+				// 날짜 input 초기화 (브라우저에서 기본값으로 설정됨)
+				document.getElementById('startDate').value = '';
+				document.getElementById('endDate').value = '';
+				document.getElementById('keyword').value = '';
+			}
+		</script>
+
+
+
+		<!-- 입고 내역 히스토리 -->
+		<table border="1">
+			<tr>
+				<th>입고 번호</th>
+				<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.name }</td>
+					<td>${vo.description }</td>
+					<td>${vo.changeQuantity }</td>
+					<td>${vo.transactionUnit }</td>
+					<td>${vo.price }</td>
+					<td>${vo.memo }</td>
+				</tr>
+			</c:forEach>
+		</table>
+
+	</form>
+
+	<c:choose>
+		<c:when test="${empty ReceivingList}">
+        검색 결과가 없습니다.
+    </c:when>
+	</c:choose>
+
+	<div class="dataTables_paginate paging_simple_numbers" id="example2_paginate">
+	    <ul class="pagination">
+	        <c:if test="${pageVO.prev}">
+	            <li class="paginate_button previous">
+	                <a href="/receiving/history?page=${pageVO.startPage - 10}&pageSize=${pageVO.cri.pageSize}&startDate=${param.startDate}&endDate=${param.endDate}&keyword=${param.keyword}" aria-controls="example2" data-dt-idx="0" tabindex="0">Previous</a>
+	            </li>
+	        </c:if>
+	        <c:forEach var="i" begin="${pageVO.startPage}" end="${pageVO.endPage}">
+	            <li class="paginate_button ${(i == pageVO.cri.page) ? 'active' : ''}">
+	                <a href="/receiving/history?page=${i}&pageSize=${pageVO.cri.pageSize}&startDate=${param.startDate}&endDate=${param.endDate}&keyword=${param.keyword}" aria-controls="example2" data-dt-idx="1" tabindex="0">${i}</a>
+	            </li>
+	        </c:forEach>
+	        <c:if test="${pageVO.next}">
+	            <li class="paginate_button">
+	                <a href="/receiving/history?page=${pageVO.startPage + 1}&pageSize=${pageVO.cri.pageSize}&startDate=${param.startDate}&endDate=${param.endDate}&keyword=${param.keyword}" aria-controls="example2" data-dt-idx="7" tabindex="0">Next</a>
+	            </li>
+	        </c:if>
+	    </ul>
+	</div>
+
+</body>
+</html>
\ No newline at end of file