diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index aa52d6f5..a74abbdf 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -609,6 +609,7 @@ export default function CircuitTrestleSetting({ id }) { itemId: item.itemId, pcsMkrCd: item.pcsMkrCd, pcsSerCd: item.pcsSerCd, + pcsSerParallelYn: item.pcsSerParallelYn, } }), } @@ -845,7 +846,6 @@ export default function CircuitTrestleSetting({ id }) { }) const pcs = [] - console.log(stepUpListData) stepUpListData[0].pcsItemList.map((item, index) => { const targetTpCds = pcsModuleTpCds[selectedModels[index]?.id] return item.serQtyList @@ -892,9 +892,6 @@ export default function CircuitTrestleSetting({ id }) { } const getPcsOptCd = (index) => { - console.log(selectedModels) - console.log(seletedMainOption) - console.log(seletedSubOption) if (selectedModels.some((model) => model.pcsSerParallelYn === 'Y')) { if (selectedModels.length > 1) { if (index === 0) { @@ -993,6 +990,7 @@ export default function CircuitTrestleSetting({ id }) { itemId: model.itemId, itemNm: model.itemNm, goodsNo: model.goodsNo, + pcsSerParallelYn: model.pcsSerParallelYn, serQtyList: [ { serQty: result[(index + 1).toString()] ? result[(index + 1).toString()].maxValue : 0, 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 dc85d1c6..71f2ce17 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx @@ -340,6 +340,7 @@ export default function PassivityCircuitAllocation(props) { itemId: model.itemId, itemNm: model.itemNm, goodsNo: model.goodsNo, + pcsSerParallelYn: model.pcsSerParallelYn, serQtyList: [ { serQty: result[(index + 1).toString()] ? result[(index + 1).toString()].maxValue : 0, @@ -565,6 +566,7 @@ export default function PassivityCircuitAllocation(props) { itemId: model.itemId, itemNm: model.itemNm, goodsNo: model.goodsNo, + pcsSerParallelYn: model.pcsSerParallelYn, serQtyList: [ { serQty: targetModules.length, diff --git a/src/hooks/useCirCuitTrestle.js b/src/hooks/useCirCuitTrestle.js index 5bfab3ce..14901434 100644 --- a/src/hooks/useCirCuitTrestle.js +++ b/src/hooks/useCirCuitTrestle.js @@ -51,6 +51,7 @@ export function useCircuitTrestle(executeEffect = false) { itemId: model.itemId, pcsMkrCd: model.pcsMkrCd, pcsSerCd: model.pcsSerCd, + pcsSerParallelYn: model.pcsSerParallelYn, } }) } @@ -59,6 +60,7 @@ export function useCircuitTrestle(executeEffect = false) { itemId: model.itemId, pcsMkrCd: model.pcsMkrCd, pcsSerCd: model.pcsSerCd, + pcsSerParallelYn: model.pcsSerParallelYn, } }) } @@ -73,6 +75,7 @@ export function useCircuitTrestle(executeEffect = false) { itemId: model.itemId, pcsMkrCd: model.pcsMkrCd, pcsSerCd: model.pcsSerCd, + pcsSerParallelYn: model.pcsSerParallelYn, } }) } @@ -81,6 +84,7 @@ export function useCircuitTrestle(executeEffect = false) { itemId: model.itemId, pcsMkrCd: model.pcsMkrCd, pcsSerCd: model.pcsSerCd, + pcsSerParallelYn: model.pcsSerParallelYn, } }) } @@ -109,13 +113,11 @@ export function useCircuitTrestle(executeEffect = false) { const result = roofSurfaceList .map((obj) => { + const parent = canvas.getObjects().filter((o) => o.id === obj.parentId)[0] return { roofSurfaceId: obj.id, - roofSurface: canvas - .getObjects() - .filter((o) => o.id === obj.parentId)[0] - .directionText.replace(/[0-9]/g, ''), - roofSurfaceIncl: +canvas.getObjects().filter((o) => o.id === obj.parentId)[0].roofMaterial.pitch, + roofSurface: (parent?.directionText ?? '').replace(/[0-9]/g, ''), + roofSurfaceIncl: +(parent?.roofMaterial?.pitch ?? 0), moduleList: getModuleList(obj).map((module) => { return { itemId: module.moduleInfo.itemId,