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(