Merge branch 'dev' of ssh://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev

src/components/estimate/Estimate.jsx

@@ -1188,7 +1188,7 @@ export default function Estimate({}) {
                         <input
                           type="text"
                           className="input-light"
-                          value={estimateContextState?.charger}
+                          value={estimateContextState?.charger || ''}
                           onBlur={handleBlurCharger}
                           onChange={handleBlurCharger}
                         />
@@ -1206,7 +1206,7 @@ export default function Estimate({}) {
                           <input
                             type="text"
                             className="input-light"
-                            value={estimateContextState?.objectName}
+                            value={estimateContextState?.objectName || ''}
                             onBlur={handleBlurObjectName}
                             onChange={handleBlurObjectName}
                           />
@@ -1297,13 +1297,13 @@ export default function Estimate({}) {
                         //사양시공
                         let constructSpecificationMulti = estimateContextState?.constructSpecificationMulti?.split('、')
                         return (
-                          <div className={`form-flex-wrap ${style}`} key={`roof_${row}`}>
+                          <div className={`form-flex-wrap ${style}`} key={`roof_${index}_${row}`}>
                             <div className="input-wrap mr5" style={{ width: '610px' }}>
-                              <input type="text" className="input-light" value={roofList} readOnly />
+                              <input type="text" className="input-light" value={roofList || ''} readOnly />
                             </div>
                             {constructSpecificationMulti ? (
                               <div className="input-wrap" style={{ width: '200px' }}>
-                                <input type="text" className="input-light" value={constructSpecificationMulti[index]} readOnly />
+                                <input type="text" className="input-light" value={constructSpecificationMulti[index] || ''} readOnly />
                               </div>
                             ) : null}
                           </div>
@@ -1316,7 +1316,6 @@ export default function Estimate({}) {
                     <th>{getMessage('estimate.detail.remarks')}</th>
                     <td colSpan={3}>
                       <div className="input-wrap">
-                        {/* <input type="text" className="input-light" defaultValue={estimateContextState?.remarks || ''} onBlur={handleBlurRemarks} /> */}
                         <input
                           type="text"
                           className="input-light"

src/components/floor-plan/CanvasMenu.jsx

@@ -112,7 +112,7 @@ export default function CanvasMenu(props) {
 
     const params = {
       objectNo: objectNo,
-      planNo: pid,
+      planNo: selectedPlan.planNo,
       schDownload: donwloadType,
       schDrawingFlg: drawingFlg,
       pwrGnrSimType: pwrGnrSimTypeRecoil.type,

src/components/simulator/Simulator.jsx

@@ -176,7 +176,6 @@ export default function Simulator() {
   const [content, setContent] = useState('')
 
   const fetchSimulatorNotice = async () => {
-    setIsGlobalLoading(true)
     get({ url: '/api/pwrGnrSimulation/guideInfo' }).then((res) => {
       if (res.data) {
         setContent(res.data.replaceAll('\n', '<br/>'))
@@ -184,7 +183,6 @@ export default function Simulator() {
         setContent(getMessage('common.message.no.data'))
       }
     })
-    setIsGlobalLoading(false)
   }
 
   // 차트 데이터 변경 시, list type 셋팅

src/hooks/module/useTrestle.js

@@ -52,7 +52,7 @@ export const useTrestle = () => {
         let { rackQty, rackIntvlPct, rackYn, cvrPlvrYn } = surface.trestleDetail
 
         if (!rack) {
-          //25/01/16 기준 랙이 없는 경우는 그냥 안그려준다.
+          //25/02/06 가대없음의 경우 랙정보가 없음
           return
         }
 
@@ -105,8 +105,6 @@ export const useTrestle = () => {
           leftExposedHalfTopModules.length > 0 ||
           rightExposedHalfTopPoints.length > 0
 
-        console.log('isChidory', isChidory)
-
         if (plvrYn === 'N' && isChidory) {
           alert('치조불가공법입니다.')
           clear()
@@ -619,7 +617,21 @@ export const useTrestle = () => {
         }
       }
     })
-    const params = { trestles: surfaces.map((surface) => surface.quotationParam), pcses }
+
+    const allModules = surfaces.map((surface) => surface.modules).flat()
+    // 모듈 파라미터 생성
+    const modules = getModulesParam(allModules)
+    const trestles = []
+    //가대 파라미터 생성
+    surfaces.forEach((surface) => {
+      if (surface.quotationParam) {
+        trestles.push(surface.quotationParam)
+      }
+    })
+
+    // trestles 배열에서 null인 경우 제거
+    const params = { trestles, pcses, modules }
+
     //견적서 itemList 조회
     const { data: itemList, data2, result } = await getQuotationItem(params)
 
@@ -1883,7 +1895,7 @@ export const useTrestle = () => {
       cvrYn: moduleSelection.construction.setupCover ? 'Y' : 'N',
       snowGdYn: moduleSelection.construction.setupSnowCover ? 'Y' : 'N',
       plvrYn: cvrPlvrYn,
-      modules: getModules(surface),
+      // modules: getModules(surface), // 2025-02-06 api 수정
       trestleMkrCd,
       constMthdCd,
       roofBaseCd,
@@ -1895,10 +1907,9 @@ export const useTrestle = () => {
     }
   }
 
-  const getModules = (surface) => {
-    const { modules } = surface
-
-    const params = modules.map((module, index) => {
+  // 전체 모듈 파라미터 생성
+  const getModulesParam = (allModules) => {
+    const params = allModules.map((module, index) => {
       return {
         moduleTpCd: module.moduleInfo.itemTp,
         moduleItemId: module.moduleInfo.itemId,