From af0120b8a254da9cd1c06294e4fc88e775b3c795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?=
 <43837214+Minsiki@users.noreply.github.com>
Date: Wed, 26 Feb 2025 16:06:25 +0900
Subject: [PATCH 1/2] =?UTF-8?q?-=20=EB=AA=A8=EB=93=88=20=EB=B3=B5=EC=82=AC?=
 =?UTF-8?q?=ED=95=A0=EB=95=8C=20moduleInfo=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/module/useModule.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/hooks/module/useModule.js b/src/hooks/module/useModule.js
index 0c884608..4d54a3ea 100644
--- a/src/hooks/module/useModule.js
+++ b/src/hooks/module/useModule.js
@@ -225,6 +225,7 @@ export function useModule() {
             length: module.length,
             points: module.points,
             surfaceId: module.surfaceId,
+            moduleInfo: module.moduleInfo,
             left,
             top,
             id: uuidv4(),
@@ -281,6 +282,7 @@ export function useModule() {
           length: module.length,
           points: module.points,
           surfaceId: module.surfaceId,
+          moduleInfo: module.moduleInfo,
           left,
           top,
           id: uuidv4(),
@@ -358,6 +360,7 @@ export function useModule() {
           type: module.type,
           length: module.length,
           points: module.points,
+          moduleInfo: module.moduleInfo,
           surfaceId: module.surfaceId,
           left,
           top,
@@ -682,6 +685,7 @@ export function useModule() {
           type: module.type,
           length: module.length,
           points: module.points,
+          moduleInfo: module.moduleInfo,
           surfaceId: module.surfaceId,
           left,
           top,
@@ -778,6 +782,7 @@ export function useModule() {
           length: module.length,
           points: module.points,
           surfaceId: module.surfaceId,
+          moduleInfo: module.moduleInfo,
           fill: module.fill,
           left,
           top,
@@ -949,16 +954,16 @@ export function useModule() {
     let left = target.left
 
     if (direction === 'up') {
-      top = Number(target.top) - Number(length)
+      top = Number(target.top) - Number(length) / 10
       top = hasMargin ? top - Number(target.height) : top
     } else if (direction === 'down') {
-      top = Number(target.top) + Number(length)
+      top = Number(target.top) + Number(length) / 10
       top = hasMargin ? top + Number(target.height) : top
     } else if (direction === 'left') {
-      left = Number(target.left) - Number(length)
+      left = Number(target.left) - Number(length) / 10
       left = hasMargin ? left - Number(target.width) : left
     } else if (direction === 'right') {
-      left = Number(target.left) + Number(length)
+      left = Number(target.left) + Number(length) / 10
       left = hasMargin ? left + Number(target.width) : left
     }
     return { top, left }

From 4e963254d1ac2cab4f2b46b54c11a12b4e0832e2 Mon Sep 17 00:00:00 2001
From: basssy <basssy@interplug.co.kr>
Date: Wed, 26 Feb 2025 16:41:39 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EB=AC=BC=EA=B1=B4=EC=83=81=EC=84=B8=20->?=
 =?UTF-8?q?=20=ED=94=8C=EB=9E=9C=20=EA=B7=B8=EB=A6=AC=EB=93=9C=20=EB=8D=94?=
 =?UTF-8?q?=EB=B8=94=ED=81=B4=EB=A6=AD=20=EB=8F=84=EB=A9=B4=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1=20=EC=9D=B4=EB=8F=99=20/=20=EC=83=81=EB=8B=A8?=
 =?UTF-8?q?=EC=97=90=20=EB=8F=84=EB=A9=B4=EC=9E=91=EC=84=B1=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99=EC=8B=9C=20Sel?=
 =?UTF-8?q?ectedMenu=20=EB=B6=84=EB=A6=AC=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/management/StuffDetail.jsx    | 20 +++++++-------------
 src/components/management/StuffSubHeader.jsx | 15 ++++++++++++++-
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx
index aacaeea4..0c825c20 100644
--- a/src/components/management/StuffDetail.jsx
+++ b/src/components/management/StuffDetail.jsx
@@ -1625,17 +1625,6 @@ export default function StuffDetail() {
     input.value = input.value.replace(/[^0-9]/g, '')
   }
 
-  //자동완성 옵션 없을때 메세지 컴포넌트..
-  const NoOptionsMessage = (props) => {
-    return (
-      <components.NoOptionsMessage {...props}>
-        <span style={{ background: 'red' }} className="custom-css-class">
-          TEXTTTTTTT
-        </span>
-      </components.NoOptionsMessage>
-    )
-  }
-
   // 그리드 더블 클릭 해당플랜의 도면작성 화면으로 이동
   const getCellDoubleClicked = (params) => {
     if (managementState?.createSaleStoreId === 'T01') {
@@ -1653,7 +1642,13 @@ export default function StuffDetail() {
           pid: planNo,
           objectNo: objectNo,
         }
-        setSelectedMenu(null)
+        // 견적서 생성 여부에 따라 selectedMenu 셋팅
+        if (params?.data?.estimateDate) {
+          setSelectedMenu('module')
+        } else {
+          setSelectedMenu('surface')
+        }
+
         const url = `/floor-plan?${queryStringFormatter(param)}`
         router.push(url)
       }
@@ -1946,7 +1941,6 @@ export default function StuffDetail() {
                         <div className="select-wrap mr5" style={{ width: '567px' }}>
                           <Select
                             id="long-value-select2"
-                            // components={{ NoOptionsMessage }}
                             instanceId="long-value-select2"
                             className="react-select-custom"
                             classNamePrefix="custom"
diff --git a/src/components/management/StuffSubHeader.jsx b/src/components/management/StuffSubHeader.jsx
index 18eaa761..8f0df06c 100644
--- a/src/components/management/StuffSubHeader.jsx
+++ b/src/components/management/StuffSubHeader.jsx
@@ -55,7 +55,20 @@ export default function StuffSubHeader({ type }) {
       objectNo: objectNo,
     }
 
-    setSelectedMenu(null)
+    /**
+     * 도면작성은 플랜1번의 도면작성화면으로 이동하기 때문에
+     * 1.물건작성하고 바로 -> planList 생성전. surface
+     * 2.물건이 여러건있을때 1번 플랜의 estimateDate 여부로 selectedMenu 셋팅
+     */
+    if (managementState?.planList.length === 0) {
+      setSelectedMenu('surface')
+    } else {
+      if (managementState?.planList[0].estimateDate) {
+        setSelectedMenu('module')
+      } else {
+        setSelectedMenu('surface')
+      }
+    }
     const url = `/floor-plan?${queryStringFormatter(param)}`
 
     router.push(url)