chage cordonel fw naming and add more col
This commit is contained in:
Roland Drabesch
@@ -464,7 +464,7 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[Route("GetCorondelFw"), HttpGet]
|
||||
public async Task<HttpResponseMessage> GetCorondelFw(Int32? Metersize = null, int? Frequency = null, String Region = null, Boolean? ForProd = null , Boolean? Deleted = false)
|
||||
public async Task<HttpResponseMessage> GetCorondelFw(Int32? Metersize = null, int? Frequency = null, String Region = null, Boolean? ForProd = null, Boolean? Deleted = false)
|
||||
{
|
||||
|
||||
try
|
||||
@@ -473,44 +473,48 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
|
||||
{
|
||||
var ret = new List<CordonelFw>();
|
||||
|
||||
|
||||
|
||||
|
||||
using (var dataacces = new SqlDataAccess(GlobalConfig.connectionString.Value))
|
||||
{
|
||||
var sb = new StringBuilder();
|
||||
|
||||
|
||||
sb.AppendLine($" SELECT [CordonelCurrentFw_ID] ");
|
||||
sb.AppendLine($" ,[CordonelCurrentFw_Frequency] ");
|
||||
sb.AppendLine($" ,[CordonelCurrentFw_AppID] ");
|
||||
sb.AppendLine($" ,[CordonelCurrentFw_Version] ");
|
||||
sb.AppendLine($" ,[CordonelCurrentFw_Name] ");
|
||||
sb.AppendLine($" ,[CordonelCurrentFw_Deleted] ");
|
||||
sb.AppendLine($" ,[CordonelCurrentFw_ForPressure] ");
|
||||
sb.AppendLine($" ,[CordonelCurrentFw_Metersize] ");
|
||||
sb.AppendLine($" ,[CordonelCurrentFw_LutFileID] ");
|
||||
sb.AppendLine($" ,[CordonelCurrentFw_Region] ");
|
||||
sb.AppendLine($" ,[CordonelCurrentFw_CurrentForProd] ");
|
||||
sb.AppendLine($" ,[CordonelCurrentFw_FileClusterStoreId] ");
|
||||
sb.AppendLine($" ,[FileName] ");
|
||||
sb.AppendLine($" FROM[Auftrag].[dbo].[Cordonel_CurrentFw] ");
|
||||
sb.AppendLine($" left outer join [Auftrag].[dbo].[FileClusterStore] on [FileId] = [CordonelCurrentFw_FileClusterStoreId]");
|
||||
sb.AppendLine($" SELECT [Id] ");
|
||||
sb.AppendLine($" ,[RadioFrequencyMhz] ");
|
||||
sb.AppendLine($" ,[FlexnetAppId] ");
|
||||
sb.AppendLine($" ,[Version] ");
|
||||
sb.AppendLine($" ,[Name] ");
|
||||
sb.AppendLine($" ,[Deleted] ");
|
||||
sb.AppendLine($" ,[Metersize] ");
|
||||
sb.AppendLine($" ,[Region] ");
|
||||
sb.AppendLine($" ,[CurrentForProd] ");
|
||||
sb.AppendLine($" ,[FileClusterStoreId] ");
|
||||
sb.AppendLine($" ,[CoreRevisionMin] ");
|
||||
sb.AppendLine($" ,[CoreRevisionMax] ");
|
||||
sb.AppendLine($" ,[MetrologyVersion] ");
|
||||
sb.AppendLine($" ,[IsReleased] ");
|
||||
sb.AppendLine($" ,[ReleaseDate] ");
|
||||
sb.AppendLine($" ,[Remark] ");
|
||||
sb.AppendLine($" ,[FileName] ");
|
||||
sb.AppendLine($" FROM[Auftrag].[dbo].[Cordonel_CurrentFw] ");
|
||||
sb.AppendLine($" left outer join [Auftrag].[dbo].[FileClusterStore] on [FileId] = [FileClusterStoreId]");
|
||||
sb.AppendLine($" where 1= 1 ");
|
||||
if (Metersize.HasValue)
|
||||
{
|
||||
sb.AppendLine($" and CordonelCurrentFw_Metersize= {Metersize.Value} ");
|
||||
sb.AppendLine($" and Metersize= {Metersize.Value} ");
|
||||
}
|
||||
if (!string.IsNullOrEmpty(Region))
|
||||
{
|
||||
sb.AppendLine($" and CordonelCurrentFw_Region ='{Region}' ");
|
||||
sb.AppendLine($" and Region ='{Region}' ");
|
||||
}
|
||||
if (ForProd.HasValue)
|
||||
{
|
||||
sb.AppendLine($" and CordonelCurrentFw_CurrentForProd ={(ForProd.Value ? "1" : "0") } ");
|
||||
sb.AppendLine($" and currentForProd ={(ForProd.Value ? "1" : "0") } ");
|
||||
}
|
||||
if (Deleted.HasValue)
|
||||
{
|
||||
sb.AppendLine($" and CordonelCurrentFw_Deleted is {(Deleted.Value ? "not" : "")} null");
|
||||
sb.AppendLine($" and Deleted is {(Deleted.Value ? "not" : "")} null");
|
||||
}
|
||||
|
||||
var retDT = dataacces.ExecuteQuery(sb.ToString());
|
||||
@@ -518,9 +522,9 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
|
||||
foreach (DataRow item in retDT.Rows)
|
||||
{
|
||||
|
||||
var add = new CordonelFw() { Id = (int)item["CordonelCurrentFw_ID"] };
|
||||
add.Frequency = (int)item["CordonelCurrentFw_Frequency"];
|
||||
add.Name = (string)item["CordonelCurrentFw_Name"];
|
||||
var add = new CordonelFw() { Id = (int)item["Id"] };
|
||||
add.RadioFrequencyMhz = (int)item["RadioFrequencyMhz"];
|
||||
add.Name = (string)item["Name"];
|
||||
|
||||
add.FileName = "";
|
||||
|
||||
@@ -530,35 +534,32 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
|
||||
}
|
||||
|
||||
|
||||
if (item["CordonelCurrentFw_Deleted"].GetType() != typeof(DBNull))
|
||||
if (item["Deleted"].GetType() != typeof(DBNull))
|
||||
{
|
||||
add.DeletedDate = (DateTime)item["CordonelCurrentFw_Deleted"];
|
||||
add.DeletedDate = (DateTime)item["Deleted"];
|
||||
}
|
||||
|
||||
add.AppID = (int)item["CordonelCurrentFw_AppID"];
|
||||
add.Version = (int)item["CordonelCurrentFw_Version"];
|
||||
|
||||
add.Metersize = (Int16)item["CordonelCurrentFw_Metersize"];
|
||||
add.LutFileID = null;
|
||||
if (item["CordonelCurrentFw_LutFileID"].GetType() != typeof(DBNull))
|
||||
{
|
||||
add.LutFileID = (Int16)item["CordonelCurrentFw_LutFileID"];
|
||||
}
|
||||
add.FlexnetAppId = (int)item["FlexnetAppId"];
|
||||
add.Version = (int)item["Version"];
|
||||
|
||||
add.Metersize = (Int16)item["Metersize"];
|
||||
|
||||
|
||||
|
||||
add.FileClusterStoreId = null;
|
||||
if (item["CordonelCurrentFw_FileClusterStoreId"].GetType() != typeof(DBNull))
|
||||
if (item["FileClusterStoreId"].GetType() != typeof(DBNull))
|
||||
{
|
||||
add.FileClusterStoreId = (int)item["CordonelCurrentFw_FileClusterStoreId"];
|
||||
add.FileClusterStoreId = (int)item["FileClusterStoreId"];
|
||||
}
|
||||
add.CurrentForProd = false;
|
||||
if (item["CordonelCurrentFw_CurrentForProd"].GetType() != typeof(DBNull))
|
||||
if (item["CurrentForProd"].GetType() != typeof(DBNull))
|
||||
{
|
||||
|
||||
add.CurrentForProd = (bool)item["CordonelCurrentFw_CurrentForProd"];
|
||||
add.CurrentForProd = (bool)item["CurrentForProd"];
|
||||
}
|
||||
|
||||
|
||||
switch ((string)item["CordonelCurrentFw_Region"].ToString())
|
||||
|
||||
switch ((string)item["Region"].ToString())
|
||||
{
|
||||
case "emea":
|
||||
add.Region = Logic.ProductionOrderCore.OrderData.Region.EMEA;
|
||||
@@ -572,7 +573,57 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
|
||||
default:
|
||||
add.Region = Logic.ProductionOrderCore.OrderData.Region.EMEA;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
add.CoreRevisionMin = null;
|
||||
if (item["CoreRevisionMin"].GetType() != typeof(DBNull))
|
||||
{
|
||||
|
||||
add.CoreRevisionMin = (int)item["CoreRevisionMin"];
|
||||
}
|
||||
|
||||
add.CoreRevisionMax = null;
|
||||
if (item["CoreRevisionMax"].GetType() != typeof(DBNull))
|
||||
{
|
||||
|
||||
add.CoreRevisionMin = (int)item["CoreRevisionMax"];
|
||||
}
|
||||
add.MetrologyVersion = null;
|
||||
if (item["MetrologyVersion"].GetType() != typeof(DBNull))
|
||||
{
|
||||
|
||||
add.CoreRevisionMin = (int)item["MetrologyVersion"];
|
||||
}
|
||||
|
||||
|
||||
add.IsReleased = false;
|
||||
if (item["IsReleased"].GetType() != typeof(DBNull))
|
||||
{
|
||||
|
||||
add.IsReleased = (bool)item["IsReleased"];
|
||||
}
|
||||
add.ReleaseDate = null;
|
||||
if (item["ReleaseDate"].GetType() != typeof(DBNull))
|
||||
{
|
||||
|
||||
add.ReleaseDate = (DateTime)item["ReleaseDate"];
|
||||
}
|
||||
|
||||
|
||||
add.Remark = "blalb";
|
||||
if (item["Remark"].GetType() != typeof(DBNull))
|
||||
{
|
||||
|
||||
add.Remark = (String)item["Remark"];
|
||||
}
|
||||
|
||||
|
||||
|
||||
ret.Add(add);
|
||||
}
|
||||
return Request.CreateResponse(HttpStatusCode.OK, ret);
|
||||
|
||||
Reference in New Issue
Block a user