From 2e38baf91cf89a32d73321a68a2646dbb9b2ec85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9C=A0=EC=A7=80=EC=9D=B8?= <jiyoo@dbnt.co.kr>
Date: Thu, 16 Apr 2026 17:30:14 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EC=97=85=EC=82=AC=EC=9A=A9=EC=9E=90?=
 =?UTF-8?q?=20=EC=9E=85=EB=A0=A5=EC=8B=9C=EC=8A=A4=ED=85=9C=20=EC=97=91?=
 =?UTF-8?q?=EC=85=80=EC=97=85=EB=A1=9C=EB=93=9C=20=EC=9E=85=EB=A0=A5?=
 =?UTF-8?q?=EC=8B=9C=20=ED=86=A0=EC=82=AC=EC=8B=9C=ED=97=98>=EC=95=95?=
 =?UTF-8?q?=EB=B0=80=EC=8B=9C=ED=97=98=20=ED=85=8C=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=EB=B2=88=ED=98=B8=EC=99=80=20=EB=AC=BC=EC=84=B1=EC=8B=9C?=
 =?UTF-8?q?=ED=97=98=EC=83=98=ED=94=8C=20=EC=88=9C=EC=84=9C=EA=B0=80=20?=
 =?UTF-8?q?=EC=97=B0=EB=8F=99=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC(=EA=B8=B0=EC=A1=B4=EC=97=90=EB=8A=94=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EB=B2=88=ED=98=B8=EB=A5=BC=20=EB=94=B0?=
 =?UTF-8?q?=EB=A5=B4=EC=A7=80=20=EC=95=8A=EA=B3=A0=20row=EC=88=9C=EC=84=9C?=
 =?UTF-8?q?=EB=8C=80=EB=A1=9C=20=EC=97=B0=EB=8F=99=EB=90=98=EC=97=88?=
 =?UTF-8?q?=EC=9D=8C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManageExcelUploadProc03Controller.java    | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java
index da32ac91..1f5e2ea8 100644
--- a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java
+++ b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java
@@ -4901,10 +4901,27 @@ public class ManageExcelUploadProc03Controller {
 
 
 			for(int i=0; i < consolidationTestCount; i++){
+
+	    		int testSampleNo = Integer.valueOf(excelWp.get("col0",i).trim());	// 사용자가 입력한 순번(물성시험 샘플을 순번으로 찾을때 사용)
+	    		String targetSampleCode = null;
+	    		for (Map<String, Object> sample : _sampleInfoList) {
+	    			String sampleCode = (String) sample.get("SAMPLE_CODE");
+	    			// SAMPLE_CODE 끝 숫자 추출
+	    			String numberPart = sampleCode.replaceAll(".*?(\\d+)$", "$1");
+	    			int number = Integer.parseInt(numberPart);
+	    			if (number == testSampleNo) {
+	    				targetSampleCode = sampleCode;
+	    				break;
+	    			}
+	    		}
+	    		if (targetSampleCode == null) {	// 테스트번호에 매핑되는 물성시험 sample코드가 존재하지 않음 
+	    			throw new IllegalArgumentException(
+	    			        String.format("물성시험 시료번호를 확인 하세요. (테스트 번호:%s)",testNo));
+	    		}
 	    		HashMap<String,Object> map = new HashMap<>();
 	    		map.put("PROJECT_CODE", 		_projectCode);
 	    		map.put("HOLE_CODE", 			_holeCode);
-	    		map.put("SAMPLE_CODE", 			(String) _sampleInfoList.get(i).get("SAMPLE_CODE"));
+	    		map.put("SAMPLE_CODE", 			targetSampleCode);
 				map.put("CONSOL_SAMPLE_DIA",	excelWp.get("col1", i).trim()); // 직경(cm)
 				map.put("CONSOL_SAMPLE_HEIGHT",	excelWp.get("col2", i).trim()); // 길이(cm)
 				map.put("CONSOL_W0",			excelWp.get("col3", i).trim()); // 초기 함수비(%)