Merged from Dev_Shipping except ProductionUiCordonel

This commit is contained in:
Thomas Wiedebusch
2024-03-13 17:37:15 +01:00
parent e0e28df172
commit 46c87a3a0a
15 changed files with 463 additions and 63 deletions
@@ -45,6 +45,9 @@ namespace Xylem.Common.CommonCore.Configuration
private const String DefaultListAllCordonelCustomerOrdersServiceUrl =
"http://sla12iis01.emea.sensus.net/MeterProcessState/api/Order/GetCustomersCordonelOrders?CustomerNumber=";
private const String DefaultListCordonelOrderDetailsServiceUrl =
"http://sla12iis01.emea.sensus.net/MeterProcessState/api/Order/GetCordonelOrderDetails?OrderNr=";
private const String DefaultListAllOrderCordonelsServiceUrl =
"http://sla12iis01.emea.sensus.net/MeterProcessState/api/Order/GetCordonelOrderList?CustomerOrderNumber=";
@@ -396,6 +399,16 @@ namespace Xylem.Common.CommonCore.Configuration
DefaultListAllCordonelCustomersWithFilterServiceUrl;
}
/// <summary>
/// Get Cordonel order details to capture the production order
/// </summary>
/// <returns></returns>
public static String ListCordonelOrderDetailsServiceUrl()
{
return ConfigurationManager.AppSettings["ListCordonelOrderDetailsServiceUrl"] ??
DefaultListCordonelOrderDetailsServiceUrl;
}
/// <summary>
/// List all Cordonel orders of a selected customer
/// </summary>
@@ -145,6 +145,10 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
}
}
/// <summary>
/// Customer serial number for informal issues
/// </summary>
public String CustomerSerialNumber { get; set; } = "";
/// <inheritdoc />
/// <summary>
@@ -0,0 +1,30 @@
using System;
namespace Xylem.Common.Logic.ProductionOrderCore.OrderData
{
/// <summary>
/// Cordonel customers
/// </summary>
[Serializable]
public class CordonelCustomerInfosDb
{
/// <summary>
/// Used to keep the selection information on e.g. data tables stuck at the customer.
/// </summary>
public Boolean IsSelected;
/// <summary>
/// Customer number
/// </summary>
public Int64 CustomerNumber { get; set; }
/// <summary>
/// Customer name
/// </summary>
public String CustomerName { get; set; }
/// <summary>
/// Customer location
/// </summary>
public String CustomerLocation { get; set; }
}
}
@@ -0,0 +1,41 @@
using System;
namespace Xylem.Common.Logic.ProductionOrderCore.OrderData
{
/// <summary>
/// Customer orders of Cordonels
/// </summary>
[Serializable]
public class CordonelCustomerOrderDb
{
/// <summary>
/// Customer production order number of Cordonels
/// </summary>
public Int64 CustomerOrderNumber { get; set; }
/// <summary>
/// Customer production order position of Cordonels
/// </summary>
public Int64 CustomerOrderPos { get; set; }
/// <summary>
/// Quantity of Cordonels connected to this order
/// </summary>
public Int64 Quantity { get; set; }
/// <summary>
/// Catalog number
/// </summary>
public String CatalogNumber { get; set; }
/// <summary>
/// Cordonel diameter
/// </summary>
public Int64 Diameter { get; set; }
/// <summary>
/// Cordonel length
/// </summary>
public Int64 Length { get; set; }
}
}
@@ -0,0 +1,24 @@
using System;
namespace Xylem.Common.Logic.ProductionOrderCore.OrderData
{
/// <summary>
/// Cordonel serial numbers
/// </summary>
[Serializable]
public class CordonelOrderDetailsDb
{
/// <summary>
/// Order number
/// </summary>
public Int64 AuftragNr;
/// <summary>
/// Order position
/// </summary>
public Int64 PositionNr;
/// <summary>
/// Production order number
/// </summary>
public Int64 FertigungsauftragNr;
}
}
@@ -0,0 +1,110 @@
using System;
namespace Xylem.Common.Logic.ProductionOrderCore.OrderData
{
/// <summary>
/// Collection of all data describing the product
/// </summary>
public class CordonelProductionInfosDb
{
/// <summary>
/// Used to keep the selection information on e.g. data tables stuck at the FW.
/// </summary>
public Boolean IsSelected;
/// <summary>
/// Approval by user or automatic.
/// </summary>
public Boolean IsApproved;
/// <summary>
/// Removed by user or automatic.
/// </summary>
public Boolean IsRemoved;
/// <summary>
/// Reason for update denial as text for user in "Pre-Build-Summary-Tab"
/// </summary>
public String ReasonForUpdateDenial;
/// <summary>
/// PCB ID
/// </summary>
public String PcbId;
/// <summary>
/// Customer serial number
/// </summary>
public String CustomerSerialNumber;
/// <summary>
/// Sensus serial number
/// </summary>
public String SensusSerialNumber;
/// <summary>
/// Release version to be installed
/// </summary>
public String RequiredReleaseNameVersion;
/// <summary>
/// Installed release version
/// </summary>
public String InstalledReleaseNameVersion;
/// <summary>
/// Device core revision
/// </summary>
public String CoreRevision;
/// <summary>
/// Device released metrology
/// </summary>
public String Metrology;
/// <summary>
/// Radio frequency is strongly HW depending
/// </summary>
public String RadioFrequency;
/// <summary>
/// Region EMEA or NA
/// </summary>
public String Region;
/// <summary>
/// Metrology is updateable
/// </summary>
public Boolean MetrologyIsUpdateable;
/// <summary>
/// Customer production order number of Cordonels
/// </summary>
public Int64 CustomerOrderNumber;
/// <summary>
/// Customer production order position of Cordonels
/// </summary>
public Int64 CustomerOrderPos;
/// <summary>
/// Catalog number
/// </summary>
public String CatalogNumber;
/// <summary>
/// Cordonel diameter DN50..DN300, US1_5..US12
/// </summary>
public String Diameter;
/// <summary>
/// Cordonel length in mm or inch
/// </summary>
public String Length;
/// <summary>
/// Register restoring required
/// </summary>
public Boolean RegisterRecoveryRequired;
}
}
@@ -0,0 +1,30 @@
using System;
namespace Xylem.Common.Logic.ProductionOrderCore.OrderData
{
/// <summary>
/// Cordonel serial numbers
/// </summary>
[Serializable]
public class CordonelSerialNumbersDb
{
/// <summary>
/// Used to keep the selection information on e.g. data tables stuck at the Cordonel.
/// </summary>
public Boolean IsSelected;
/// <summary>
/// Customer Cordonel serial number
/// </summary>
public String CustomerSerialNumber { get; set; }
/// <summary>
/// Sensus Cordonel serial number
/// </summary>
public Int64 SerialNumber { get; set; }
/// <summary>
/// Cordonel PCB ID
/// </summary>
public Int64 PcbId { get; set; }
}
}
@@ -0,0 +1,171 @@
using System;
using System.Collections.Generic;
using Newtonsoft.Json;
using Xylem.Common.CommonCore.Configuration;
using Xylem.Common.CommonCore.Consts;
using Xylem.Common.Logic.SoftwareAccessHelper;
namespace Xylem.Common.Logic.ProductionOrderCore.OrderData
{
/// <summary>
/// Class for DB interfaces.
/// </summary>
[Serializable]
public static class OrderDetailsDb
{
private const Int32 shortTimeoutDbRequest = 2000;
private const Int32 moderateTimeoutDbRequest = 10000;
private const Int32 hugeTimeoutDbRequest = 30000;
/// <summary>
/// Get all Cordonel serial numbers of a specific order.
/// </summary>
/// <param name="orderNumber"></param>
/// <param name="orderPos"></param>
/// <param name="serialNumbers"></param>
/// <returns>true if successful</returns>
/// <remarks date="2021-Mar-31" author="Thomas Wiedebusch">
/// - Initial.
/// </remarks>
/// <remarks date="2024-Mar-13" author="Thomas Wiedebusch">
/// - Import from FwUpdateDb.
/// </remarks>
public static Boolean GetAllCordonelSerialNumbersFromDb(Int64 orderNumber, Int64 orderPos,
out List<CordonelSerialNumbersDb> serialNumbers)
{
try
{
var url = ServiceUrls.ListAllOrderCordonelsServiceUrl();
url += $@"{orderNumber}&CustomerOrderPos={orderPos}";
var requestResponse = LocalWebRequest.GetRequest(url, moderateTimeoutDbRequest);
if (string.IsNullOrEmpty(requestResponse))
{
serialNumbers = new List<CordonelSerialNumbersDb>();
return false;
}
serialNumbers = JsonConvert.DeserializeObject<List<CordonelSerialNumbersDb>>(requestResponse);
return serialNumbers != null && serialNumbers.Count != 0;
}
catch (Exception)
{
serialNumbers = new List<CordonelSerialNumbersDb>();
return false;
}
}
/// <summary>
/// Get all Cordonel order details for production order.
/// This includes the order number and position needed to get the customer serial number with
/// <see cref="GetAllCordonelSerialNumbersFromDb"/>
/// </summary>
/// <param name="productionOrderNumber"></param>
/// <param name="orderDetails"></param>
/// <returns>true if successful</returns>
/// <remarks date="2024-Mar-13" author="Thomas Wiedebusch">
/// - Initial.
/// </remarks>
public static Boolean GetCordonelOrderDetails(Int64 productionOrderNumber,
out List<CordonelOrderDetailsDb> orderDetails)
{
try
{
var url = ServiceUrls.ListCordonelOrderDetailsServiceUrl();
url += $@"{productionOrderNumber}";
var requestResponse = LocalWebRequest.GetRequest(url, moderateTimeoutDbRequest);
if (string.IsNullOrEmpty(requestResponse))
{
orderDetails = new List<CordonelOrderDetailsDb>();
return false;
}
orderDetails = JsonConvert.DeserializeObject<List<CordonelOrderDetailsDb>>(requestResponse);
return orderDetails != null && orderDetails.Count != 0;
}
catch (Exception)
{
orderDetails = new List<CordonelOrderDetailsDb>();
return false;
}
}
/// <summary>
/// Get all Cordonel customers from DB. The return can be used to select a specific customer and get
/// the customer number which is the base for the order search.
/// </summary>
/// <param name="customers"></param>
/// <param name="searchPattern">specific search pattern for customer name</param>
/// <returns>true if successful</returns>
/// <remarks date="2021-Mar-31" author="Thomas Wiedebusch">
/// - Initial.
/// </remarks>
/// <remarks date="2024-Mar-13" author="Thomas Wiedebusch">
/// - Import from FwUpdateDb.
/// </remarks>
public static Boolean GetAllCordonelCustomersFromDb(out List<CordonelCustomerInfosDb> customers,
String searchPattern = Constants.StrWildcard)
{
try
{
var url = ServiceUrls.ListAllCordonelCustomersWithFilterServiceUrl();
url += searchPattern;
var requestResponse = LocalWebRequest.GetRequest(url, hugeTimeoutDbRequest);
if (string.IsNullOrEmpty(requestResponse))
{
customers = new List<CordonelCustomerInfosDb>();
return false;
}
customers = JsonConvert.DeserializeObject<List<CordonelCustomerInfosDb>>(requestResponse);
return customers != null && customers.Count != 0;
}
catch (Exception)
{
customers = new List<CordonelCustomerInfosDb>();
return false;
}
}
/// <summary>
/// Get all Cordonel customers orders from DB. The return can be used to select a specific order number
/// and position which is the base for the Cordonel serial number search.
/// </summary>
/// <param name="customerNumber"></param>
/// <param name="customerOrders"></param>
/// <returns>true if successful</returns>
/// <remarks date="2021-Mar-31" author="Thomas Wiedebusch">
/// - Initial.
/// </remarks>
/// <remarks date="2023-Nov-28" author="Thomas Wiedebusch">
/// - Sort list by customer order numbers.
/// </remarks>
/// <remarks date="2024-Mar-13" author="Thomas Wiedebusch">
/// - Import from FwUpdateDb.
/// </remarks>
public static Boolean GetAllCordonelCustomerOrdersFromDb(Int64 customerNumber,
out List<CordonelCustomerOrderDb> customerOrders)
{
try
{
var url = ServiceUrls.ListAllCordonelCustomerOrdersServiceUrl();
url += $@"{customerNumber}";
var requestResponse = LocalWebRequest.GetRequest(url, hugeTimeoutDbRequest);
if (string.IsNullOrEmpty(requestResponse))
{
customerOrders = new List<CordonelCustomerOrderDb>();
return false;
}
customerOrders = JsonConvert.DeserializeObject<List<CordonelCustomerOrderDb>>(requestResponse);
customerOrders?.Sort((a, b) => a.CustomerOrderNumber.CompareTo(b.CustomerOrderNumber));
return customerOrders != null && customerOrders.Count != 0;
}
catch (Exception)
{
customerOrders = new List<CordonelCustomerOrderDb>();
return false;
}
}
}
}
@@ -99,6 +99,12 @@
<Compile Include="IProductionData.cs" />
<Compile Include="KitronTestResults\JsonObject.cs" />
<Compile Include="KitronTestResults\RadioTest.cs" />
<Compile Include="OrderData\CordonelCustomerInfosDb.cs" />
<Compile Include="OrderData\CordonelCustomerOrderDb.cs" />
<Compile Include="OrderData\CordonelProductionInfosDb.cs" />
<Compile Include="OrderData\CordonelOrderDetailsDb.cs" />
<Compile Include="OrderData\CordonelSerialNumbersDb.cs" />
<Compile Include="OrderData\OrderDetailsDb.cs" />
<Compile Include="OrderData\MeterSize.cs" />
<Compile Include="OrderData\MeterSizeConverter.cs" />
<Compile Include="OrderData\RegionConverter.cs" />
@@ -121,6 +127,10 @@
<Compile Include="Vako\VakoParser.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\CommonCore.Configuration\CommonCore.Configuration.csproj">
<Project>{9EB1F659-6F73-4F65-BCAB-4114FD94F5FC}</Project>
<Name>CommonCore.Configuration</Name>
</ProjectReference>
<ProjectReference Include="..\..\CommonCore\CommonCore.csproj">
<Project>{1B02C79E-0B19-43E2-8F6B-71EF0C786C97}</Project>
<Name>CommonCore</Name>
+27 -55
View File
@@ -14,6 +14,7 @@ using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisPwd;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
using Xylem.Common.Logic.ProductionOrderCore.FW;
using Xylem.Common.Logic.ProductionOrderCore.OrderData;
using Xylem.Common.Logic.SoftwareAccessHelper;
using Xylem.Common.Utils.DateTimeServer;
using Xylem.ServiceFwUpdate.Common.FwUpdateSafe;
@@ -769,6 +770,9 @@ namespace Xylem.ServiceFwUpdate.Common.FwUpdateDb
/// <remarks date="2021-Mar-31" author="Thomas Wiedebusch">
/// - Initial.
/// </remarks>
/// <remarks date="2024-Mar-13" author="Thomas Wiedebusch">
/// - Moved DB access to <see cref="OrderDetailsDb"/>.
/// </remarks>
public Boolean GetAllCordonelCustomersFromDb(String searchPattern = Constants.StrWildcard)
{
// for the DB interface a specific search pattern will be used, so replace it from the user interface
@@ -778,27 +782,14 @@ namespace Xylem.ServiceFwUpdate.Common.FwUpdateDb
DbSearchedCordonelCustomers = new List<CordonelCustomerInfosDb>();
DbSearchedCordonelCustomers.Clear();
try
{
var url = ServiceUrls.ListAllCordonelCustomersWithFilterServiceUrl();
url += searchPattern;
var requestResponse = LocalWebRequest.GetRequest(url, hugeTimeoutDbRequest);
if (string.IsNullOrEmpty(requestResponse))
{
DbIsConnected = false;
return false;
}
DbIsConnected = OrderDetailsDb.GetAllCordonelCustomersFromDb(out var dbCordonelCustomers, searchPattern);
DbIsConnected = true;
DbSearchedCordonelCustomers =
JsonConvert.DeserializeObject<List<CordonelCustomerInfosDb>>(requestResponse);
return DbSearchedCordonelCustomers != null && DbSearchedCordonelCustomers.Count != 0;
}
catch (Exception)
foreach (var customer in dbCordonelCustomers)
{
DbIsConnected = false;
return false;
DbSearchedCordonelCustomers.Add(customer);
}
return DbIsConnected;
}
/// <summary>
@@ -813,35 +804,26 @@ namespace Xylem.ServiceFwUpdate.Common.FwUpdateDb
/// <remarks date="2023-Nov-28" author="Thomas Wiedebusch">
/// - Sort list by customer order numbers.
/// </remarks>
/// <remarks date="2024-Mar-13" author="Thomas Wiedebusch">
/// - Moved DB access to <see cref="OrderDetailsDb"/>.
/// </remarks>
public Boolean GetAllCordonelCustomerOrdersFromDb(Int64 customerNumber)
{
if (DbCordonelCustomerOrders == null)
DbCordonelCustomerOrders = new List<CordonelCustomerOrderDb>();
DbCordonelCustomerOrders.Clear();
try
{
var url = ServiceUrls.ListAllCordonelCustomerOrdersServiceUrl();
url += $@"{customerNumber}";
var requestResponse = LocalWebRequest.GetRequest(url, hugeTimeoutDbRequest);
if (string.IsNullOrEmpty(requestResponse))
{
DbIsConnected = false;
return false;
}
DbIsConnected = OrderDetailsDb.GetAllCordonelCustomerOrdersFromDb(customerNumber,
out var dbCordonelCustomerOrders);
DbIsConnected = true;
DbCordonelCustomerOrders =
JsonConvert.DeserializeObject<List<CordonelCustomerOrderDb>>(requestResponse);
DbCordonelCustomerOrders?.Sort((a, b) => a.CustomerOrderNumber.CompareTo(b.CustomerOrderNumber));
return DbCordonelCustomerOrders != null && DbCordonelCustomerOrders.Count != 0;
}
catch (Exception)
foreach (var order in dbCordonelCustomerOrders)
{
DbIsConnected = false;
return false;
DbCordonelCustomerOrders.Add(order);
}
return DbIsConnected;
}
/// <summary>
/// Get all Cordonel serial numbers of a specific order.
/// </summary>
@@ -851,33 +833,23 @@ namespace Xylem.ServiceFwUpdate.Common.FwUpdateDb
/// <remarks date="2021-Mar-31" author="Thomas Wiedebusch">
/// - Initial.
/// </remarks>
/// <remarks date="2024-Mar-13" author="Thomas Wiedebusch">
/// - Moved DB access to <see cref="OrderDetailsDb"/>.
/// </remarks>
public Boolean GetAllCordonelSerialNumbersFromDb(Int64 orderNumber, Int64 orderPos)
{
if (DbCordonelSerialNumbers == null)
DbCordonelSerialNumbers = new List<CordonelSerialNumbersDb>();
DbCordonelSerialNumbers.Clear();
try
{
var url = ServiceUrls.ListAllOrderCordonelsServiceUrl();
url += $@"{orderNumber}&CustomerOrderPos={orderPos}";
var requestResponse = LocalWebRequest.GetRequest(url, moderateTimeoutDbRequest);
if (string.IsNullOrEmpty(requestResponse))
{
DbIsConnected = false;
return false;
}
DbIsConnected = OrderDetailsDb.GetAllCordonelSerialNumbersFromDb(orderNumber, orderPos, out var dbSerialNumbers);
DbIsConnected = true;
DbCordonelSerialNumbers =
JsonConvert.DeserializeObject<List<CordonelSerialNumbersDb>>(requestResponse);
return DbCordonelSerialNumbers != null && DbCordonelSerialNumbers.Count != 0;
}
catch (Exception)
foreach (var serialNumber in dbSerialNumbers)
{
DbIsConnected = false;
return false;
DbCordonelSerialNumbers.Add(serialNumber);
}
return DbIsConnected;
}
/// <summary>
/// Get all Cordonel FW packages information from DB.
@@ -78,10 +78,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="CordonelCustomerInfosDb.cs" />
<Compile Include="CordonelProductionInfosDb.cs" />
<Compile Include="CordonelSerialNumbersDb.cs" />
<Compile Include="CordonelCustomerOrderDb.cs" />
<Compile Include="FwUpdateAppVersionDb.cs" />
<Compile Include="FwUpdateDb.cs" />
<Compile Include="FwUpdateSafeDb.cs" />
@@ -142,7 +142,6 @@
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.de.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.de.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
@@ -792,7 +792,7 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder.Properties {
}
/// <summary>
/// Looks up a localized string similar to Restore Registers.
/// Looks up a localized string similar to Factory Reset.
/// </summary>
internal static string StrTableRegisterRestoreSelect {
get {
@@ -412,7 +412,7 @@
<value>Wiederherstellungen geladen:</value>
</data>
<data name="StrTableRegisterRestoreSelect" xml:space="preserve">
<value>Einstellungen Wiederherstellen</value>
<value>Werkseinstellungen wiederherstellen</value>
</data>
<data name="StrDateTimeSetupFailed" xml:space="preserve">
<value>Datum und Zeit setzen fehlgeschlagen!</value>
@@ -419,7 +419,7 @@
<value>Recovery registers added:</value>
</data>
<data name="StrTableRegisterRestoreSelect" xml:space="preserve">
<value>Restore Registers</value>
<value>Factory Reset</value>
</data>
<data name="StrDateTimeSetupFailed" xml:space="preserve">
<value>Failed to setup date time!</value>