From b92709b13d13c0a25be363ae8f7c301294c6b9b9 Mon Sep 17 00:00:00 2001 From: cha Date: Tue, 15 Jul 2025 15:53:36 +0900 Subject: [PATCH] =?UTF-8?q?[1155]=20Excel=EC=97=90=20=EC=B6=9C=EB=A0=A5?= =?UTF-8?q?=EB=90=98=EB=8A=94=20=EC=84=A4=EB=B9=84=20=EC=9A=A9=EB=9F=89(?= =?UTF-8?q?=EC=9D=B8=EC=A0=95=20=EC=9A=A9=EB=9F=89)=EC=9D=B4=20=EB=8B=A4?= =?UTF-8?q?=EB=A6=85=EB=8B=88=EB=8B=A4=20-=20=EC=A0=80=EC=9E=A5=20?= =?UTF-8?q?=EB=B0=8F=20=EC=B6=9C=EB=A0=A5=EB=B6=80=EB=B6=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/interplug/qcast/biz/estimate/EstimateService.java | 8 +++++++- src/main/resources/mappers/estimate/estimateMapper.xml | 2 +- 2 files changed, 8 insertions(+), 2 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 b1e06fd0..7bbe4535 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -457,7 +457,6 @@ public class EstimateService { itemRequest.setItemCtgGr(itemResponse.getItemCtgGr()); itemRequest.setPartAdd("0"); itemRequest.setDelFlg("0"); - itemRequest.setQcastCustPrdId(itemResponse.getQcastCustPrdId()); break; } } @@ -680,6 +679,13 @@ public class EstimateService { itemRequest.setObjectNo(estimateRequest.getObjectNo()); itemRequest.setPlanNo(estimateRequest.getPlanNo()); + // 선택한 PCS 아이템이 다른 경우 + for (ItemRequest qcastCPI : itemList) { + + if(qcastCPI.getQcastCustPrdId() != null && qcastCPI.getQcastCustPrdId().equals(itemRequest.getPcItemId())) { + itemRequest.setQcastCustPrdId(qcastCPI.getQcastCustPrdId()); + } + } estimateMapper.insertEstimateRoofItem(itemRequest); } } diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml index 35b0bbb2..288b815f 100644 --- a/src/main/resources/mappers/estimate/estimateMapper.xml +++ b/src/main/resources/mappers/estimate/estimateMapper.xml @@ -388,7 +388,7 @@ FROM T_PART_ROOF_ITEM_ESTIMATE (NOLOCK) WHERE OBJECT_NO = PE.OBJECT_NO AND PLAN_NO = PE.PLAN_NO - AND PC_ITEM_ID = PE.ITEM_ID + AND ISNULL(NULLIF(QCAST_CUST_PRD_ID, ''), PC_ITEM_ID) = PE.ITEM_ID ), 0) AS MODULE_VOL_KW FROM T_PLAN P WITH (NOLOCK) INNER JOIN T_PART_ESTIMATE PE WITH (NOLOCK)