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 e632882b..c3474865 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
@@ -148,6 +148,7 @@ export default function PassivityCircuitAllocation(props) {
           strokeWidth: 0.3,
         })
         obj.pcsItemId = selectedPcs.itemId
+        obj.pcsItemCode = selectedPcs.id
         obj.circuit = moduleCircuitText
         obj.circuitNumber = getCircuitNumber()
         tempSelectedPcs.used = true
@@ -207,7 +208,7 @@ export default function PassivityCircuitAllocation(props) {
     }
 
     getPcsManualConfChk(params).then((res) => {
-      if (res.resultCode === 'E') {
+      if (res?.resultCode === 'E') {
         swalFire({
           text: res.resultMsg,
           type: 'alert',
@@ -254,11 +255,18 @@ export default function PassivityCircuitAllocation(props) {
       icon: 'warning',
       confirmFn: () => {
         const circuitModules = canvas.getObjects().filter((obj) => obj.name === 'module' && obj.circuit?.circuitInfo?.id === selectedPcs.id)
+        const circuitNumbers = circuitModules.map((obj) => {
+          const circuitNumber = obj.circuitNumber.replace(/[()]/g, '').split('-')
+          return parseInt(circuitNumber[circuitNumber.length - 1])
+        })
+        const minCircuitNumber = Math.min(...circuitNumbers)
+        console.log(circuitNumbers, minCircuitNumber)
         canvas.remove(...circuitModules.map((module) => module.circuit))
         circuitModules.forEach((obj) => {
           obj.circuit = null
           obj.pcsItemId = null
         })
+        setCircuitNumber(minCircuitNumber)
         setTargetModules([])
 
         canvas.renderAll()