From 3a3afe9b3bf978b7e3baf478a0ba6820ee84f78c Mon Sep 17 00:00:00 2001
From: "hyojun.choi" <chlgkwk123@nate.com>
Date: Thu, 8 Jan 2026 10:26:24 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=A4=EB=82=B4=EC=A7=91=EC=A4=91=ED=98=95?=
 =?UTF-8?q?=20=EB=B6=81=EB=A9=B4=EB=AA=A8=EB=93=88=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../step/type/PassivityCircuitAllocation.jsx  | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
index a25a1a37..b3c38c8e 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
@@ -123,10 +123,14 @@ export default function PassivityCircuitAllocation(props) {
     }
 
     // targetModule중 북면 설치 여부가 Y인 것과 N인 것이 혼합이면 안됨.
-    const targetModuleGroup = [...new Set(canvas
-      .getObjects()
-      .filter((obj) => obj.name === POLYGON_TYPE.MODULE && targetModules.includes(obj.id))
-      .map((obj) => obj.moduleInfo.northModuleYn))]
+    const targetModuleGroup = [
+      ...new Set(
+        canvas
+          .getObjects()
+          .filter((obj) => obj.name === POLYGON_TYPE.MODULE && targetModules.includes(obj.id))
+          .map((obj) => obj.moduleInfo.northModuleYn),
+      ),
+    ]
 
     if (targetModuleGroup.length > 1) {
       swalFire({
@@ -142,16 +146,12 @@ export default function PassivityCircuitAllocation(props) {
         const originHaveThisPcsModules = canvas
           .getObjects()
           .filter((obj) => obj.name === POLYGON_TYPE.MODULE && obj.pcs && obj.pcs.id === selectedPcs.id)
-        // 이미 해당 pcs로 설치된 모듈의 surface의 방향을 구한다.
-        const originSurfaceList = canvas
-          .getObjects()
-          .filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE && originHaveThisPcsModules.map((obj) => obj.surfaceId).includes(obj.id))
+        // 1. 북면모듈, 북면외모듈 혼합 여부 체크
+        const targetModuleInfos = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE && targetModules.includes(obj.id))
+        debugger
+        const newTargetModuleGroup = [...new Set(targetModuleInfos.concat(originHaveThisPcsModules).map((obj) => obj.moduleInfo.northModuleYn))]
 
-        originSurfaceList.concat(originSurfaceList).forEach((surface) => {
-          surfaceType[`${surface.direction}-${surface.roofMaterial.pitch}`] = surface
-        })
-
-        if (Object.keys(surfaceType).length > 1) {
+        if (newTargetModuleGroup.length > 1) {
           swalFire({
             text: getMessage('module.circuit.fix.not.same.roof.error'),
             type: 'alert',
@@ -234,7 +234,6 @@ export default function PassivityCircuitAllocation(props) {
         setSelectedPcs(tempSelectedPcs)
         canvas.add(moduleCircuitText)
       })
-    
 
     const roofSurfaceList = canvas
       .getObjects()