diff --git a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx index b7fd39b4..cf79634f 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx @@ -5,6 +5,7 @@ import { useMasterController } from '@/hooks/common/useMasterController' import { useMessage } from '@/hooks/useMessage' import { useSwal } from '@/hooks/useSwal' import { pcsCheckState } from '@/store/circuitTrestleAtom' +import { sessionStore } from '@/store/commonAtom' import { globalLocaleStore } from '@/store/localeAtom' import { moduleSelectionDataState, selectedModuleState } from '@/store/selectedModuleOptions' import { isNullOrUndefined } from '@/util/common-utils' @@ -38,6 +39,7 @@ export default function PowerConditionalSelect(props) { } = props const [pcsCheck, setPcsCheck] = useRecoilState(pcsCheckState) + const sessionState = useRecoilValue(sessionStore) const { getMessage } = useMessage() const [selectedRow, setSelectedRow] = useState(null) const globalLocale = useRecoilValue(globalLocaleStore) @@ -132,7 +134,7 @@ export default function PowerConditionalSelect(props) { mixMatlNo: item.mixMatlNo, } }) - getPcsModelList({ pcsMkrCd, pcsSerList, moduleItemList }).then((res) => { + getPcsModelList({ pcsMkrCd, pcsSerList, moduleItemList, storeId: sessionState.storeId }).then((res) => { if (res?.result.code === 200 && res?.data) { setModels( res.data.map((model) => { @@ -177,7 +179,7 @@ export default function PowerConditionalSelect(props) { if (selectedMaker.pcsMkrMultiType === PCS_MKR_MULTI_TYPE.MULTI) { setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4() }]) - } else if (!selectedModels.find((m) => m.itemId === selectedRow.itemId)) { + } else if (!selectedModels.find((m) => m.itemId === selectedRow.itemId && m.pcsSerCd === selectedRow.pcsSerCd)) { setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4() }]) } setSelectedRow(null)