From 272cd361101d63ebb4c00089e13dbcd82828e9d6 Mon Sep 17 00:00:00 2001
From: jazz <jazz>
Date: Thu, 12 Feb 2026 17:22:05 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?=
 =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EC=A3=BC=EB=AC=B8=EB=AA=A9=EB=A1=9D,=20?=
 =?UTF-8?q?=EC=A3=BC=EB=AC=B8->=EC=B6=9C=EA=B3=A0=EC=B2=98=EB=A6=AC=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=EC=A1=B0=ED=9A=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/gcone/ordr/dlivy/BODlivyMapper.xml |  1 +
 .../mapper/gcone/ordr/ordr/BOOrdrMapper.xml   |  1 +
 .../mngr/ordr/dlivy/DlivyProcsPopupU.jsp      |  3 +-
 .../mngr/ordr/dlivy/DlivyProcsPopupUForm.jsp  |  9 +++++
 .../mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp | 33 ++++++++-----------
 5 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/mybatis/xml/mapper/gcone/ordr/dlivy/BODlivyMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/ordr/dlivy/BODlivyMapper.xml
index 1e6958dd..65095914 100644
--- a/src/main/resources/mybatis/xml/mapper/gcone/ordr/dlivy/BODlivyMapper.xml
+++ b/src/main/resources/mybatis/xml/mapper/gcone/ordr/dlivy/BODlivyMapper.xml
@@ -683,6 +683,7 @@
 										,FMG.MBR_GRAD_NM -- 회원 등급명
 									    ,IFNULL(REGEXP_REPLACE(CAST(AES_DECRYPT(UNHEX(SH.RECPNT_MBTLNB) , '1df5be2f7e90ae36') AS CHAR(50)), '(.{3})(.{4})(.{4})', '$1-$2-$3'), '') AS RECPNT_MBTLNB
 										,IFNULL(REGEXP_REPLACE(CAST(AES_DECRYPT(UNHEX(O.ORDRR_MBTLNB) , '1df5be2f7e90ae36') AS CHAR(50)), '(.{3})(.{4})(.{4})', '$1-$2-$3'), '') AS ORDRR_MBTLNB
+										,FN_GET_COMMCODE_NAME('ORDR_STTUS', SH.ORDR_STTUS_CD) AS ORDR_STTUS_NM
     ]]>
 		<include refid="dlivyProcsFrom"/>
 		<include refid="dlivyProcsWhere"/>
diff --git a/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml
index becbc289..bdf45617 100644
--- a/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml
+++ b/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml
@@ -580,6 +580,7 @@
         														 END
         													 )
         			  ) BLACK_DV -- 블랙리스트 구분
+                    , FO.SUBSVC_AT
         		FROM GC_ORDER FO
         		LEFT JOIN LATERAL (
         				  SELECT FM.MBR_INNB
diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupU.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupU.jsp
index 711acfcf..b725c61f 100644
--- a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupU.jsp
+++ b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupU.jsp
@@ -114,8 +114,7 @@
                                         </div>
                                         <div class="sendOut-info__info-name">
                                             <a href="" class="blue-6 fw-500"><c:out value="${ exList.ordrrNm }"/></a>
-                                            <span style="font-size: 10px;" class="stone-7">▶</span>
-                                            <span><c:out value="${ exList.recpntNm }"/>님에게 1번째</span>
+                                            <br><span> [<c:out value="${exList.ordrSttusNm}"/>]</span>
                                         </div>
                                         <div>
                                             <p class="sendOut-info__info-address">(<c:out value="${ exList.dlvylcZip }"/>)
diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupUForm.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupUForm.jsp
index c188270c..3dbfde78 100644
--- a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupUForm.jsp
+++ b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupUForm.jsp
@@ -179,6 +179,15 @@
                                                 </span>
                                         </label>
                                     </c:if>
+                                    <c:if test="${ cdList.cd eq 50 }">
+                                        <label class="b-checkbox checkbox">
+                                            <input type="checkbox" value="<c:out value="${ cdList.cd }"/>" name="srchOrdrSttusCds">
+                                            <span class="check"></span>
+                                            <span class="control-label">
+                                                    <span class="order-status-badge export"><c:out value="${ cdList.cdNm }"/></span>
+                                                </span>
+                                        </label>
+                                    </c:if>
                                     <c:if test="${ cdList.cd eq 60 }">
                                         <label class="b-checkbox checkbox">
                                             <input type="checkbox" value="<c:out value="${ cdList.cd }"/>" name="srchOrdrSttusCds">
diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp
index 1ecbf77c..12f1357b 100644
--- a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp
+++ b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp
@@ -602,7 +602,7 @@
                         const paginationInfo = result.paginationInfo;
 
                         if (allOrdrList == null) {
-                            $('#orderList').append('<tr class="row"><td class="center" colspan="15">검색어가 없거나 검색 결과가 없습니다.</td>');
+                            $('#orderList').append('<tr class="row"><td class="center" colspan="14">검색어가 없거나 검색 결과가 없습니다.</td>');
                         } else {
                             let rowNum = paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1) * paginationInfo.recordCountPerPage) + 1;
 
@@ -736,7 +736,7 @@
                 let header = '';
 
                 header += '<tr class="row order-section__header ' + ordrSttus + '" id="' + currTr + '-header">';
-                header += '    <td colspan="15">';
+                header += '    <td colspan="14">';
                 header += '        <div class="form-control-container">';
                 header += '            <div class="left">';
                 header += '                <div class="select-box">';
@@ -755,7 +755,7 @@
                     /* header += '            <button type="button" id="ordrSttus85" class="btn-' + currTr + ' btn gray xsm">결제취소</button>'; */
                 }
 
-                if ('35' === data.ordrSttusCd) {
+                if ('35' === data.ordrSttusCd || '50' === data.ordrSttusCd) {
                     header += '            <button type="button" onclick="fn_dlivy_procs_popup_check_ordrs(\'/mngr/ordr/dlivy/selectOrdrDlivyPopupForm\',\'팝업\',\'1400\',\'840\');" class="btn primary xsm btn-dlivy-procs-pop-' + data.ordrSttusCd + '">출고처리</button>';
                     /* header += '            <button type="button" id="ordrSttus85" class="btn-' + currTr + ' btn gray xsm">결제취소</button>'; */
                 }
@@ -850,16 +850,13 @@
             tr += '    <td>' + (rowNum - 1) + '</td>';
             tr += '    <td>';
 
-            if (!fn_is_empty(data.inflowCoursUrl)) {
-                tr += '    <a href="' + data.inflowCoursUrl + '" target="_blank">';
-                tr += '        <span class="blue-8 fw-500" title="' + data.inflowCoursUrl + '">' + (data.inflowCoursNm).substring(0, 1); + '</span></td>';
-                tr += '    </a>';
-            } else {
-                tr += '    <span class="blue-8 fw-500" title="' + data.inflowCoursUrl + '">' + (data.inflowCoursNm).substring(0, 1); + '</span></td>';
+            /** 구독서비스 여부 (구독/일반)*/
+            if (data.usbsvcAt == 'Y'){
+                tr += '구독';
+            }else{
+                tr += '일반';
             }
-
             tr += '    </td>';
-            tr += '    <td><span class="blue-8 fw-500" title="' + data.sopmalNm + '">' + (data.sopmalNm).substring(0, 1) + '</span></td>';
             tr += '    <td>' + data.ordrRceptDt + '</td>';
             tr += '    <td>' + fn_nvl(data.sleEnvrnNm, '') + '</td>';
             tr += '    <td class="left">';
@@ -993,7 +990,7 @@
             let detail = '';
 
             detail += '<tr class="row order-section__detail' + ' ordr-innb-detail-' + ordrInnb + '">';
-            detail += '    <td colspan="15">';
+            detail += '    <td colspan="14">';
             detail += '        <div class="order-section__detail-inner">';
             detail += '            <h5 class="order-section__detail-title">주문상품</h5>';
             detail += '            <div class="table-wrapper">';
@@ -1331,7 +1328,7 @@
                 let footer = '';
 
                 footer += '<tr class="row order-section__footer">';
-                footer += '    <td colspan="15">';
+                footer += '    <td colspan="14">';
                 footer += '        <div class="form-control-container">';
                 footer += '            <div class="left">';
                 footer += '                <div class="select-box">';
@@ -1350,8 +1347,8 @@
                     /* footer += '            <button type="button" id="ordrSttus85" class="btn-' + currTr + ' btn gray xsm">결제취소</button>'; */
                 }
 
-                if ('35' === prevOrderSttusCd) {
-                    footer += '            <button type="button" onclick="fn_dlivy_procs_popup_check_ordrs(\'/mngr/ordr/dlivy/selectOrdrDlivyPopupForm\',\'팝업\',\'1400\',\'840\');" class="btn primary xsm btn-dlivy-procs-pop-' + data.ordrSttusCd + '">출고처리</button>';
+                if ('35' === prevOrderSttusCd || '50' === prevOrderSttusCd) {
+                    footer += '            <button type="button" onclick="fn_dlivy_procs_popup_check_ordrs(\'/mngr/ordr/dlivy/selectOrdrDlivyPopupForm\',\'팝업\',\'1400\',\'840\');" class="btn primary xsm btn-dlivy-procs-pop-' + prevOrderSttusCd + '">출고처리</button>';
                     /* footer += '            <button type="button" id="ordrSttus85" class="btn-' + currTr + ' btn gray xsm">결제취소</button>'; */
                 }
                 footer += '                <button type="button" class="btn-order-print-' + data.ordrSttusCd + ' btn outline xsm fs-13"><i class="icon icon_print"></i>프린트</button>';
@@ -2187,7 +2184,6 @@
                                 <col style="width: 50px">
                                 <col style="width: 50px">
                                 <col style="width: 50px">
-                                <col style="width: 50px">
                                 <col style="width: 120px">
                                 <col style="width: 50px">
                                 <col style="width: 215px">
@@ -2204,8 +2200,7 @@
                                 <th>선택</th>
                                 <th>중요</th>
                                 <th>번호</th>
-                                <th>유입</th>
-                                <th>마켓</th>
+                                <th>주문구분</th>
                                 <th>주문일시</th>
                                 <th>환경</th>
                                 <th>주문번호</th>
@@ -2220,7 +2215,7 @@
                             </thead>
                             <tbody id="orderList">
                             <tr>
-                                <td colspan="15">
+                                <td colspan="14">
                                     <div class="form-control-container">
                                         <div class="left">
                                         <span class="gray-6">* 블랙리스트는 자사몰은 적색, 물류센터는 녹색으로 표시됩니다.</span>