diff --git a/src/components/floor-plan/modal/basic/step/Trestle.jsx b/src/components/floor-plan/modal/basic/step/Trestle.jsx
index 08bed95b..13f46a31 100644
--- a/src/components/floor-plan/modal/basic/step/Trestle.jsx
+++ b/src/components/floor-plan/modal/basic/step/Trestle.jsx
@@ -76,15 +76,10 @@ const Trestle = forwardRef((props, ref) => {
     }
     if (selectedRoof && selectedRoof.lenAuth === "C") {
       onChangeLength(selectedRoof.length);
-    }
-    if (selectedRoof && ["C", "R"].includes(selectedRoof.raftAuth) && roofs && roofs.length > 0) {
+    }else if (selectedRoof && ["C", "R"].includes(selectedRoof.raftAuth) && roofs && roofs.length > 0) {
       onChangeRaftBase(roofs[0]);
-    }
-
-    if (
-      selectedRoof && ["C", "R"].includes(selectedRoof.roofPchAuth) && roofs && roofs.length > 0 &&
-      roofs[0].hajebichi !== prevHajebichiRef.current
-    ) {
+    }else if (selectedRoof && ["C", "R"].includes(selectedRoof.roofPchAuth) && roofs && roofs.length > 0 &&
+      roofs[0].hajebichi !== prevHajebichiRef.current ) {
       prevHajebichiRef.current = roofs[0].hajebichi;
       onChangeHajebichi(roofs[0].hajebichi);
     }
@@ -289,7 +284,7 @@ const Trestle = forwardRef((props, ref) => {
       roof: {
         moduleTpCd: selectedModules.itemTp ?? '',
         roofMatlCd: selectedRoof?.roofMatlCd ?? '',
-        raft: selectedRaftBase?.clCode,
+        raft: selectedRaftBase?.clCode ?? selectedRoof?.roofBaseCd,
         hajebichi: e,
       },
     })
@@ -312,7 +307,8 @@ const Trestle = forwardRef((props, ref) => {
       roof: {
         moduleTpCd: selectedModules.itemTp ?? '',
         roofMatlCd: selectedRoof?.roofMatlCd ?? '',
-        raft: selectedRaftBase?.clCode,
+        raft: selectedRaftBase?.clCode ?? selectedRoof?.roofBaseCd,
+        //hajebichi: selectedRaftBase?.hajebichi ?? selectedRoof?.hajebichi,
         trestleMkrCd: e.trestleMkrCd,
       },
     })
@@ -334,7 +330,8 @@ const Trestle = forwardRef((props, ref) => {
       roof: {
         moduleTpCd: selectedModules.itemTp ?? '',
         roofMatlCd: selectedRoof?.roofMatlCd ?? '',
-        raft: selectedRaftBase?.clCode,
+        raft: selectedRaftBase?.clCode ?? selectedRoof?.roofBaseCd,
+        //hajebichi: selectedRaftBase?.hajebichi ?? selectedRoof?.hajebichi,
         trestleMkrCd: selectedTrestle?.trestleMkrCd,
         constMthdCd: e.constMthdCd,
       },
@@ -366,7 +363,8 @@ const Trestle = forwardRef((props, ref) => {
       roof: {
         moduleTpCd: selectedModules.itemTp ?? '',
         roofMatlCd: selectedRoof?.roofMatlCd ?? '',
-        raft: selectedRaftBase?.clCode,
+        raft: selectedRaftBase?.clCode ?? selectedRoof?.roofBaseCd,
+        //hajebichi: selectedRaftBase?.hajebichi ?? selectedRoof?.hajebichi,
         trestleMkrCd: selectedTrestle?.trestleMkrCd,
         constMthdCd: selectedConstMthd?.constMthdCd,
         roofBaseCd: e.roofBaseCd,
@@ -392,7 +390,8 @@ const Trestle = forwardRef((props, ref) => {
         roof: {
           moduleTpCd: selectedModules.itemTp ?? '',
           roofMatlCd: selectedRoof?.roofMatlCd ?? '',
-          raft: selectedRaftBase?.clCode,
+          raft: selectedRaftBase?.clCode ?? selectedRoof?.roofBaseCd,
+          //hajebichi: selectedRaftBase?.hajebichi ?? selectedRoof?.hajebichi,
           trestleMkrCd: selectedTrestle.trestleMkrCd,
           constMthdCd: selectedConstMthd.constMthdCd,
           roofBaseCd: selectedRoofBase.roofBaseCd,
@@ -429,7 +428,7 @@ const Trestle = forwardRef((props, ref) => {
           ridgeMargin,
           kerabaMargin,
           roofIndex: selectedRoof.index,
-          raft: selectedRaftBase?.clCode,
+          raft: selectedRaftBase?.clCode ?? selectedRoof?.roofBaseCd,
           trestle: {
             hajebichi: hajebichi,
             length: lengthBase,
@@ -466,8 +465,8 @@ const Trestle = forwardRef((props, ref) => {
           ridgeMargin,
           kerabaMargin,
           roofIndex: roof.index,
-          raft: selectedRaftBase?.clCode,
-          hajebichi: hajebichi,
+          raft: selectedRaftBase?.clCode ?? selectedRoof?.raft ?? '',
+          //hajebichi: selectedRaftBase?.hajebichi ?? selectedRoof?.hajebichi ?? 0,
           trestle: {
             length: lengthBase,
             hajebichi: hajebichi,
@@ -552,7 +551,7 @@ const Trestle = forwardRef((props, ref) => {
       }
 
       if (['C', 'R'].includes(roof.roofPchAuth)) {
-        if (!roof?.roofPchBase) {
+        if (!roof?.hajebichi) {
           Swal.fire({
             title: getMessage('modal.module.basic.settting.module.error7', [roof.nameJp]), // 하제비치를 입력해주세요.
             icon: 'warning',