From 923dbf14bbf9557f980b36e27642936fde68f2a9 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Thu, 6 Feb 2025 11:08:03 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=ED=85=9C=EC=A1=B0=ED=9A=8C=20=ED=8C=8C=EB=9D=BC?= =?UTF-8?q?=EB=AF=B8=ED=84=B0=20=EB=82=B4=EC=9A=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/module/useTrestle.js | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js index 2df04fdc..916e28d7 100644 --- a/src/hooks/module/useTrestle.js +++ b/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,