diff --git a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx
index 407c5e34..5496a0d5 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx
@@ -38,7 +38,7 @@ export default function PowerConditionalSelect(props) {
const { swalFire } = useSwal()
const modelHeader = [
{ name: getMessage('시리즈'), width: '15%', prop: 'pcsSerNm', type: 'color-box' },
- { name: getMessage('명칭'), width: '15%', prop: 'itemNm', type: 'color-box' },
+ { name: getMessage('명칭'), width: '15%', prop: 'goodsNo', type: 'color-box' },
{
name: `${getMessage('modal.circuit.trestle.setting.power.conditional.select.rated.output')} (kW)`,
width: '10%',
@@ -240,7 +240,7 @@ export default function PowerConditionalSelect(props) {
{selectedModels?.map((model) => (
- {model.itemNm}
+ {model.goodsNo}
))}
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 ded6c61f..7cbca2da 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
@@ -14,6 +14,7 @@ export default function PassivityCircuitAllocation(props) {
tabNum,
setTabNum,
selectedModels,
+ setSelectedModels,
getOptYn: getApiProps,
getUseModuleItemList: getSelectedModuleList,
getSelectModelList: getSelectModelList,
@@ -201,6 +202,7 @@ export default function PassivityCircuitAllocation(props) {
}
}
+ let tempSelectedPcs = { ...selectedPcs }
canvas.discardActiveObject()
canvas
.getObjects()
@@ -229,6 +231,8 @@ export default function PassivityCircuitAllocation(props) {
obj.pcsItemId = selectedPcs.itemId
obj.circuit = moduleCircuitText
obj.circuitNumber = getCircuitNumber()
+ tempSelectedPcs.used = true
+ setSelectedPcs(tempSelectedPcs)
canvas.add(moduleCircuitText)
})
@@ -249,25 +253,47 @@ export default function PassivityCircuitAllocation(props) {
}),
}
})
+
console.log('uniqueCircuitNumbers', uniqueCircuitNumbers)
- const pcsItemList = selectedModels.map((model, index) => {
- return {
- pcsMkrCd: model.pcsMkrCd,
- pcsSerCd: model.pcsSerCd,
- itemId: model.itemId,
- itemNm: model.itemNm,
- goodsNo: model.goodsNo,
- serQtyList: [
- {
- serQty: targetModules.length,
- paralQty: uniqueCircuitNumbers.length,
- rmdYn: 'Y',
- usePossYn: 'Y',
- roofSurfaceList: roofSurfaceList,
- },
- ],
- }
- })
+ const usedPcses = selectedModels.filter((model) => model.isUsed)
+ const pcsItemList =
+ usedPcses.length === 0
+ ? [
+ {
+ pcsMkrCd: selectedPcs.pcsMkrCd,
+ pcsSerCd: selectedPcs.pcsSerCd,
+ itemId: selectedPcs.itemId,
+ itemNm: selectedPcs.itemNm,
+ goodsNo: selectedPcs.goodsNo,
+ serQtyList: [
+ {
+ serQty: targetModules.length,
+ paralQty: uniqueCircuitNumbers.length,
+ rmdYn: 'Y',
+ usePossYn: 'Y',
+ roofSurfaceList: roofSurfaceList,
+ },
+ ],
+ },
+ ]
+ : selectedModels.map((model, index) => {
+ return {
+ pcsMkrCd: model.pcsMkrCd,
+ pcsSerCd: model.pcsSerCd,
+ itemId: model.itemId,
+ itemNm: model.itemNm,
+ goodsNo: model.goodsNo,
+ serQtyList: [
+ {
+ serQty: targetModules.length,
+ paralQty: uniqueCircuitNumbers.length,
+ rmdYn: 'Y',
+ usePossYn: 'Y',
+ roofSurfaceList: roofSurfaceList,
+ },
+ ],
+ }
+ })
const params = {
...getApiProps(),
@@ -276,6 +302,7 @@ export default function PassivityCircuitAllocation(props) {
}
getPcsManualConfChk(params).then((res) => {
+ console.log('targetModules', targetModules)
if (res.resultCode === 'E') {
swalFire({
text: res.resultMsg,
@@ -295,10 +322,17 @@ export default function PassivityCircuitAllocation(props) {
canvas.renderAll()
},
})
-
+ setSelectedPcs({ ...selectedPcs, used: false })
+ setTargetModules([])
return
}
+ setSelectedModels(
+ selectedModels.map((model) => {
+ return { ...model, isUsed: model.id === selectedPcs.id ? true : model.isUsed }
+ }),
+ )
+
setTargetModules([])
setCircuitNumber(+circuitNumber + 1)
setTableData()
@@ -512,7 +546,7 @@ export default function PassivityCircuitAllocation(props) {
onChange={() => setSelectedPcs(model)}
/>