qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: qcast3:27812c6908bfc0eabc29742ea219ee127d6bbb03
Branches Tags
qcast3:main
qcast3:dev-deploy
qcast3:dev
qcast3:prd-deploy
qcast3:ready_prd
qcast3:feature/rjy-0113
qcast3:feature/dev-jp-001
qcast3:feature/dev_jp
qcast3:feature/batch-config-new
qcast3:feature/dev-yj
qcast3:feature/qcast-886
qcast3:feature/qcast-944
qcast3:feature/qcast-925
..
compare: qcast3:6082435b72594f3902065358832c6e86d01c5bd4
Branches Tags
qcast3:dev-deploy
qcast3:dev
qcast3:prd-deploy
qcast3:ready_prd
qcast3:feature/rjy-0113
qcast3:feature/dev-jp-001
qcast3:feature/dev_jp
qcast3:feature/batch-config-new
qcast3:feature/dev-yj
qcast3:feature/qcast-886
qcast3:feature/qcast-944
qcast3:feature/qcast-925
qcast3:main

No commits in common. "27812c6908bfc0eabc29742ea219ee127d6bbb03" and "6082435b72594f3902065358832c6e86d01c5bd4" have entirely different histories.
27812c6908 ... 6082435b72

5 changed files with 0 additions and 28 deletions
Show Stats Expand all files Collapse all files

17
src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
View File

@ -448,7 +448,6 @@ public class EstimateService {
itemRequest.setFileUploadFlg(itemResponse.getFileUploadFlg());
itemRequest.setPkgMaterialFlg(itemResponse.getPkgMaterialFlg());
itemRequest.setOpenFlg(itemResponse.getOpenFlg());
itemRequest.setUnitOpenFlg(itemResponse.getUnitOpenFlg());
itemRequest.setDispCableFlg("CABLE_".equals(itemResponse.getItemGroup()) ? "1" : "0");
itemRequest.setItemGroup(itemResponse.getItemGroup());
itemRequest.setItemCtgGr(itemResponse.getItemCtgGr());
@ -483,7 +482,6 @@ public class EstimateService {
bomItem.setFileUploadFlg(itemResponse.getFileUploadFlg());
bomItem.setPkgMaterialFlg(itemResponse.getPkgMaterialFlg());
bomItem.setOpenFlg("0");
bomItem.setUnitOpenFlg("0");
bomItem.setDispCableFlg("0");
bomItem.setItemGroup(itemResponse.getItemGroup());
bomItem.setItemCtgGr(itemResponse.getItemCtgGr());
@ -731,8 +729,6 @@ public class EstimateService {
!StringUtils.isEmpty(itemRequest.getPartAdd()) ? itemRequest.getPartAdd() : "0");
itemRequest.setOpenFlg(
!StringUtils.isEmpty(itemRequest.getOpenFlg()) ? itemRequest.getOpenFlg() : "0");
itemRequest.setUnitOpenFlg(
!StringUtils.isEmpty(itemRequest.getUnitOpenFlg()) ? itemRequest.getUnitOpenFlg() : "0");
itemRequest.setItemChangeFlg(
!StringUtils.isEmpty(itemRequest.getItemChangeFlg()) ? itemRequest.getItemChangeFlg()
: "0");
@ -885,7 +881,6 @@ public class EstimateService {
itemRequest.setFileUploadFlg(itemResponse.getFileUploadFlg());
itemRequest.setItemGroup(itemResponse.getItemGroup());
itemRequest.setOpenFlg(itemResponse.getOpenFlg());
itemRequest.setUnitOpenFlg(itemResponse.getUnitOpenFlg());
break;
}
@ -1034,7 +1029,6 @@ public class EstimateService {
itemRequest.setFileUploadFlg(itemResponse.getFileUploadFlg());
itemRequest.setPkgMaterialFlg(itemResponse.getPkgMaterialFlg());
itemRequest.setOpenFlg(itemResponse.getOpenFlg());
itemRequest.setUnitOpenFlg(itemResponse.getUnitOpenFlg());
itemRequest.setDispCableFlg("CABLE_".equals(itemResponse.getItemGroup()) ? "1" : "0");
itemRequest.setItemGroup(itemResponse.getItemGroup());
itemRequest.setItemCtgGr(itemResponse.getItemCtgGr());
@ -1069,7 +1063,6 @@ public class EstimateService {
bomItem.setFileUploadFlg(itemResponse.getFileUploadFlg());
bomItem.setPkgMaterialFlg(itemResponse.getPkgMaterialFlg());
bomItem.setOpenFlg("0");
bomItem.setUnitOpenFlg("0");
bomItem.setDispCableFlg("0");
bomItem.setItemGroup(itemResponse.getItemGroup());
bomItem.setItemCtgGr(itemResponse.getItemCtgGr());
@ -1217,8 +1210,6 @@ public class EstimateService {
!StringUtils.isEmpty(itemRequest.getPartAdd()) ? itemRequest.getPartAdd() : "0");
itemRequest.setOpenFlg(
!StringUtils.isEmpty(itemRequest.getOpenFlg()) ? itemRequest.getOpenFlg() : "0");
itemRequest.setUnitOpenFlg(
!StringUtils.isEmpty(itemRequest.getUnitOpenFlg()) ? itemRequest.getUnitOpenFlg() : "0");
itemRequest.setItemChangeFlg(
!StringUtils.isEmpty(itemRequest.getItemChangeFlg()) ? itemRequest.getItemChangeFlg()
: "0");
@ -1424,14 +1415,6 @@ public class EstimateService {
itemResponse.setSalePrice("OPEN");
itemResponse.setSaleTotPrice("OPEN");
}
String nullChk = StringUtils.isEmpty(itemResponse.getSalePrice()) ? "0" : itemResponse.getSalePrice();
if ("1".equals(itemResponse.getUnitOpenFlg()) && "1".equals(estimateRequest.getSchUnitPriceFlg())){
itemResponse.setSalePrice("OPEN");
itemResponse.setSaleTotPrice("OPEN");
}
}
// 합산 문자열 통화로 변환 처리

3
src/main/java/com/interplug/qcast/biz/estimate/dto/ItemRequest.java
View File

@ -109,7 +109,4 @@ public class ItemRequest {
@Schema(description = "아이템 타입 코드")
public String itemTpCd;
@Schema(description = "unit price 아이템 오픈가 여부")
private String unitOpenFlg;
}

3
src/main/java/com/interplug/qcast/biz/estimate/dto/ItemResponse.java
View File

@ -88,7 +88,4 @@ public class ItemResponse {
@Schema(description = "아이템 타입 코드")
public String itemTpCd;
@Schema(description = "unit price 아이템 오픈가 여부")
private String unitOpenFlg;
}

1
src/main/java/com/interplug/qcast/biz/object/ObjectService.java
View File

@ -653,7 +653,6 @@ public class ObjectService {
itemRequest.setFileUploadFlg(itemResponse.getFileUploadFlg());
itemRequest.setItemGroup(itemResponse.getItemGroup());
itemRequest.setOpenFlg(itemResponse.getOpenFlg());
itemRequest.setUnitOpenFlg(itemResponse.getUnitOpenFlg());
break;
}

4
src/main/resources/mappers/estimate/estimateMapper.xml
View File

@ -281,7 +281,6 @@
, PEI.PKG_MATERIAL_FLG
, PEI.FILE_UPLOAD_FLG
, PEI.OPEN_FLG
, PEI.UNIT_OPEN_FLG
, PEI.ITEM_CHANGE_FLG
, PEI.DISP_CABLE_FLG
, PEI.ITEM_TP_CD
@ -322,7 +321,6 @@
, II.ITEM_CTG_GR
, ISNULL(PPM.SALE_PRICE, '0') AS SALE_PRICE
, CASE WHEN PPM.SALE_PRICE = 0 THEN '1' ELSE '0' END AS OPEN_FLG
, CASE WHEN PPM.UNIT_PRICE = 0 AND PPM.SALE_PRICE <![CDATA[ <> ]]> 0 THEN '1' ELSE '0' END AS UNIT_OPEN_FLG
FROM M_ITEM I WITH (NOLOCK)
INNER JOIN M_ITEM_INFO II WITH (NOLOCK)
ON I.ITEM_ID = II.ITEM_ID
@ -839,7 +837,6 @@
, PKG_MATERIAL_FLG
, FILE_UPLOAD_FLG
, OPEN_FLG
, UNIT_OPEN_FLG
, ITEM_CHANGE_FLG
, DISP_CABLE_FLG
, ITEM_TP_CD
@ -859,7 +856,6 @@
, #{pkgMaterialFlg}
, #{fileUploadFlg}
, #{openFlg}
, #{unitOpenFlg}
, #{itemChangeFlg}
, #{dispCableFlg}
, #{itemTpCd}