From 4ff5ceb2b7849dbbb79e624f7f70a6c8cb46621d Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Thu, 23 Jan 2025 19:09:01 +0900 Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EB=A1=9C=EB=B0=8F=EA=B0=80=EB=8C=80?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=8A=B9=EC=95=95=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../circuitTrestle/CircuitTrestleSetting.jsx | 26 ++-- .../modal/circuitTrestle/step/StepUp.jsx | 129 +++++++----------- src/hooks/common/useMasterController.js | 64 ++------- 3 files changed, 70 insertions(+), 149 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index 2881ec2c..51ca0318 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -82,13 +82,11 @@ export default function CircuitTrestleSetting({ id }) { return } - console.log('πŸš€ ~ onAutoRecommend ~ selectedModules:', selectedModules) - const params = { - ...getApiProps(), - useModuleItemList: getSelectedModuleList(), + ...getOptYn(), + useModuleItemList: getUseModuleItemList(), roofSurfaceList: getRoofSurfaceList(), - pcsItemList: getModelList(), + pcsItemList: getPcsItemList(), } getPcsAutoRecommendList(params).then((res) => { @@ -104,7 +102,7 @@ export default function CircuitTrestleSetting({ id }) { }) } - const getApiProps = () => { + const getOptYn = () => { return { maxConnYn: pcsCheck.max ? 'Y' : 'N', smpCirYn: pcsCheck.division ? 'Y' : 'N', @@ -112,7 +110,7 @@ export default function CircuitTrestleSetting({ id }) { } } - const getModelList = () => { + const getPcsItemList = () => { return models.map((model) => { return { itemId: model.itemId, @@ -122,11 +120,11 @@ export default function CircuitTrestleSetting({ id }) { }) } - const getSelectedModuleList = () => { + const getUseModuleItemList = () => { return selectedModules.itemList.map((m) => { return { itemId: m.itemId, - mixMatlNo: m.mixMatlNo, + //mixMatlNo: m.mixMatlNo, } }) } @@ -219,12 +217,14 @@ export default function CircuitTrestleSetting({ id }) { setModels, circuitAllocationType, setCircuitAllocationType, - getApiProps, - getSelectedModuleList, - getRoofSurfaceList, - getModelList, + getOptYn, // μ˜΅μ…˜ Y/N + getUseModuleItemList, // μ‚¬μš©λœ λͺ¨λ“ˆμ•„μ΄ν…œ List + getRoofSurfaceList, // 지뢕면 λͺ©λ‘ + getPcsItemList, // PCS μ•„μ΄ν…œ λͺ©λ‘ } + console.log('πŸš€ ~ stepUpProps ~ stepUpProps:', stepUpProps) + return (
diff --git a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx index 721e6dff..1d436a13 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx @@ -33,60 +33,23 @@ export default function StepUp(props) { useEffect(() => { console.log('πŸš€ ~ useEffect ~ >>>>>>>>>>>> props:', props) - if (!managementState) { - setManagementState(managementStateLoaded) - } - - const useModuleItemList = models - .filter((m) => m.selected) - .map((model) => { - return { itemId: model.itemId, mixMatlNo: model.mixMatlNo } - }) - // [{ roofSurfaceId: '', roofSurface: '', roofSurfaceIncl: '', moduleList: [{ itemId: '' }] }], - const roofSurfaceList = canvas - .getObjects() - .filter((obj) => ['roofSurface', 'moduleSetupSurface'].includes(obj.name)) - .map((obj) => { - return { - roofSurfaceId: obj.id, - roofSurface: obj.name, - roofSurfaceIncl: obj.angle, - moduleList: selectedModules.itemList?.map((module) => { - return { - itemId: module.itemId, - mixMatlNo: module.mixMatlNo, - } - }), - } - }) - // [{ itemId: '', pcsMkrCd: '', pcsSerCd: '' }], - const pscItemList = models - .filter((m) => m.selected) - .map((model) => { - return { - itemId: model.itemId, - pcsMkrCd: model.pcsMkrCd, - pcsSerCd: model.pcsSerCd, - } - }) - - const params = { - maxConnYn: pcsCheck.max, - smpCirYn: pcsCheck.division, - coldZoneYn: managementState.coldRegionFlg, - useModuleItemList: useModuleItemList, - roofSurfaceList: roofSurfaceList, - pscItemList: pscItemList, - } - //getPcsVoltageStepUpList(null) - // PCS μŠΉμ••μ„€μ • 정보 쑰회 fetchStepUpData() }, []) const fetchStepUpData = async () => { try { - const res = await getPcsVoltageStepUpList() + const params = { + useYn: props.getOptYn(), // μ˜΅μ…˜ Y/N + useModuleItemList: props.getUseModuleItemList(), // μ‚¬μš©λœ λͺ¨λ“ˆμ•„μ΄ν…œ List + roofSurfaceList: props.getRoofSurfaceList(), // 지뢕면 λͺ©λ‘ + pcsItemList: props.getPcsItemList(), // PCS μ•„μ΄ν…œ λͺ©λ‘ + } + + console.log('πŸš€ ~ fetchStepUpData ~ params:', params) + + const res = await getPcsVoltageStepUpList(params) + console.log('πŸš€ ~ fetchStepUpData ~ res:', res) if (res?.result.code === 200 && res?.data) { const dataArray = Array.isArray(res.data) ? res.data : [res.data] const stepUpListData = formatStepUpListData(dataArray) @@ -104,16 +67,16 @@ export default function StepUp(props) { // PCS μ˜΅μ…˜ 쑰회 const formatOptionCodes = (optionList = []) => { - return optionList.map((opt) => ({ - code: opt.pcsOptCd, - name: opt.pcsOptNm, - nameJp: opt.pcsOptNmJp, + return optionList?.map((opt) => ({ + code: opt.pcsOptCd ? opt.pcsOptCd : '', + name: opt.pcsOptNm ? opt.pcsOptNm : '', + nameJp: opt.pcsOptNmJp ? opt.pcsOptNmJp : '', })) } // PCS μŠΉμ••μ„€μ • 정보 포맷 const formatStepUpListData = (dataArray = []) => { - return dataArray.map((stepUps) => ({ + return dataArray?.map((stepUps) => ({ ...stepUps, optionList: formatOptionList(stepUps.optionList), pcsItemList: formatPcsItemList(stepUps.pcsItemList), @@ -122,21 +85,21 @@ export default function StepUp(props) { // PCS μ˜΅μ…˜ 포맷 const formatOptionList = (optionList = []) => { - return optionList.map((option) => ({ - pcsOptCd: option.pcsOptCd, - pcsOptNm: option.pcsOptNm, - pcsOptNmJp: option.pcsOptNmJp, + return optionList?.map((option) => ({ + pcsOptCd: option.pcsOptCd ? option.pcsOptCd : '', + pcsOptNm: option.pcsOptNm ? option.pcsOptNm : '', + pcsOptNmJp: option.pcsOptNmJp ? option.pcsOptNmJp : '', })) } // PCS μ•„μ΄ν…œ 포맷 const formatPcsItemList = (pcsItemList = []) => { - return pcsItemList.map((item) => ({ - goodsNo: item.goodsNo, - itemId: item.itemId, - itemNm: item.itemNm, - pcsMkrCd: item.pcsMkrCd, - pcsSerCd: item.pcsSerCd, + return pcsItemList?.map((item) => ({ + goodsNo: item.goodsNo ? item.goodsNo : '', + itemId: item.itemId ? item.itemId : '', + itemNm: item.itemNm ? item.itemNm : '', + pcsMkrCd: item.pcsMkrCd ? item.pcsMkrCd : '', + pcsSerCd: item.pcsSerCd ? item.pcsSerCd : '', connList: formatConnList(item.connList), serQtyList: formatSerQtyList(item.serQtyList), })) @@ -144,21 +107,21 @@ export default function StepUp(props) { // PCS μ—°κ²° 포맷 const formatConnList = (connList = []) => { - return connList.map((conn) => ({ - connAllowCur: conn.connAllowCur, - connMaxParalCnt: conn.connMaxParalCnt, - goodsNo: conn.goodsNo, - itemId: conn.itemId, - itemNm: conn.itemNm, - vstuParalCnt: conn.vstuParalCnt, + return connList?.map((conn) => ({ + connAllowCur: conn.connAllowCur ? conn.connAllowCur : 0, + connMaxParalCnt: conn.connMaxParalCnt ? conn.connMaxParalCnt : 0, + goodsNo: conn.goodsNo ? conn.goodsNo : '', + itemId: conn.itemId ? conn.itemId : '', + itemNm: conn.itemNm ? conn.itemNm : '', + vstuParalCnt: conn.vstuParalCnt ? conn.vstuParalCnt : 0, })) } // PCS μ‹œλ¦¬μ¦ˆ 포맷 const formatSerQtyList = (serQtyList = []) => { - return serQtyList.map((qty) => ({ - serQty: qty.serQty, - paralQty: qty.paralQty, + return serQtyList?.map((qty) => ({ + serQty: qty.serQty ? qty.serQty : 0, + paralQty: qty.paralQty ? qty.paralQty : 0, })) } @@ -180,7 +143,9 @@ export default function StepUp(props) { {stepUp?.pcsItemList.map((_, idx) => (
-
{stepUp.pcsItemList[idx].goodsNo}
+
+ {stepUp.pcsItemList[idx].goodsNo} +
@@ -189,7 +154,7 @@ export default function StepUp(props) { - + {stepUp.pcsItemList[idx].serQtyList.map((item) => { return ( @@ -230,9 +195,9 @@ export default function StepUp(props) { - - - + + +
{getMessage('modal.circuit.trestle.setting.step.up.allocation.total.amount')}
{stepUp.pcsItemList[idx].connList[0].goodsNo}{stepUp.pcsItemList[idx].connList[0].connMaxParalCnt}{stepUp.pcsItemList[idx].connList[0].vstuParalCnt}{stepUp.pcsItemList[idx].connList?.goodsNo}{stepUp.pcsItemList[idx].connList?.connMaxParalCnt}{stepUp.pcsItemList[idx].connList?.vstuParalCnt}
@@ -245,8 +210,10 @@ export default function StepUp(props) { - - + {/* + */} + + @@ -273,7 +240,7 @@ export default function StepUp(props) { {optCodes.length > 0 && (
{/* */} - +
)} diff --git a/src/hooks/common/useMasterController.js b/src/hooks/common/useMasterController.js index e12ac4a5..c2cc65dc 100644 --- a/src/hooks/common/useMasterController.js +++ b/src/hooks/common/useMasterController.js @@ -187,63 +187,17 @@ export function useMasterController() { */ const getPcsVoltageStepUpList = async (params2 = null) => { const params = { - maxConnYn: 'N', - smpCirYn: 'Y', - coldZoneYn: 'N', - useModuleItemList: [{ itemId: '107077', mixMatlNo: '0' }], - roofSurfaceList: [ - { - roofSurfaceId: '1', - roofSurface: 'λ‚¨μ„œ', - roofSurfaceIncl: '5', - moduleList: [ - { itemId: '107077' }, - { itemId: '107077' }, - { itemId: '107077' }, - { itemId: '107077' }, - { itemId: '107077' }, - { itemId: '107077' }, - { itemId: '107077' }, - { itemId: '107077' }, - { itemId: '107077' }, - ], - }, - { - roofSurfaceId: '2', - roofSurface: 'λ‚¨μ„œ', - roofSurfaceIncl: '5', - moduleList: [ - { itemId: '107077' }, - { itemId: '107077' }, - { itemId: '107077' }, - { itemId: '107077' }, - { itemId: '107077' }, - { itemId: '107077' }, - ], - }, - { - roofSurfaceId: '3', - roofSurface: '남', - roofSurfaceIncl: '3', - moduleList: [ - { itemId: '107077' }, - { itemId: '107077' }, - { itemId: '107077' }, - { itemId: '107077' }, - { itemId: '107077' }, - { itemId: '107077' }, - { itemId: '107077' }, - { itemId: '107077' }, - { itemId: '107077' }, - ], - }, - ], - pcsItemList: [ - { itemId: '106857', pcsMkrCd: 'MKR001', pcsSerCd: 'SER001' }, - { itemId: '106856', pcsMkrCd: 'MKR001', pcsSerCd: 'SER001' }, - ], + ...params2, + maxConnYn: params2.useYn.maxConnYn, + smpCirYn: params2.useYn.smpCirYn, + coldZoneYn: params2.useYn.coldZoneYn, + useModuleItemList: params2.useModuleItemList, + roofSurfaceList: params2.roofSurfaceList, + pcsItemList: params2.pcsItemList, } + console.log('πŸš€ ~ getPcsVoltageStepUpList ~ params >>>>> :', params) + return await post({ url: '/api/v1/master/getPcsVoltageStepUpList', data: params }).then((res) => { console.log('πŸš€πŸš€ ~ getPcsVoltageStepUpList ~ res:', res) return res
εη§°ζ˜‡εœ§ε›žθ·―ζ•°εη§°ζ˜‡εœ§ε›žθ·―ζ•°{getMessage('modal.circuit.trestle.setting.power.conditional.select.name')}{getMessage('modal.circuit.trestle.setting.step.up.allocation.circuit.amount')}