diff --git a/WebContent/WEB-INF/view/productionplanning/mBomHeaderPopup.jsp b/WebContent/WEB-INF/view/productionplanning/mBomHeaderPopup.jsp index 4f70030..dbc2dcd 100644 --- a/WebContent/WEB-INF/view/productionplanning/mBomHeaderPopup.jsp +++ b/WebContent/WEB-INF/view/productionplanning/mBomHeaderPopup.jsp @@ -524,11 +524,12 @@ function generateHistoryHtml(historyList) { var changeType = history.CHANGE_TYPE || "UNKNOWN"; var changeDate = history.CHANGE_DATE || history.REGDATE || ""; var changeUser = history.CHANGE_USER || ""; + var changeUserName = history.CHANGE_USER_NAME || ""; // 이력 헤더 html += "
"; html += "

"; - html += "이력 #" + (i + 1) + " - " + changeType + " (" + changeDate + " / " + changeUser + ")"; + html += "이력 #" + (i + 1) + " - " + changeType + " (" + changeDate + " / " + changeUserName + ")"; html += "

"; try { diff --git a/src/com/pms/mapper/productionplanning.xml b/src/com/pms/mapper/productionplanning.xml index ec4bd5f..5b1d9bc 100644 --- a/src/com/pms/mapper/productionplanning.xml +++ b/src/com/pms/mapper/productionplanning.xml @@ -3427,6 +3427,7 @@ MH.BEFORE_DATA, MH.AFTER_DATA, MH.CHANGE_USER, + USER_NAME(MH.CHANGE_USER) AS CHANGE_USER_NAME, TO_CHAR(MH.CHANGE_DATE, 'YYYY-MM-DD HH24:MI:SS') AS CHANGE_DATE, -- MBOM_HEADER 정보 조인 MHD.MBOM_NO AS MBOM_PART_NO,