From a0292d3cda8b4272114e558e45a76ff065a1efbf Mon Sep 17 00:00:00 2001
From: "Jonguk. Lim" <minuk926@gmail.com>
Date: Thu, 20 Jun 2024 17:39:55 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=ED=8F=90=EA=B8=B0=ED=99=95=EC=9D=B8=20?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=20=ED=8F=AC=EB=A7=B7=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/adds/nims/dsuseMgtMapping-info.jsp    | 54 +++++++++++--------
 .../jsp/adds/nims/dsuseMgtMapping-main.jsp    |  3 +-
 2 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-info.jsp
index bbd9e2f..31f0b22 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-info.jsp
@@ -102,11 +102,11 @@
 											<tr data-key="{DSCDMNG_SN}">
 												<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSCDMNG_SN}</td>
 												<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRDUCT_CD}</td>
-												<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_QY} {PCE_UNIT}</td>
-												<td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{PRD_VALID_DE}</td>
+												<td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_QY} {PCE_UNIT}</td>
+												<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRD_VALID_DE}</td>
 												<td class="cmn text-center"  onclick="{onclick}" ondblclick="{ondblclick}">{MNF_NO}</td>
 												<td class="cmn text-center"  onclick="{onclick}" ondblclick="{ondblclick}">{MNF_SEQ}</td>
-												<td class="cmn text-center"  onclick="{onclick}" ondblclick="{ondblclick}">{PRDUCT_NM}</td>
+												<td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{PRDUCT_NM}</td>
 <%--												<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{MIN_DISTB_QY} {MIN_DISTB_UNIT}</td>--%>
 <%--												<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PCE_QY} {PCE_UNIT}</td>												--%>
 											</tr>
@@ -136,11 +136,13 @@
 										<th class="cmn" style="width: 72px;">No.</th>
 										<th class="cmn" style="width: 160.141px;">폐기관리번호</th>
 										<th class="cmn" style="width: 160.141px;">업체명</th>
-										<th class="cmn" style="width: 230.469px;">업종명</th>
-										<th class="cmn" style="width: 100px;">보고건수</th>
+<%--										<th class="cmn" style="width: 230.469px;">업종명</th>--%>
+										<th class="cmn" style="width: 90px;">보고건수</th>
 										<th class="cmn" style="width: 230.469px;">폐기사유</th>
-										<th class="cmn" style="width: 180px;">취급일자</th>
-										<th class="cmn" style="width: 230.469px;">폐기일자</th>
+										<th class="cmn" style="width: 120px;">취급일자</th>
+										<th class="cmn" style="width: 120.469px;">폐기일자</th>
+										<th class="cmn" style="width: 180.469px;">폐기구분</th>
+										<th class="cmn" style="width: 180.469px;">폐기방법</th>
 										<th class="cmn" style="width: 180px;">폐기장소</th>
 									</tr>
 								</thead>
@@ -148,14 +150,16 @@
 								</tbody>
 								<template id="${infoPrefix}Row--${pageName}Mapping">
 									<tr data-key="{orgUsrRptIdNo}">
-										<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}"></td>
+										<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{ROW_NUM}</td>
 										<td class="cmn text-center"  onclick="{onclick}" ondblclick="{ondblclick}">{dscdmngId}</td>
 										<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{bsshNm}</td>
-										<td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{indutyNm}</td>
-										<td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{dsuseMthCd}</td>
+<%--										<td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{indutyNm}</td>--%>
+										<td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{rndDtlRptCnt}</td>
 										<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsusePrvNm}</td>
 										<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{hdrDe}</td>
 										<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuseDe}</td>
+										<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuseSeNm}</td>
+										<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuseMthNm}</td>
 										<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuseLoc}</td>
 									</tr>
 								</template>
@@ -181,25 +185,29 @@
 										<thead class="sticky-thead">
 											<tr>
 												<th class="cmn" style="width: 72px;">No.</th>
-												<th class="sorting sorting_asc" aria-sort="ascending" style="width: 223.719px;">제품명</th>
 												<th class="sorting" style="width: 146.156px;">제품코드</th>
-												<th class="sorting" style="width: 160.141px;">폐기수량</th>
-												<th class="sorting" style="width: 230.469px;">유효기간</th>
-												<th class="sorting" style="width: 230.469px;">최소 유통단위 수량</th>
-												<th class="sorting" style="width: 230.469px;">낱개 단위 수량</th>
+												<th class="sorting" style="width: 90.141px;">폐기수량</th>
+												<th class="sorting" style="width: 120.469px;">유효기간</th>
+												<th class="sorting" style="width: 160.141px;">제조번호</th>
+												<th class="sorting" style="width: 160.141px;">일련번호</th>
+												<th class="sorting sorting_asc" aria-sort="ascending" style="width: 223.719px;">제품명</th>
+<%--												<th class="sorting" style="width: 230.469px;">유통단위 수량</th>--%>
+<%--												<th class="sorting" style="width: 230.469px;">낱개단위 수량</th>--%>
 											</tr>
 										</thead>
 										<tbody id="tbody--${pageName}MappingDtl">
 										</tbody>
 										<template id="${infoPrefix}Row--${pageName}MappingDtl">
 											<tr data-key="{mnfSeq}">
-												<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}"></td>
-												<td class="cmn text-center"  onclick="{onclick}" ondblclick="{ondblclick}">{prductNm}</td>
+												<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{ROW_NUM}</td>
 												<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{prductCd}</td>
-												<td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{dsuseQy}</td>
-												<td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{prdValidDe}</td>
-												<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{minDistbQy} {minDistbUnit}</td>
-												<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{pceQy} {pceUnit}</td>
+												<td class="cmn text-end"  onclick="{onclick}" ondblclick="{ondblclick}">{dsuseQy} {pceUnit}</td>
+												<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{prdValidDe}</td>
+												<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{mnfNo}</td>
+												<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{mnfSeq}</td>
+												<td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{prductNm}</td>
+<%--												<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{minDistbQy} {minDistbUnit}</td>--%>
+<%--												<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{pceQy} {pceUnit}</td>--%>
 											</tr>
 										</template>
 										<template id="${infoPrefix}NotFound--${pageName}MappingDtl">
@@ -289,7 +297,6 @@
 			, infoSize: "xl"
 			, formats: {
 				hdrDe: dateFormat
-				, rptDe: dateFormat
 				, dsuseDe: dateFormat
 			}
 		});
@@ -300,6 +307,9 @@
 			, keymapper: info => info ? info.mnfSeq : ""
 			, dataGetter: obj => obj.${infoPrefix}MappingDtl
 			, infoSize: "xl"
+			, formats: {
+				prdValidDe: dateFormat
+			}
 		});
 		
 		/**************************************************************************
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp
index e767a8e..65ea9e7 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp
@@ -208,8 +208,7 @@
 			, appendData: true
 			, infoSize: "xl"
 			, formats: {
-				RPT_DE: dateFormat
-		    	, HDR_DE: dateFormat
+		    	HDR_DE: dateFormat
 		    	, DSUSE_DE: dateFormat
 			}
 		});