Merge pull request 'feature/ysCha' (#117) from feature/ysCha into dev

Reviewed-on: #117

src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx

@@ -16,7 +16,7 @@ import { useSwal } from '@/hooks/useSwal'
 import { canvasState, canvasZoomState } from '@/store/canvasAtom'
 
 import { useTrestle } from '@/hooks/module/useTrestle'
-import { selectedModuleState } from '@/store/selectedModuleOptions'
+import { moduleSelectionDataState, selectedModuleState } from '@/store/selectedModuleOptions'
 import { v4 as uuidv4 } from 'uuid'
 
 import { useEstimate } from '@/hooks/useEstimate'
@@ -60,7 +60,7 @@ export default function CircuitTrestleSetting({ id }) {
   const [seletedSubOption, setSeletedSubOption] = useState(null)
   const { setModuleStatisticsData } = useCircuitTrestle()
   const { handleCanvasToPng } = useImgLoader()
-
+  const moduleSelectionData = useRecoilValue(moduleSelectionDataState)
   const passivityCircuitAllocationRef = useRef()
   const { setIsGlobalLoading } = useContext(QcastContext)
 
@@ -340,8 +340,15 @@ export default function CircuitTrestleSetting({ id }) {
 
       const target = pcsCheck.max ? moduleMaxQty : moduleStdQty
       const placementModules = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE)
+      let moduleAmount = placementModules.reduce((acc, module) => {
+        if (moduleSelectionData.module.itemList.length === 1 || module.moduleInfo.itemId === moduleSelectionData.module.itemList[0].itemId) {
+          return acc + 1
+        } else {
+          return acc + 0.66
+        }
+      }, 0)
 
-      if (placementModules.length > target) {
+      if (moduleAmount > target) {
         swalFire({
           title: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.validation.error01'),
           type: 'alert',

src/components/management/StuffDetail.jsx

@@ -952,9 +952,18 @@ export default function StuffDetail() {
 
   //팝업에서 넘어온 우편정보
   const setZipInfo = (info) => {
-    setPrefValue(info.prefId)
+
-    form.setValue('prefId', info.prefId)
+    prefCodeList.map((row) => {
-    form.setValue('prefName', info.address1)
+      if (row.prefName == info.address1) {
+        setPrefValue(row.prefId)
+        form.setValue('prefId', row.prefId)
+        form.setValue('prefName', info.address1)
+      }
+    })
+
+    //setPrefValue(info.prefId)
+   // form.setValue('prefId', info.prefId)
+   // form.setValue('prefName', info.address1)
     form.setValue('address', info.address2 + info.address3)
     form.setValue('zipNo', info.zipNo)
   }