From 477056d1bdaf7685d9f5abfdb8cca6d49829dd7a Mon Sep 17 00:00:00 2001
From: "LAPTOP-L3VE7KK2\\USER" <jungpyo2001@interplug.co.kr>
Date: Wed, 5 Mar 2025 15:00:00 +0900
Subject: [PATCH] =?UTF-8?q?PCS=20=ED=9A=8C=EB=A1=9C=EA=B5=AC=EC=84=B1=20?=
 =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qcast/biz/estimate/EstimateService.java    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
index bc0b8fc3..d28f4c59 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
@@ -693,7 +693,9 @@ public class EstimateService {
           circuitItemRequest.setObjectNo(estimateRequest.getObjectNo());
           circuitItemRequest.setPlanNo(estimateRequest.getPlanNo());
 
-          estimateMapper.insertEstimateCircuitItem(circuitItemRequest);
+          if (!StringUtils.isEmpty(circuitItemRequest.getCircuitCfg())) {
+            estimateMapper.insertEstimateCircuitItem(circuitItemRequest);
+          }
         }
 
         // 견적서 도면 아이템 제거
@@ -2272,18 +2274,26 @@ public class EstimateService {
       List<ItemRequest> pcsItemList, List<ItemRequest> moduleList) {
 
     if (pcsItemList != null && pcsItemList.size() > 0) {
+
+      for (ItemRequest itemRequest : moduleList) {
+        itemRequest.setCircuit(
+            itemRequest.getCircuit().replaceAll("\\(", "").replaceAll("\\)", ""));
+      }
+
       if (pcsItemList.size() == 1) {
         pcsItemList.get(0).setCircuitCfg(this.getPcsCircuitCtg(moduleList));
       } else {
         if (moduleList != null && moduleList.size() > 0) {
+          int j = 1;
           for (ItemRequest data : pcsItemList) {
-            String val = data.getItemId();
+            String val = String.valueOf(j);
 
             List<ItemRequest> resultList =
                 moduleList.stream()
-                    .filter(t -> StringUtils.equals(val, t.getPcItemId()))
+                    .filter(t -> StringUtils.equals(val, t.getCircuit().split("-")[0]))
                     .collect(Collectors.toList());
             data.setCircuitCfg(this.getPcsCircuitCtg(resultList));
+            j++;
           }
         }
       }
@@ -2306,7 +2316,7 @@ public class EstimateService {
       // ArrayList 생성 변환
       ArrayList<String> list = new ArrayList<String>();
       for (ItemRequest pcsSerItemReq : circuitList) {
-        list.add(pcsSerItemReq.getCircuit().replaceAll("\\(", "").replaceAll("\\)", ""));
+        list.add(pcsSerItemReq.getCircuit());
       }
 
       // ArrayList 회로 중복수 오름차순 정렬