From da27656993857c5ff4b647233ba18166cefca8aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= <dev13@gcone.kr>
Date: Wed, 15 Apr 2026 14:46:59 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=A3=BC=EB=AC=B8=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=20>=20=EC=A0=84=EC=B2=B4=EC=A3=BC=EB=AC=B8=EC=A1=B0=ED=9A=8C,?=
 =?UTF-8?q?=20=EC=A3=BC=EB=AC=B8=EC=83=81=EC=84=B8=20-=20=EA=B5=AC?=
 =?UTF-8?q?=EB=8F=85=EC=84=9C=EB=B9=84=EC=8A=A4=20=EC=A3=BC=EB=AC=B8=20?=
 =?UTF-8?q?=EA=B1=B4=20=EC=83=81=ED=92=88=EC=A4=80=EB=B9=84=20=EC=83=81?=
 =?UTF-8?q?=ED=83=9C=20=EB=B3=80=EA=B2=BD=20=EB=B0=A9=EC=A7=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit c02fc822eae0d47486132769d9a99db4a82c16a7)
---
 .../views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp       | 8 ++++++++
 .../WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp   | 7 ++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

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 0db26284..8ae0a30f 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
@@ -398,9 +398,16 @@
 
                 const currOrdrSttusCd = tr.replace('order-sttus-cd-', '');
                 const chgOrdrSttusCd = $(this).attr('id').replace('ordrSttus', '');
+                const hasSubsvc = $(rowCheckboxs).is(function() {
+                    return $(this).closest('tr').find('input[name="subsvcAt"]').val() === 'Y';
+                });
 
                 let msg = '';
 
+                if (chgOrdrSttusCd === '35' && hasSubsvc) {
+                    alert('구독서비스의 상품준비 처리는 "구독서비스 상품준비 관리" 화면에서 처리해주세요.');
+                    return;
+                }
                 if ('35' === chgOrdrSttusCd) {
                     msg = '선택된 주문의 \'' + fn_get_code_nm('sttusCd', currOrdrSttusCd) + '\' → \'' + fn_get_code_nm('sttusCd', chgOrdrSttusCd)  + '\'로 변경하시겠습니까?';
                 } else {
@@ -856,6 +863,7 @@
             }else{
                 tr += '일반';
             }
+            tr += '<input type="hidden" name="subsvcAt" value="' + data.subsvcAt + '">';
             tr += '    </td>';
             tr += '    <td>' + data.ordrRceptDt + '</td>';
             tr += '    <td>' + fn_nvl(data.sleEnvrnNm, '') + '</td>';
diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp
index 85d9c715..b0380dd1 100644
--- a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp
+++ b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp
@@ -102,9 +102,14 @@
                 const ordrInnb = $('#ordrInnb').text();
                 const chgOrdrSttusCd = ($(this).attr('class').split(' ')[0]).replace('btn-ordr-sttus-', '');
                 const currOrdrSttusCd = '${data.dtl.ordrSttusCd}';
+                const subsvcAt = '${data.dtl.subsvcAt}';
+
+                if (chgOrdrSttusCd === '35' && subsvcAt === 'Y') {
+                    alert('구독서비스의 상품준비 처리는 "구독서비스 상품준비 관리" 화면에서 처리해주세요.');
+                    return;
+                }
 
                 let msg = '선택된 주문을 \'' + fn_get_code_nm('sttusCd', chgOrdrSttusCd) + '\' 처리 하시겠습니까?';
-
                 if (confirm(msg)) {
                     fn_post_ordr_sttus([ordrInnb], chgOrdrSttusCd, currOrdrSttusCd);
                 }