견적서 아이템 대표케이블 기능 추가
This commit is contained in:
parent
c99141b909
commit
8a6937f7f2
@ -449,6 +449,7 @@ public class EstimateService {
|
|||||||
itemRequest.setFileUploadFlg(itemResponse.getFileUploadFlg());
|
itemRequest.setFileUploadFlg(itemResponse.getFileUploadFlg());
|
||||||
itemRequest.setPkgMaterialFlg(itemResponse.getPkgMaterialFlg());
|
itemRequest.setPkgMaterialFlg(itemResponse.getPkgMaterialFlg());
|
||||||
itemRequest.setOpenFlg(itemResponse.getOpenFlg());
|
itemRequest.setOpenFlg(itemResponse.getOpenFlg());
|
||||||
|
itemRequest.setDispCableFlg("CABLE_".equals(itemResponse.getItemGroup()) ? "1" : "0");
|
||||||
itemRequest.setItemGroup(itemResponse.getItemGroup());
|
itemRequest.setItemGroup(itemResponse.getItemGroup());
|
||||||
itemRequest.setItemCtgGr(itemResponse.getItemCtgGr());
|
itemRequest.setItemCtgGr(itemResponse.getItemCtgGr());
|
||||||
itemRequest.setPartAdd("0");
|
itemRequest.setPartAdd("0");
|
||||||
@ -483,6 +484,8 @@ public class EstimateService {
|
|||||||
bomItem.setSalePrice(itemResponse.getSalePrice());
|
bomItem.setSalePrice(itemResponse.getSalePrice());
|
||||||
bomItem.setFileUploadFlg(itemResponse.getFileUploadFlg());
|
bomItem.setFileUploadFlg(itemResponse.getFileUploadFlg());
|
||||||
bomItem.setPkgMaterialFlg(itemResponse.getPkgMaterialFlg());
|
bomItem.setPkgMaterialFlg(itemResponse.getPkgMaterialFlg());
|
||||||
|
bomItem.setOpenFlg("0");
|
||||||
|
bomItem.setDispCableFlg("0");
|
||||||
bomItem.setItemGroup(itemResponse.getItemGroup());
|
bomItem.setItemGroup(itemResponse.getItemGroup());
|
||||||
bomItem.setItemCtgGr(itemResponse.getItemCtgGr());
|
bomItem.setItemCtgGr(itemResponse.getItemCtgGr());
|
||||||
bomItem.setPartAdd("0");
|
bomItem.setPartAdd("0");
|
||||||
@ -739,6 +742,10 @@ public class EstimateService {
|
|||||||
!StringUtils.isEmpty(itemRequest.getItemChangeFlg())
|
!StringUtils.isEmpty(itemRequest.getItemChangeFlg())
|
||||||
? itemRequest.getItemChangeFlg()
|
? itemRequest.getItemChangeFlg()
|
||||||
: "0");
|
: "0");
|
||||||
|
itemRequest.setDispCableFlg(
|
||||||
|
!StringUtils.isEmpty(itemRequest.getDispCableFlg())
|
||||||
|
? itemRequest.getDispCableFlg()
|
||||||
|
: "0");
|
||||||
itemRequest.setUserId(estimateRequest.getUserId());
|
itemRequest.setUserId(estimateRequest.getUserId());
|
||||||
|
|
||||||
estimateMapper.insertEstimateItemHis(itemRequest);
|
estimateMapper.insertEstimateItemHis(itemRequest);
|
||||||
@ -856,6 +863,7 @@ public class EstimateService {
|
|||||||
itemRequest.setBomAmount(itemResponse.getBomAmount());
|
itemRequest.setBomAmount(itemResponse.getBomAmount());
|
||||||
itemRequest.setSpecialNoteCd(itemResponse.getSpecialNoteCd());
|
itemRequest.setSpecialNoteCd(itemResponse.getSpecialNoteCd());
|
||||||
itemRequest.setItemChangeFlg("0");
|
itemRequest.setItemChangeFlg("0");
|
||||||
|
itemRequest.setDispCableFlg(itemResponse.getDispCableFlg());
|
||||||
|
|
||||||
itemList.add(itemRequest);
|
itemList.add(itemRequest);
|
||||||
}
|
}
|
||||||
@ -1036,6 +1044,7 @@ public class EstimateService {
|
|||||||
itemRequest.setFileUploadFlg(itemResponse.getFileUploadFlg());
|
itemRequest.setFileUploadFlg(itemResponse.getFileUploadFlg());
|
||||||
itemRequest.setPkgMaterialFlg(itemResponse.getPkgMaterialFlg());
|
itemRequest.setPkgMaterialFlg(itemResponse.getPkgMaterialFlg());
|
||||||
itemRequest.setOpenFlg(itemResponse.getOpenFlg());
|
itemRequest.setOpenFlg(itemResponse.getOpenFlg());
|
||||||
|
itemRequest.setDispCableFlg("CABLE_".equals(itemResponse.getItemGroup()) ? "1" : "0");
|
||||||
itemRequest.setItemGroup(itemResponse.getItemGroup());
|
itemRequest.setItemGroup(itemResponse.getItemGroup());
|
||||||
itemRequest.setItemCtgGr(itemResponse.getItemCtgGr());
|
itemRequest.setItemCtgGr(itemResponse.getItemCtgGr());
|
||||||
itemRequest.setPartAdd("0");
|
itemRequest.setPartAdd("0");
|
||||||
@ -1070,6 +1079,8 @@ public class EstimateService {
|
|||||||
bomItem.setSalePrice(itemResponse.getSalePrice());
|
bomItem.setSalePrice(itemResponse.getSalePrice());
|
||||||
bomItem.setFileUploadFlg(itemResponse.getFileUploadFlg());
|
bomItem.setFileUploadFlg(itemResponse.getFileUploadFlg());
|
||||||
bomItem.setPkgMaterialFlg(itemResponse.getPkgMaterialFlg());
|
bomItem.setPkgMaterialFlg(itemResponse.getPkgMaterialFlg());
|
||||||
|
bomItem.setOpenFlg("0");
|
||||||
|
bomItem.setDispCableFlg("0");
|
||||||
bomItem.setItemGroup(itemResponse.getItemGroup());
|
bomItem.setItemGroup(itemResponse.getItemGroup());
|
||||||
bomItem.setItemCtgGr(itemResponse.getItemCtgGr());
|
bomItem.setItemCtgGr(itemResponse.getItemCtgGr());
|
||||||
bomItem.setPartAdd("0");
|
bomItem.setPartAdd("0");
|
||||||
|
|||||||
@ -74,6 +74,9 @@ public class ItemRequest {
|
|||||||
@Schema(description = "아이템 변경 여부")
|
@Schema(description = "아이템 변경 여부")
|
||||||
private String itemChangeFlg;
|
private String itemChangeFlg;
|
||||||
|
|
||||||
|
@Schema(description = "대표 케이블 여부")
|
||||||
|
private String dispCableFlg;
|
||||||
|
|
||||||
@Schema(description = "PC 아이템 ID")
|
@Schema(description = "PC 아이템 ID")
|
||||||
private String pcItemId;
|
private String pcItemId;
|
||||||
|
|
||||||
|
|||||||
@ -68,6 +68,9 @@ public class ItemResponse {
|
|||||||
@Schema(description = "아이템 변경 여부")
|
@Schema(description = "아이템 변경 여부")
|
||||||
private String itemChangeFlg;
|
private String itemChangeFlg;
|
||||||
|
|
||||||
|
@Schema(description = "대표 케이블 여부")
|
||||||
|
private String dispCableFlg;
|
||||||
|
|
||||||
@Schema(description = "W")
|
@Schema(description = "W")
|
||||||
private String pnowW;
|
private String pnowW;
|
||||||
|
|
||||||
|
|||||||
@ -643,6 +643,7 @@ public class ObjectService {
|
|||||||
itemRequest.setBomAmount(itemResponse.getBomAmount());
|
itemRequest.setBomAmount(itemResponse.getBomAmount());
|
||||||
itemRequest.setSpecialNoteCd(itemResponse.getSpecialNoteCd());
|
itemRequest.setSpecialNoteCd(itemResponse.getSpecialNoteCd());
|
||||||
itemRequest.setItemChangeFlg("0");
|
itemRequest.setItemChangeFlg("0");
|
||||||
|
itemRequest.setDispCableFlg(itemResponse.getDispCableFlg());
|
||||||
|
|
||||||
itemList.add(itemRequest);
|
itemList.add(itemRequest);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -154,6 +154,7 @@
|
|||||||
, MII.FILE_UPLOAD_FLG
|
, MII.FILE_UPLOAD_FLG
|
||||||
, MII.ITEM_CTG_GR
|
, MII.ITEM_CTG_GR
|
||||||
, '0' AS SALE_PRICE
|
, '0' AS SALE_PRICE
|
||||||
|
, '0' AS OPEN_FLG
|
||||||
FROM M_PACKAGE_ITEM PI WITH (NOLOCK)
|
FROM M_PACKAGE_ITEM PI WITH (NOLOCK)
|
||||||
INNER JOIN M_ITEM MI WITH (NOLOCK)
|
INNER JOIN M_ITEM MI WITH (NOLOCK)
|
||||||
ON PI.ITEM_ID = MI.ITEM_ID
|
ON PI.ITEM_ID = MI.ITEM_ID
|
||||||
|
|||||||
@ -269,6 +269,7 @@
|
|||||||
, PEI.FILE_UPLOAD_FLG
|
, PEI.FILE_UPLOAD_FLG
|
||||||
, PEI.OPEN_FLG
|
, PEI.OPEN_FLG
|
||||||
, PEI.ITEM_CHANGE_FLG
|
, PEI.ITEM_CHANGE_FLG
|
||||||
|
, PEI.DISP_CABLE_FLG
|
||||||
, I.PNOW_W
|
, I.PNOW_W
|
||||||
, CASE WHEN I.POWER_COM_FLG = '1' THEN 'PC_'
|
, CASE WHEN I.POWER_COM_FLG = '1' THEN 'PC_'
|
||||||
WHEN I.ITEM_GROUP = 'PC_' AND I.POWER_COM_FLG = '0' THEN 'STORAGE_BATTERY'
|
WHEN I.ITEM_GROUP = 'PC_' AND I.POWER_COM_FLG = '0' THEN 'STORAGE_BATTERY'
|
||||||
@ -821,6 +822,7 @@
|
|||||||
, FILE_UPLOAD_FLG
|
, FILE_UPLOAD_FLG
|
||||||
, OPEN_FLG
|
, OPEN_FLG
|
||||||
, ITEM_CHANGE_FLG
|
, ITEM_CHANGE_FLG
|
||||||
|
, DISP_CABLE_FLG
|
||||||
) VALUES (
|
) VALUES (
|
||||||
#{objectNo}
|
#{objectNo}
|
||||||
, #{planNo}
|
, #{planNo}
|
||||||
@ -838,6 +840,7 @@
|
|||||||
, #{fileUploadFlg}
|
, #{fileUploadFlg}
|
||||||
, #{openFlg}
|
, #{openFlg}
|
||||||
, #{itemChangeFlg}
|
, #{itemChangeFlg}
|
||||||
|
, #{dispCableFlg}
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user