회로및가대설정 승압설정 조회 수정
This commit is contained in:
changkyu choi
parent
910d5c5704
commit
4ff5ceb2b7
@ -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 (
|
||||
<WithDraggable isShow={true} pos={{ x: 50, y: 230 }}>
|
||||
<div className={`modal-pop-wrap l-2`}>
|
||||
|
||||
@ -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) => (
|
||||
<div key={idx} className="module-table-inner">
|
||||
<div className="mb-box">
|
||||
<div className="circuit-table-tit">{stepUp.pcsItemList[idx].goodsNo}</div>
|
||||
<div key={idx} className="circuit-table-tit">
|
||||
{stepUp.pcsItemList[idx].goodsNo}
|
||||
</div>
|
||||
<div className="roof-module-table overflow-y min">
|
||||
<table>
|
||||
<thead>
|
||||
@ -189,7 +154,7 @@ export default function StepUp(props) {
|
||||
<th>{getMessage('modal.circuit.trestle.setting.step.up.allocation.total.amount')}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody key={idx}>
|
||||
<tbody>
|
||||
{stepUp.pcsItemList[idx].serQtyList.map((item) => {
|
||||
return (
|
||||
<tr className="on">
|
||||
@ -230,9 +195,9 @@ export default function StepUp(props) {
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td className="al-c">{stepUp.pcsItemList[idx].connList[0].goodsNo}</td>
|
||||
<td className="al-r">{stepUp.pcsItemList[idx].connList[0].connMaxParalCnt}</td>
|
||||
<td className="al-r">{stepUp.pcsItemList[idx].connList[0].vstuParalCnt}</td>
|
||||
<td className="al-c">{stepUp.pcsItemList[idx].connList?.goodsNo}</td>
|
||||
<td className="al-r">{stepUp.pcsItemList[idx].connList?.connMaxParalCnt}</td>
|
||||
<td className="al-r">{stepUp.pcsItemList[idx].connList?.vstuParalCnt}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@ -245,8 +210,10 @@ export default function StepUp(props) {
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>名称</th>
|
||||
<th>昇圧回路数</th>
|
||||
{/* <th>名称</th>
|
||||
<th>昇圧回路数</th> */}
|
||||
<th>{getMessage('modal.circuit.trestle.setting.power.conditional.select.name')}</th>
|
||||
<th>{getMessage('modal.circuit.trestle.setting.step.up.allocation.circuit.amount')}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -273,7 +240,7 @@ export default function StepUp(props) {
|
||||
{optCodes.length > 0 && (
|
||||
<div className="grid-select mr10">
|
||||
{/* <QSelectBox title={'電力検出ユニット (モニター付き)'} /> */}
|
||||
<QSelectBox options={optCodes} title={optCodes[2].name} value={optCodes[0].name} sourceKey="code" targetKey="code" showKey="name" />
|
||||
<QSelectBox options={optCodes} title={optCodes[0].name} value={optCodes[0].name} sourceKey="code" targetKey="code" showKey="name" />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user