From ddf7cb9f13cc12f0d760231cef72b1b90f5f1b90 Mon Sep 17 00:00:00 2001
From: ysCha <yscha@interplug.co.kr>
Date: Fri, 5 Jun 2026 11:00:29 +0900
Subject: [PATCH] =?UTF-8?q?[1423]=20=EC=84=A4=EA=B3=84=EA=B0=80=EC=A0=B8?=
 =?UTF-8?q?=EC=98=A4=EA=B8=B0=20T01=20=EC=A0=84=EC=9A=A9=20+=202=EC=B0=A8?=
 =?UTF-8?q?=EC=A0=90=20=EA=B0=95=EC=A0=9C=20select=20=EB=B0=98=EC=98=81=20?=
 =?UTF-8?q?=E2=80=94=20No=20data/=EB=84=A4=ED=8A=B8=EC=9B=8C=ED=81=AC=20?=
 =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EB=B6=84=EB=A6=AC=20+=20vExt=20cascade=20?=
 =?UTF-8?q?=ED=8F=89=ED=96=89=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/management/StuffDetail.jsx | 88 +++++++++++++----------
 src/locales/ja.json                       |  1 +
 src/locales/ko.json                       |  1 +
 src/util/kerab-offset-surgical.js         | 27 +++++--
 4 files changed, 73 insertions(+), 44 deletions(-)

diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx
index 874aa8fd..30370d73 100644
--- a/src/components/management/StuffDetail.jsx
+++ b/src/components/management/StuffDetail.jsx
@@ -1082,39 +1082,49 @@ export default function StuffDetail() {
       return
     }
 
-    // T01 / 1차 user + 2차 ID: firstAgent 검증 후에만 적용 (실패 시 무반영)
-    get({ url: `/api/object/saleStore/${info.saleStoreId}/firstAgent` }).then((res) => {
-      logger.debug('[PLANREQ-DEBUG] firstAgent result', { firstAgentId: res?.firstAgentId })
-      if (!res?.firstAgentId) {
-        swalFire({
-          title: getMessage('stuff.detail.planReq.message.notMatch'),
-          type: 'alert',
-          icon: 'warning',
-        })
-        return
-      }
+    // [PLANREQ-FORCE-SELECT 2026-06-05] T01 / 1차 user + 2차 ID
+    // 매핑 실패해도 모든 필드 적용 + 2차점을 옵션에 강제 추가 + selected
+    // 1차점 정보(firstAgent) 가 있으면 1차점도 함께 반영
+    // 'No data' 응답(4xx + message)도 매핑 실패와 동일하게 처리, 진짜 네트워크 에러만 알림
+    const applyOtherSaleStore = () => {
       applyFields()
+      setOtherSaleStoreList((prev) => {
+        const exists = prev.some((o) => o.saleStoreId === info.saleStoreId)
+        return exists ? prev : [...prev, { saleStoreId: info.saleStoreId, saleStoreName: info.saleStoreName }]
+      })
       setOtherSelOptions(info.saleStoreId)
       form.setValue('otherSaleStoreId', info.saleStoreId)
       form.setValue('otherSaleStoreName', info.saleStoreName)
       form.setValue('otherSaleStoreLevel', info.saleStoreLevel)
-      const firstAgent = { saleStoreId: res.firstAgentId, saleStoreName: res.firstAgentName }
-      setSaleStoreList((prev) => {
-        const exists = prev.some((s) => s.saleStoreId === res.firstAgentId)
-        return exists ? prev : [...prev, firstAgent]
-      })
-      setShowSaleStoreList((prev) => {
-        const exists = prev.some((s) => s.saleStoreId === res.firstAgentId)
-        return exists ? prev : [...prev, firstAgent]
-      })
-      setSelOptions(res.firstAgentId)
-      form.setValue('saleStoreId', res.firstAgentId)
-      form.setValue('saleStoreName', res.firstAgentName)
-      form.setValue('saleStoreLevel', '1')
-    }).catch(() => {
-      // 매핑 실패 — 아무것도 적용 안 함 + 사용자에게 알림
+    }
+    get({ url: `/api/object/saleStore/${info.saleStoreId}/firstAgent` }).then((res) => {
+      logger.debug('[PLANREQ-DEBUG] firstAgent result', { firstAgentId: res?.firstAgentId })
+      applyOtherSaleStore()
+      if (res?.firstAgentId) {
+        const firstAgent = { saleStoreId: res.firstAgentId, saleStoreName: res.firstAgentName }
+        setSaleStoreList((prev) => {
+          const exists = prev.some((s) => s.saleStoreId === res.firstAgentId)
+          return exists ? prev : [...prev, firstAgent]
+        })
+        setShowSaleStoreList((prev) => {
+          const exists = prev.some((s) => s.saleStoreId === res.firstAgentId)
+          return exists ? prev : [...prev, firstAgent]
+        })
+        setSelOptions(res.firstAgentId)
+        form.setValue('saleStoreId', res.firstAgentId)
+        form.setValue('saleStoreName', res.firstAgentName)
+        form.setValue('saleStoreLevel', '1')
+      }
+    }).catch((error) => {
+      // 'No data' 는 1차점 매핑 정보가 없을 뿐 — 2차점만 옵션 추가+select
+      const message = error?.response?.data?.message
+      if (message === 'No data') {
+        applyOtherSaleStore()
+        return
+      }
+      // 진짜 네트워크/서버 에러
       swalFire({
-        title: getMessage('stuff.detail.planReq.message.notMatch'),
+        title: getMessage('stuff.detail.planReq.message.networkError'),
         type: 'alert',
         icon: 'warning',
       })
@@ -1878,16 +1888,18 @@ export default function StuffDetail() {
                           )) ||
                             null}
                         </div>
-                        <button
-                          type="button"
-                          className="btn-origin grey"
-                          onClick={() => {
-                            onSearchDesignRequestPopOpen()
-                          }}
-                          style={{ display: showButton }}
-                        >
-                          {getMessage('stuff.planReqPopup.title')}
-                        </button>
+                        {session?.storeId === 'T01' && (
+                          <button
+                            type="button"
+                            className="btn-origin grey"
+                            onClick={() => {
+                              onSearchDesignRequestPopOpen()
+                            }}
+                            style={{ display: showButton }}
+                          >
+                            {getMessage('stuff.planReqPopup.title')}
+                          </button>
+                        )}
                       </div>
                     </td>
                   </tr>
@@ -2468,7 +2480,7 @@ export default function StuffDetail() {
                                 ></button>
                               ) : null}
                             </div>
-                            {managementState?.tempFlg === '1' ? (
+                            {managementState?.tempFlg === '1' && session?.storeId === 'T01' ? (
                               <>
                                 <button
                                   type="button"
diff --git a/src/locales/ja.json b/src/locales/ja.json
index e6092ae9..556bde5c 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -810,6 +810,7 @@
   "stuff.detail.tempSave.message3": "二次販売店を選択してください。",
   "stuff.detail.confirm.message1": "販売店情報を変更すると、設計依頼文書番号が削除されます。変更しますか？",
   "stuff.detail.planReq.message.notMatch": "設計依頼の販売店情報が一致しないため、インポートできません。",
+  "stuff.detail.planReq.message.networkError": "設計依頼情報の照会中にネットワークエラーが発生しました。しばらくしてから再度お試しください。",
   "stuff.detail.delete.message1": "仕様が確定したものは削除できません。",
   "stuff.detail.planList.title": "プランリスト",
   "stuff.detail.planList.cnt": "全体",
diff --git a/src/locales/ko.json b/src/locales/ko.json
index b000c736..24510705 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -810,6 +810,7 @@
   "stuff.detail.tempSave.message3": "2차 판매점을 선택해주세요.",
   "stuff.detail.confirm.message1": "판매점 정보를 변경하면 설계의뢰 문서번호가 삭제됩니다. 변경하시겠습니까?",
   "stuff.detail.planReq.message.notMatch": "설계의뢰의 판매점 정보가 일치하지 않아 가져올 수 없습니다.",
+  "stuff.detail.planReq.message.networkError": "설계의뢰 정보 조회 중 네트워크 오류가 발생했습니다. 잠시 후 다시 시도해주세요.",
   "stuff.detail.delete.message1": "사양이 확정된 물건은 삭제할 수 없습니다.",
   "stuff.detail.planList.title": "플랜목록",
   "stuff.detail.planList.cnt": "전체",
diff --git a/src/util/kerab-offset-surgical.js b/src/util/kerab-offset-surgical.js
index 5d9e3f59..67016214 100644
--- a/src/util/kerab-offset-surgical.js
+++ b/src/util/kerab-offset-surgical.js
@@ -210,13 +210,28 @@ export const applyKerabOffsetSurgical = (canvas, target, newOffset) => {
             for (const other of cascadeTargets) {
               if (!other || other === il) continue
               let moved = false
-              if (pointOnOldSeg(other.x1, other.y1)) {
-                other.set({ x1: other.x1 + dxVExt, y1: other.y1 + dyVExt })
-                moved = true
-              }
-              if (pointOnOldSeg(other.x2, other.y2)) {
-                other.set({ x2: other.x2 + dxVExt, y2: other.y2 + dyVExt })
+              const hit1 = pointOnOldSeg(other.x1, other.y1)
+              const hit2 = pointOnOldSeg(other.x2, other.y2)
+              // [KERAB-VALLEY-EXT-PARALLEL 2026-06-05] vExt(골짜기 확장라인)는 self-extension
+              //   수직/수평 라인이라 한 끝만 cascade 로 끌면 대각선이 된다 (사용자 룰: 대각선은 hip뿐).
+              //   split 된 vExt 세그먼트는 한 끝만 옛 segment 에 닿아도 양 끝을 같은 변위로 평행이동.
+              if (other.lineName === 'kerabPatternValleyExt' && (hit1 || hit2)) {
+                other.set({
+                  x1: other.x1 + dxVExt,
+                  y1: other.y1 + dyVExt,
+                  x2: other.x2 + dxVExt,
+                  y2: other.y2 + dyVExt,
+                })
                 moved = true
+              } else {
+                if (hit1) {
+                  other.set({ x1: other.x1 + dxVExt, y1: other.y1 + dyVExt })
+                  moved = true
+                }
+                if (hit2) {
+                  other.set({ x2: other.x2 + dxVExt, y2: other.y2 + dyVExt })
+                  moved = true
+                }
               }
               if (moved) {
                 if (typeof other.setCoords === 'function') other.setCoords()