marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production

Browse Source
This commit is contained in:
Thomas Wiedebusch 2025-10-15 16:16:21 +02:00
commit 14a8a6da49
14 changed files with 23686 additions and 23678 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -400,3 +400,4 @@ FodyWeavers.xsd
/Common/CommonConsole
/Common/Common.v3.ncrunchsolution
/TBF_V2/Sources/TBF/TBF/BenchControl/TestMethods/GenesisCommunication.zip
/Common/Hardware/WaterMeter/Genesis/GenesisCore/configuration2013.json

2
Common/.vs/Common/config/applicationhost.config
View File

@ -171,7 +171,7 @@
</site>
<site name="MeterProcessState(2)" id="4">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="D:\Projekte\SENSUS_GitLab\LAA_PRODUCTION\Common\Service\MeterProcessState" />
<virtualDirectory path="/" physicalPath="E:\REPO\lab\la_operations\laa_production\Common\Service\MeterProcessState" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:50075:localhost" />

17
Common/CommonCore.Configuration/ServiceUrls.cs
View File

@ -7,7 +7,7 @@ namespace Xylem.Common.CommonCore.Configuration
/// <summary>
/// Urls for data base accesses
/// </summary>
public static class ServiceUrls_old
public static class ServiceUrls_oldBackup
{
@ -832,6 +832,21 @@ namespace Xylem.Common.CommonCore.Configuration
{
throw new NotImplementedException();
}
public static String GetOrderOverviewServiceUrl()
{
throw new NotImplementedException();
}
public static String GetCordonelMappingServiceUrl()
{
throw new NotImplementedException();
}
public static String GenesisSetPickingStateServiceUrl()
{
throw new NotImplementedException();
}
}

2
Common/CordonelPreadjustmentUi/Processes/Actions/PreparationProcess.cs
View File

@ -7,10 +7,10 @@ using CordonelPreadjustmentUi.Processes.Itinerary;
using System.Threading;
using static CordonelPreadjustmentUi.PreAdjustmentControl;
using System.Threading.Tasks;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
using Xylem.Common.Logic.SoftwareAccessHelper;
using Xylem.Common.CommonCore.Configuration;
using Newtonsoft.Json;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
namespace CordonelPreadjustmentUi.Processes.Actions
{

3
Common/CordonelPreadjustmentUi/Processes/ActionsSinglePath/SPPreparationProcess.cs
View File

@ -7,10 +7,11 @@ using CordonelPreadjustmentUi.Processes.Itinerary;
using System.Threading;
using static CordonelPreadjustmentUi.PreAdjustmentControl;
using System.Threading.Tasks;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
using Xylem.Common.Logic.SoftwareAccessHelper;
using Xylem.Common.CommonCore.Configuration;
using Newtonsoft.Json;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
namespace CordonelPreadjustmentUi.Processes.Actions
{

47310
Common/Hardware/WaterMeter/Genesis/GenesisCore/configuration.json
View File

File diff suppressed because it is too large Load Diff

8
Common/Hardware/WaterMeter/Genesis/Registers/DataTypes/UInt672.cs Normal file
View File

@ -0,0 +1,8 @@
using System;
namespace Xylem.Common.Hardware.WaterMeter.Genesis.Registers.DataTypes
{
public struct UInt672
{
}
}

2
Common/LaaPackages

@ -1 +1 @@
Subproject commit a9ef9051cabb74806a4ce0293794cf95756883e6
Subproject commit 41c1163d102dbb63572e60c6ffd501e1765d848c

1
Common/Service/MeterProcessState/Controllers/LUControler.cs
View File

@ -14,7 +14,6 @@ using System.Text;
using System.Threading.Tasks;
using System.Web.Helpers;
using System.Web.Http;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers.Json;
using Xylem.Common.Logic.ServiceCore;

4
Common/Service/MeterProcessState/MeterProcessState.csproj
View File

@ -453,10 +453,6 @@
<Project>{0f646872-d8dc-4ee5-989f-d4c73f0ace3f}</Project>
<Name>GenesisStatus</Name>
</ProjectReference>
<ProjectReference Include="..\..\Hardware\WaterMeter\Genesis\Registers\Registers.csproj">
<Project>{F4AAF7E6-7333-4284-B735-E32DEB076C64}</Project>
<Name>Registers</Name>
</ProjectReference>
<ProjectReference Include="..\..\Hardware\WaterMeter\WaterMeterCore\WaterMeterCore.csproj">
<Project>{8203ABB8-38E5-472E-A742-33F38B7A74A6}</Project>
<Name>WaterMeterCore</Name>

2
Common/Ui/GenesisToolBox/GenesisToolBox.csproj
View File

@ -748,7 +748,7 @@
<Name>StreamingProtocol</Name>
</ProjectReference>
<ProjectReference Include="..\..\Hardware\WaterMeter\Genesis\Registers\Registers.csproj">
<Project>{f4aaf7e6-7333-4284-b735-e32deb076c64}</Project>
<Project>{F4AAF7E6-7333-4284-B735-E32DEB076C64}</Project>
<Name>Registers</Name>
</ProjectReference>
<ProjectReference Include="..\..\Hardware\WaterMeter\WaterMeterCore\WaterMeterCore.csproj">

4
Common/Ui/IrdaDemo/IrdaDemo.csproj
View File

@ -138,10 +138,6 @@
<Project>{04201E95-90A0-4B73-A72F-379739B2A3AE}</Project>
<Name>GenesisCore</Name>
</ProjectReference>
<ProjectReference Include="..\..\Hardware\WaterMeter\Genesis\Registers\Registers.csproj">
<Project>{F4AAF7E6-7333-4284-B735-E32DEB076C64}</Project>
<Name>Registers</Name>
</ProjectReference>
<ProjectReference Include="..\..\Hardware\WaterMeter\WaterMeterCore\WaterMeterCore.csproj">
<Project>{8203ABB8-38E5-472E-A742-33F38B7A74A6}</Project>
<Name>WaterMeterCore</Name>

4
ServiceFwUpdate/Common/FwUpdateDb/FwUpdateDb.csproj
View File

@ -140,10 +140,6 @@
<Project>{AC434B18-4D7B-49BA-9AD5-0527C79E8297}</Project>
<Name>GenesisPwd</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Common\Hardware\WaterMeter\Genesis\Registers\Registers.csproj">
<Project>{F4AAF7E6-7333-4284-B735-E32DEB076C64}</Project>
<Name>Registers</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Common\Logic.PrdoctionToProductMapper\Logic.ProductionToProductMapper.csproj">
<Project>{d0c859d9-d55e-4e85-ac50-0ff31b1ce50d}</Project>
<Name>Logic.ProductionToProductMapper</Name>

4
ServiceFwUpdate/Common/FwUpdateSafe/FwUpdateSafe.csproj
View File

@ -128,10 +128,6 @@
<Project>{2C6378C6-6BA1-4CEE-8992-8404D8369A90}</Project>
<Name>GenesisFile</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Common\Hardware\WaterMeter\Genesis\Registers\Registers.csproj">
<Project>{F4AAF7E6-7333-4284-B735-E32DEB076C64}</Project>
<Name>Registers</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Common\Logic.PrdoctionToProductMapper\Logic.ProductionToProductMapper.csproj">
<Project>{d0c859d9-d55e-4e85-ac50-0ff31b1ce50d}</Project>
<Name>Logic.ProductionToProductMapper</Name>