diff --git a/Hcs.Client/ClientApi/HouseManagementApi/HcsHouseManagementNsi.cs b/Hcs.Client/ClientApi/HouseManagementApi/HcsHouseManagementNsi.cs index 8a2da9f..6a666ac 100644 --- a/Hcs.Client/ClientApi/HouseManagementApi/HcsHouseManagementNsi.cs +++ b/Hcs.Client/ClientApi/HouseManagementApi/HcsHouseManagementNsi.cs @@ -79,6 +79,7 @@ namespace Hcs.ClientApi.HouseManagementApi Name = "Электроснабжение" }; + // TODO: Подставить корректный код и ГУИД public static HouseManagement.ContractSubjectTypeMunicipalResource ElectricSupplyMunicipalResource => new HouseManagement.ContractSubjectTypeMunicipalResource() { @@ -86,5 +87,40 @@ namespace Hcs.ClientApi.HouseManagementApi GUID = "7379be86-6c95-4e41-b000-3bc703d35969", Name = "Электрическая энергия" }; + + public static HouseManagement.ContractSubjectTypeServiceType HeatingSupplyServiceType + => new HouseManagement.ContractSubjectTypeServiceType() + { + Code = "6", + GUID = "74925764-ddf3-4b4b-b18d-85994187c13a", + Name = "Отопление" + }; + + public static HouseManagement.ContractSubjectTypeMunicipalResource HeatingSupplyMunicipalResource + => new HouseManagement.ContractSubjectTypeMunicipalResource() + { + // Значения взяты из справочника 239 + Code = "4", + GUID = "eec6e4b8-76c8-4fce-99b7-c95718edad19", + Name = null + }; + + public static HouseManagement.ContractSubjectTypeServiceType HotWaterSupplyServiceType + => new HouseManagement.ContractSubjectTypeServiceType() + { + Code = "2", + GUID = "ee8c6a41-aaf8-41c8-a1f6-5832cc622f88", + Name = null + }; + + // TODO: Подставить корректный код и ГУИД + public static HouseManagement.ContractSubjectTypeMunicipalResource HotWaterSupplyMunicipalResource + => new HouseManagement.ContractSubjectTypeMunicipalResource() + { + Code = "2.2", + GUID = "1471de55-c2e7-4101-9f2a-9bef6fffb896", + Name = "Горячая вода 2" + }; + } } diff --git a/Hcs.Client/ClientApi/HouseManagementApi/HcsMethodImportSupplyResourceContractData.cs b/Hcs.Client/ClientApi/HouseManagementApi/HcsMethodImportSupplyResourceContractData.cs index 533f973..4a69e79 100644 --- a/Hcs.Client/ClientApi/HouseManagementApi/HcsMethodImportSupplyResourceContractData.cs +++ b/Hcs.Client/ClientApi/HouseManagementApi/HcsMethodImportSupplyResourceContractData.cs @@ -152,8 +152,8 @@ namespace Hcs.ClientApi.HouseManagementApi Guid contractSubjectGuid = Guid.NewGuid(); contract.ContractSubject = [ new HouseManagement.SupplyResourceContractTypeContractSubject() { - ServiceType = HcsHouseManagementNsi.ElectricSupplyServiceType, - MunicipalResource = HcsHouseManagementNsi.ElectricSupplyMunicipalResource, + ServiceType = HcsHouseManagementNsi.HeatingSupplyServiceType, + MunicipalResource = HcsHouseManagementNsi.HeatingSupplyMunicipalResource, StartSupplyDate = (договор.ДатаЗаключения != null ? (DateTime)договор.ДатаЗаключения : DateTime.Now), EndSupplyDate = DateTime.Now.AddYears(50), TransportGUID = FormatGuid(contractSubjectGuid) @@ -299,6 +299,12 @@ namespace Hcs.ClientApi.HouseManagementApi pair.StartSupplyDate = startSupplyDate; // TODO: Проверить комментарий pair.EndSupplyDateSpecified = false; // Не указана дата окончания поставки ресурса + // TODO: Необходимо указывать только для отопления и ГВС, нужен рефактор кода + pair.HeatingSystemType = new HouseManagement.SupplyResourceContractTypeObjectAddressPairHeatingSystemType() + { + OpenOrNot = HouseManagement.SupplyResourceContractTypeObjectAddressPairHeatingSystemTypeOpenOrNot.Closed, + CentralizedOrNot = HouseManagement.SupplyResourceContractTypeObjectAddressPairHeatingSystemTypeCentralizedOrNot.Centralized + }; var address = new HouseManagement.SupplyResourceContractTypeObjectAddress() { diff --git a/Hcs.Client/ClientApi/HouseManagementApi/HcsMethodImportSupplyResourceContractObjectAddress.cs b/Hcs.Client/ClientApi/HouseManagementApi/HcsMethodImportSupplyResourceContractObjectAddress.cs index 53be07b..e0c4c68 100644 --- a/Hcs.Client/ClientApi/HouseManagementApi/HcsMethodImportSupplyResourceContractObjectAddress.cs +++ b/Hcs.Client/ClientApi/HouseManagementApi/HcsMethodImportSupplyResourceContractObjectAddress.cs @@ -84,18 +84,20 @@ namespace Hcs.ClientApi.HouseManagementApi Guid transportGuid = Guid.NewGuid(); + // TODO: Эти значения должны быть регулируемыми var serviceType = new HouseManagement.ContractSubjectObjectAdressTypeServiceType() { - Code = HcsHouseManagementNsi.ElectricSupplyServiceType.Code, - GUID = HcsHouseManagementNsi.ElectricSupplyServiceType.GUID, - Name = HcsHouseManagementNsi.ElectricSupplyServiceType.Name + Code = HcsHouseManagementNsi.HeatingSupplyServiceType.Code, + GUID = HcsHouseManagementNsi.HeatingSupplyServiceType.GUID, + Name = HcsHouseManagementNsi.HeatingSupplyServiceType.Name }; + // TODO: Эти значения должны быть регулируемыми var municipalResource = new HouseManagement.ContractSubjectObjectAdressTypeMunicipalResource() { - Code = HcsHouseManagementNsi.ElectricSupplyMunicipalResource.Code, - GUID = HcsHouseManagementNsi.ElectricSupplyMunicipalResource.GUID, - Name = HcsHouseManagementNsi.ElectricSupplyMunicipalResource.Name + Code = HcsHouseManagementNsi.HeatingSupplyMunicipalResource.Code, + GUID = HcsHouseManagementNsi.HeatingSupplyMunicipalResource.GUID, + Name = HcsHouseManagementNsi.HeatingSupplyMunicipalResource.Name }; var pair = new HouseManagement.importSupplyResourceContractObjectAddressRequestObjectAddressLoadObjectPair()