From 563e5370df8dfb68fb8bcf0455086f312c41f134 Mon Sep 17 00:00:00 2001
From: yjnoh <lelalela@daum.net>
Date: Fri, 7 Mar 2025 17:01:40 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EB=AA=A8=EB=93=88=20=EB=B0=B0=EC=B9=98?=
 =?UTF-8?q?=EB=A9=B4=20=EC=84=A0=ED=83=9D=20=ED=95=B4=EC=A0=9C=20=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/usePlan.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/hooks/usePlan.js b/src/hooks/usePlan.js
index f7fa7508..eb61ed12 100644
--- a/src/hooks/usePlan.js
+++ b/src/hooks/usePlan.js
@@ -5,7 +5,7 @@ import { usePathname, useRouter } from 'next/navigation'
 
 import { useRecoilState, useResetRecoilState } from 'recoil'
 
-import { canvasState, currentCanvasPlanState, plansState, canvasSettingState } from '@/store/canvasAtom'
+import { canvasState, currentCanvasPlanState, plansState, canvasSettingState, currentObjectState, moduleSetupSurfaceState } from '@/store/canvasAtom'
 import { useAxios } from '@/hooks/useAxios'
 import { useMessage } from '@/hooks/useMessage'
 import { useSwal } from '@/hooks/useSwal'
@@ -61,6 +61,11 @@ export function usePlan(params = {}) {
   const [selectedModules, setSelectedModules] = useRecoilState(selectedModuleState)
   const { selectedMenu, setSelectedMenu } = useCanvasMenu()
 
+  //선택된 객체 초기화
+  const resetCurrentObject = useResetRecoilState(currentObjectState)
+  //선택된 모듈 배치면 초기화
+  const resetModuleSetupSurface = useResetRecoilState(moduleSetupSurfaceState)
+
   /**
    * 마우스 포인터의 가이드라인 제거
    */
@@ -415,6 +420,8 @@ export function usePlan(params = {}) {
   useEffect(() => {
     setSelectedPlan(currentCanvasPlan)
     handleCurrentPlanUrl()
+    resetCurrentObject()
+    resetModuleSetupSurface()
   }, [currentCanvasPlan])
 
   /**

From 4175a11f52af39e62126d8093770bb307a7fd1b9 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: Fri, 7 Mar 2025 17:41:09 +0900
Subject: [PATCH 2/2] =?UTF-8?q?1=EC=B0=A8=20=ED=86=B5=ED=95=A9=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(Integration=20Test)=20#874=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modal/circuitTrestle/step/StepUp.jsx         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
index 5320bef9..71691717 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
@@ -181,19 +181,19 @@ export default function StepUp(props) {
       modules.forEach((module) => {
         if (!module.circuit || !module.pcsItemId) return
 
-        if (!pcsSummary[module.pcsItemId]) {
-          pcsSummary[module.pcsItemId] = {
+        if (!pcsSummary[module.circuit.circuitInfo.id]) {
+          pcsSummary[module.circuit.circuitInfo.id] = {
             circuits: {},
             totalModules: 0,
           }
         }
 
         const circuitNumber = module.circuitNumber
-        if (!pcsSummary[module.pcsItemId].circuits[circuitNumber]) {
-          pcsSummary[module.pcsItemId].circuits[circuitNumber] = 0
+        if (!pcsSummary[module.circuit.circuitInfo.id].circuits[circuitNumber]) {
+          pcsSummary[module.circuit.circuitInfo.id].circuits[circuitNumber] = 0
         }
-        pcsSummary[module.pcsItemId].circuits[circuitNumber]++
-        pcsSummary[module.pcsItemId].totalModules++
+        pcsSummary[module.circuit.circuitInfo.id].circuits[circuitNumber]++
+        pcsSummary[module.circuit.circuitInfo.id].totalModules++
       })
 
       const params = {
@@ -205,8 +205,8 @@ export default function StepUp(props) {
       getPcsConnOptionItemList(params).then((res) => {
         if (res?.result.code === 200 && res?.data) {
           /** PCS 아이템 리스트에 serQtyList 추가 */
-          const pcsItemListWithSerQty = res.data.pcsItemList.map((pcsItem) => {
-            const pcsData = pcsSummary[pcsItem.itemId] || { circuits: {}, totalModules: 0 }
+          const pcsItemListWithSerQty = res.data.pcsItemList.map((pcsItem, index) => {
+            const pcsData = pcsSummary[selectedModels[index].id] || { circuits: {}, totalModules: 0 }
             const circuitCounts = Object.values(pcsData.circuits)
             return {
               ...pcsItem,