Merge remote-tracking branch 'origin/qcast-pub' into dev

2025-03-14 13:00:25 +09:00 · 2025-03-14 13:00:25 +09:00 · b9f4cf69a4
commit b9f4cf69a4
parent e3f97d20fb 7b8927c7cc
1 changed files with 5 additions and 0 deletions
--- a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx
@ -160,6 +160,11 @@ export default function PowerConditionalSelect(props) {

      return
    }
+
+    if (selectedModels.find((m) => m.pcsSerParallelYn === 'Y') && selectedRow.pcsSerParallelYn === 'Y') {
+      return
+    }
+
    if (selectedMaker.pcsMkrMultiType === PCS_MKR_MULTI_TYPE.MULTI) {
      setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4() }])
    } else if (!selectedModels.find((m) => m.itemId === selectedRow.itemId)) {