From 8a6937f7f2c7a9926b6543611ecc75aa26922d6a Mon Sep 17 00:00:00 2001 From: "LAPTOP-L3VE7KK2\\USER" Date: Thu, 13 Mar 2025 11:57:59 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=ED=85=9C=20=EB=8C=80=ED=91=9C=EC=BC=80=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interplug/qcast/biz/estimate/EstimateService.java | 11 +++++++++++ .../interplug/qcast/biz/estimate/dto/ItemRequest.java | 3 +++ .../qcast/biz/estimate/dto/ItemResponse.java | 3 +++ .../com/interplug/qcast/biz/object/ObjectService.java | 1 + .../mappers/displayItem/displayItemMapper.xml | 1 + .../resources/mappers/estimate/estimateMapper.xml | 3 +++ 6 files changed, 22 insertions(+) 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 d28f4c59..09fdb0ac 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -449,6 +449,7 @@ public class EstimateService { itemRequest.setFileUploadFlg(itemResponse.getFileUploadFlg()); itemRequest.setPkgMaterialFlg(itemResponse.getPkgMaterialFlg()); itemRequest.setOpenFlg(itemResponse.getOpenFlg()); + itemRequest.setDispCableFlg("CABLE_".equals(itemResponse.getItemGroup()) ? "1" : "0"); itemRequest.setItemGroup(itemResponse.getItemGroup()); itemRequest.setItemCtgGr(itemResponse.getItemCtgGr()); itemRequest.setPartAdd("0"); @@ -483,6 +484,8 @@ public class EstimateService { bomItem.setSalePrice(itemResponse.getSalePrice()); bomItem.setFileUploadFlg(itemResponse.getFileUploadFlg()); bomItem.setPkgMaterialFlg(itemResponse.getPkgMaterialFlg()); + bomItem.setOpenFlg("0"); + bomItem.setDispCableFlg("0"); bomItem.setItemGroup(itemResponse.getItemGroup()); bomItem.setItemCtgGr(itemResponse.getItemCtgGr()); bomItem.setPartAdd("0"); @@ -739,6 +742,10 @@ public class EstimateService { !StringUtils.isEmpty(itemRequest.getItemChangeFlg()) ? itemRequest.getItemChangeFlg() : "0"); + itemRequest.setDispCableFlg( + !StringUtils.isEmpty(itemRequest.getDispCableFlg()) + ? itemRequest.getDispCableFlg() + : "0"); itemRequest.setUserId(estimateRequest.getUserId()); estimateMapper.insertEstimateItemHis(itemRequest); @@ -856,6 +863,7 @@ public class EstimateService { itemRequest.setBomAmount(itemResponse.getBomAmount()); itemRequest.setSpecialNoteCd(itemResponse.getSpecialNoteCd()); itemRequest.setItemChangeFlg("0"); + itemRequest.setDispCableFlg(itemResponse.getDispCableFlg()); itemList.add(itemRequest); } @@ -1036,6 +1044,7 @@ public class EstimateService { itemRequest.setFileUploadFlg(itemResponse.getFileUploadFlg()); itemRequest.setPkgMaterialFlg(itemResponse.getPkgMaterialFlg()); itemRequest.setOpenFlg(itemResponse.getOpenFlg()); + itemRequest.setDispCableFlg("CABLE_".equals(itemResponse.getItemGroup()) ? "1" : "0"); itemRequest.setItemGroup(itemResponse.getItemGroup()); itemRequest.setItemCtgGr(itemResponse.getItemCtgGr()); itemRequest.setPartAdd("0"); @@ -1070,6 +1079,8 @@ public class EstimateService { bomItem.setSalePrice(itemResponse.getSalePrice()); bomItem.setFileUploadFlg(itemResponse.getFileUploadFlg()); bomItem.setPkgMaterialFlg(itemResponse.getPkgMaterialFlg()); + bomItem.setOpenFlg("0"); + bomItem.setDispCableFlg("0"); bomItem.setItemGroup(itemResponse.getItemGroup()); bomItem.setItemCtgGr(itemResponse.getItemCtgGr()); bomItem.setPartAdd("0"); diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/ItemRequest.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/ItemRequest.java index 054f7401..d9a1e4d6 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/dto/ItemRequest.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/ItemRequest.java @@ -74,6 +74,9 @@ public class ItemRequest { @Schema(description = "아이템 변경 여부") private String itemChangeFlg; + @Schema(description = "대표 케이블 여부") + private String dispCableFlg; + @Schema(description = "PC 아이템 ID") private String pcItemId; diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/ItemResponse.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/ItemResponse.java index 9b4d95e3..2bf662d4 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/dto/ItemResponse.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/ItemResponse.java @@ -68,6 +68,9 @@ public class ItemResponse { @Schema(description = "아이템 변경 여부") private String itemChangeFlg; + @Schema(description = "대표 케이블 여부") + private String dispCableFlg; + @Schema(description = "W") private String pnowW; diff --git a/src/main/java/com/interplug/qcast/biz/object/ObjectService.java b/src/main/java/com/interplug/qcast/biz/object/ObjectService.java index c36e45d4..d5ff5fcc 100644 --- a/src/main/java/com/interplug/qcast/biz/object/ObjectService.java +++ b/src/main/java/com/interplug/qcast/biz/object/ObjectService.java @@ -643,6 +643,7 @@ public class ObjectService { itemRequest.setBomAmount(itemResponse.getBomAmount()); itemRequest.setSpecialNoteCd(itemResponse.getSpecialNoteCd()); itemRequest.setItemChangeFlg("0"); + itemRequest.setDispCableFlg(itemResponse.getDispCableFlg()); itemList.add(itemRequest); } diff --git a/src/main/resources/mappers/displayItem/displayItemMapper.xml b/src/main/resources/mappers/displayItem/displayItemMapper.xml index 3de6dede..c7ca8394 100644 --- a/src/main/resources/mappers/displayItem/displayItemMapper.xml +++ b/src/main/resources/mappers/displayItem/displayItemMapper.xml @@ -154,6 +154,7 @@ , MII.FILE_UPLOAD_FLG , MII.ITEM_CTG_GR , '0' AS SALE_PRICE + , '0' AS OPEN_FLG FROM M_PACKAGE_ITEM PI WITH (NOLOCK) INNER JOIN M_ITEM MI WITH (NOLOCK) ON PI.ITEM_ID = MI.ITEM_ID diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml index 5188da03..ca6a40d0 100644 --- a/src/main/resources/mappers/estimate/estimateMapper.xml +++ b/src/main/resources/mappers/estimate/estimateMapper.xml @@ -269,6 +269,7 @@ , PEI.FILE_UPLOAD_FLG , PEI.OPEN_FLG , PEI.ITEM_CHANGE_FLG + , PEI.DISP_CABLE_FLG , I.PNOW_W , CASE WHEN I.POWER_COM_FLG = '1' THEN 'PC_' WHEN I.ITEM_GROUP = 'PC_' AND I.POWER_COM_FLG = '0' THEN 'STORAGE_BATTERY' @@ -821,6 +822,7 @@ , FILE_UPLOAD_FLG , OPEN_FLG , ITEM_CHANGE_FLG + , DISP_CABLE_FLG ) VALUES ( #{objectNo} , #{planNo} @@ -838,6 +840,7 @@ , #{fileUploadFlg} , #{openFlg} , #{itemChangeFlg} + , #{dispCableFlg} )