From 49dfe159a53326b6aae94ad17571f0276961a961 Mon Sep 17 00:00:00 2001
From: jjh <jaehyun81@xit.co.kr>
Date: Thu, 20 Jul 2023 17:16:27 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=20=EC=9E=90=EB=A3=8C=20?=
 =?UTF-8?q?=EA=B2=80=EC=82=AC=20=EB=A9=94=EB=89=B4=EC=97=90=20=EB=B9=84?=
 =?UTF-8?q?=EB=B6=80=EA=B3=BC=EB=93=B1=EB=A1=9D=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95.=20=20=20-=20=ED=98=84=EC=9E=AC=20=ED=99=94?=
 =?UTF-8?q?=EB=A9=B4=EC=97=90=20=EB=94=B0=EB=A5=B8=20dataset=20=EA=B0=80?=
 =?UTF-8?q?=EC=A0=B8=EC=98=A4=EA=B8=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fims/excl/service/bean/Excl01ServiceBean.java   |  2 +-
 .../webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp | 12 ++++++++++--
 .../webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp | 13 +++++++++----
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java
index 38268d46..e4eb0b4f 100644
--- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java
+++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java
@@ -176,7 +176,7 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv
 		for (int iLoop = 0; iLoop < excl01.getLevyExclIDs().length; iLoop++) {
 			levyExclID = excl01.getLevyExclIDs()[iLoop];
 
-			// 부과제외(TB_LEVY_EXCL) 자료 조회
+			// 부과제외(TB_LEVY_EXCL) + 단속(TB_CRDN) 자료 조회
 			infoCrdnSttsCd = excl01Bean.getLevyExclusionInfo(new Excl01Query().setLevyExclId(levyExclID));
 
 			// 단속 상태 이력(TB_CRDN_STTS_HSTRY) 대장에서 부과제외 자료 조회
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
index 949d8c41..dcbf4c29 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
@@ -589,9 +589,17 @@ $(document).ready(function(){
 	}
 
 	$P.openLevyExclPop = (levyExclSeCd) => {
-		let info = $P.photoInspectionControl.dataset.getCurrent("item");
+		let info;
 
-		// info 가 없다면.. return
+		if ($P.currentDisplay == "photoInspection") {
+			info = $P.photoInspectionControl.dataset.getCurrent("item");
+		} else if ($P.currentDisplay == "sameVehicleInspection") {
+			info = $P.sameVehicleControl.sub.dataset.getCurrent("item");
+		} else {
+			return;
+		}
+
+		// 선택된 자료가 없다면.. return
 		if (info == undefined || info == "") {
 			return;
 		}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp
index fcfcd89b..fc98f22b 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp
@@ -12,22 +12,27 @@
 		<input type="hidden" id="levyExclId--${pageName}" name="levyExclId" data-map="LEVY_EXCL_ID" />
 
 		<div class="row g-1">
+			<!-- 차량번호 -->
+			<div class="col-md-12">
+				<label for="vhrno--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">차량번호</label>
+				<input type="text" class="form-control w-px-120" id="vhrno--${pageName}" name="vhrno" data-map="VHRNO" readonly />
+			</div>
 			<!-- 부과제외 구분 -->
 			<div class="col-md-12">
-				<label for="levyExclSeNm--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end required">처리 구분</label>
-				<input type="text" class="form-control" id="levyExclSeNm--${pageName}" readonly />
+				<label for="levyExclSeNm--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end required">부과제외 구분</label>
+				<input type="text" class="form-control w-px-120" id="levyExclSeNm--${pageName}" readonly />
 				<input type="hidden" id="levyExclSeCd--${pageName}" name="levyExclSeCd" data-map="LEVY_EXCL_SE_CD" />
 			</div>
 			<!-- 부과제외 일자 -->
 			<div class="col-md-12">
-				<label for="levyExclYmd--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end required">처리 일자</label>
+				<label for="levyExclYmd--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end required">부과제외 일자</label>
 				<input type="text" class="form-control form-date" id="levyExclYmd--${pageName}" name="levyExclYmd" data-map="LEVY_EXCL_YMD"
 					data-fmt-type="day" title="날짜 선택" required />
 				<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
 			</div>
 			<!-- 부과제외 사유 -->
 			<div class="col-md-12">
-				<label for="levyExclRsnCd--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end required">처리 사유</label>
+				<label for="levyExclRsnCd--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end required">부과제외 사유</label>
 				<select class="form-select" id="levyExclRsnCd--${pageName}" name="levyExclRsnCd" data-map="LEVY_EXCL_RSN_CD" required>
 					<option value="">선택하세요</option>
 					<c:forEach items="${FIM022List}" var="item">