Compare commits

..

No commits in common. "f4f493b7c2cc542cd0daf6f2674b1d619fd92fca" and "4788938c704a272eebb433d0561fbeb821c0cdad" have entirely different histories.

3 changed files with 1 additions and 15 deletions

View File

@ -26,10 +26,6 @@ public class ApiPcsRoofSurfaceRequest {
@NotNull @NotNull
private String roofSurfaceNorthYn; private String roofSurfaceNorthYn;
@Schema(description = "북면모듈 설치여부")
@NotNull
private String roofSurfaceNorthModuleYn;
@Schema(description = "모듈아이템 List(도면에 설치된 모듈)") @Schema(description = "모듈아이템 List(도면에 설치된 모듈)")
@NotNull @NotNull
private List<ApiPcsModuleItemIdRequest> moduleList; private List<ApiPcsModuleItemIdRequest> moduleList;

View File

@ -22,9 +22,6 @@ public class ApiPcsSerQtyRoofSurfaceDto {
@Schema(description = "북면 여부") @Schema(description = "북면 여부")
private String roofSurfaceNorthYn; private String roofSurfaceNorthYn;
@Schema(description = "북면모듈 설치여부")
private String roofSurfaceNorthModuleYn;
@Schema(description = "모듈아이템 List(도면에 설치된 모듈)") @Schema(description = "모듈아이템 List(도면에 설치된 모듈)")
private List<ApiPcsSerQtyRoofSurfaceModuleDto> moduleList; private List<ApiPcsSerQtyRoofSurfaceModuleDto> moduleList;
} }

View File

@ -404,14 +404,7 @@
ON PE.ITEM_ID = I.ITEM_ID ON PE.ITEM_ID = I.ITEM_ID
WHERE P.OBJECT_NO = #{objectNo} WHERE P.OBJECT_NO = #{objectNo}
AND P.PLAN_NO = #{planNo} AND P.PLAN_NO = #{planNo}
-- AND I.POWER_COM_FLG = '1' /* PCS 아이템만 */ AND I.POWER_COM_FLG = '1' /* PCS 아이템만 */
AND (
CASE
WHEN I.POWER_COM_FLG = '1' THEN 1
WHEN I.POWER_COM_FLG != '1' AND I.ITEM_GROUP = 'STORAGE_BATTERY' AND ISNULL(I.PNOW_W, 0) > 0 THEN 1
ELSE 0
END
) = 1
) T ) T
</select> </select>