From b1478e8a7b96b7362622849ed639b3be086a2699 Mon Sep 17 00:00:00 2001
From: "LAPTOP-L3VE7KK2\\USER" <jungpyo2001@interplug.co.kr>
Date: Wed, 27 Nov 2024 11:00:31 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=A0=80?=
 =?UTF-8?q?=EC=9E=A5=20=EC=95=84=EC=9D=B4=ED=85=9C=20=EC=82=AD=EC=A0=9C=20?=
 =?UTF-8?q?=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qcast/biz/estimate/EstimateService.java   | 56 ++++++++++---------
 1 file changed, 30 insertions(+), 26 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 e99c66f1..8de5e7a7 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
@@ -512,33 +512,33 @@ public class EstimateService {
       String moduleModel = "";
       String pcTypeNo = "";
       for (ItemRequest itemRequest : itemList) {
-        if (StringUtils.isEmpty(itemRequest.getDispOrder())) {
-          throw new QcastException(
-              ErrorCode.INVALID_INPUT_VALUE,
-              message.getMessage("common.message.required.data", "Display Order"));
-        }
-        if (StringUtils.isEmpty(itemRequest.getItemId())) {
-          throw new QcastException(
-              ErrorCode.INVALID_INPUT_VALUE,
-              message.getMessage("common.message.required.data", "Item ID"));
-        }
-        if (StringUtils.isEmpty(itemRequest.getAmount())) {
-          throw new QcastException(
-              ErrorCode.INVALID_INPUT_VALUE,
-              message.getMessage("common.message.required.data", "Item Amount"));
-        }
-
-        // 수량
-        BigDecimal amount =
-            new BigDecimal(
-                StringUtils.isEmpty(itemRequest.getAmount()) ? "0" : itemRequest.getAmount());
-        // 아이템용량
-        BigDecimal pnowW =
-            new BigDecimal(
-                StringUtils.isEmpty(itemRequest.getPnowW()) ? "0" : itemRequest.getPnowW());
-
-        // 모듈/PC 체크
         if (!"1".equals(itemRequest.getDelFlg())) {
+          if (StringUtils.isEmpty(itemRequest.getDispOrder())) {
+            throw new QcastException(
+                ErrorCode.INVALID_INPUT_VALUE,
+                message.getMessage("common.message.required.data", "Display Order"));
+          }
+          if (StringUtils.isEmpty(itemRequest.getItemId())) {
+            throw new QcastException(
+                ErrorCode.INVALID_INPUT_VALUE,
+                message.getMessage("common.message.required.data", "Item ID"));
+          }
+          if (StringUtils.isEmpty(itemRequest.getAmount())) {
+            throw new QcastException(
+                ErrorCode.INVALID_INPUT_VALUE,
+                message.getMessage("common.message.required.data", "Item Amount"));
+          }
+
+          // 수량
+          BigDecimal amount =
+              new BigDecimal(
+                  StringUtils.isEmpty(itemRequest.getAmount()) ? "0" : itemRequest.getAmount());
+          // 아이템용량
+          BigDecimal pnowW =
+              new BigDecimal(
+                  StringUtils.isEmpty(itemRequest.getPnowW()) ? "0" : itemRequest.getPnowW());
+
+          // 모듈/PC 체크
           if ("MODULE_".equals(itemRequest.getItemGroup())) {
             moduleModel += !StringUtils.isEmpty(moduleModel) ? splitStr : "";
             moduleModel += itemRequest.getItemNo();
@@ -602,6 +602,10 @@ public class EstimateService {
         itemRequest.setHisNo(hisNo);
         itemRequest.setObjectNo(estimateRequest.getObjectNo());
         itemRequest.setPlanNo(estimateRequest.getPlanNo());
+        itemRequest.setAmount(
+            !StringUtils.isEmpty(itemRequest.getAmount()) ? itemRequest.getAmount() : "0");
+        itemRequest.setSalePrice(
+            !StringUtils.isEmpty(itemRequest.getSalePrice()) ? itemRequest.getSalePrice() : "0");
         itemRequest.setBomAmount(
             !StringUtils.isEmpty(itemRequest.getBomAmount()) ? itemRequest.getBomAmount() : "0");
         itemRequest.setPartAdd(