change url to new server
This commit is contained in:
@@ -45,7 +45,7 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
sb.AppendLine($"update auftrag.dbo.Genesis_PcbPassword set [password] ='{password}' where PcbId='{PcbId}'");
|
||||
sb.AppendLine($"update auftrag.dbo.Genesis_PcbPassword set [password] ='{password}' where PcbId='{PcbId}' ");
|
||||
|
||||
|
||||
var dt = dataAccess.ExecuteQuery(sb.ToString());
|
||||
|
||||
@@ -28,7 +28,7 @@ namespace Service.MeterProcessState.Controllers
|
||||
}
|
||||
|
||||
[Route("SetPressureStateDetailed"), HttpPost]
|
||||
public async Task<HttpResponseMessage> SetPressureStateDetailed([FromBody]PressureResultData testResult)
|
||||
public async Task<HttpResponseMessage> SetPressureStateDetailed([FromBody] PressureResultData testResult)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -128,7 +128,7 @@ namespace Service.MeterProcessState.Controllers
|
||||
var dt = dataacces.ExecuteQuery(query.ToString());
|
||||
|
||||
return "1";
|
||||
|
||||
|
||||
// return ((int)dt.Rows[0]["PressuretestNeeded"]).ToString();
|
||||
|
||||
}
|
||||
@@ -289,7 +289,7 @@ namespace Service.MeterProcessState.Controllers
|
||||
}
|
||||
|
||||
[Route("SetPressureState"), HttpPost]
|
||||
public async Task<HttpResponseMessage> SetPressureState(String PcbId, Int32 FertigungsauftragsNr, [FromBody]PressureTestResult testResult)
|
||||
public async Task<HttpResponseMessage> SetPressureState(String PcbId, Int32 FertigungsauftragsNr, [FromBody] PressureTestResult testResult)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -315,7 +315,7 @@ namespace Service.MeterProcessState.Controllers
|
||||
query.AppendLine(" ) ");
|
||||
query.AppendLine(" VALUES ");
|
||||
query.AppendLine($" ({PcbId} ");
|
||||
query.AppendLine($",{ FertigungsauftragsNr} ");
|
||||
query.AppendLine($",{FertigungsauftragsNr} ");
|
||||
query.AppendLine($" ,GETUTCDATE() ");
|
||||
query.AppendLine($" ,{ResultText} ");
|
||||
query.AppendLine($" ,0 ");
|
||||
@@ -406,66 +406,78 @@ namespace Service.MeterProcessState.Controllers
|
||||
{
|
||||
using (var dataacces = new SqlDataAccess(GlobalConfig.connectionString.Value))
|
||||
{
|
||||
var dt = dataacces.ExecuteQuery($"Insert into dbo.MeterProcessState (ProcessState_PcbId, [ProcessState_State],ProcessState_DateUtc ) values ({PcbId}, {code.GetHashCode()}, GETUTCDATE())");
|
||||
}
|
||||
if (!string.IsNullOrEmpty(version))
|
||||
{
|
||||
try
|
||||
if (version.ToLower() == "sentinel")
|
||||
{
|
||||
var fixDisplaycode = DisplayCodes.None;
|
||||
var SapCode = 0;
|
||||
if (Enum.TryParse<DisplayCodes>(code.ToString(), out fixDisplaycode))
|
||||
SaveSapState(PcbId, 310, version);
|
||||
SaveSapState(PcbId, 400, version);
|
||||
SaveSapState(PcbId, 997, version);
|
||||
SaveSapState(PcbId, 998, version);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
var dt = dataacces.ExecuteQuery($"Insert into dbo.MeterProcessState (ProcessState_PcbId, [ProcessState_State],ProcessState_DateUtc ) values ({PcbId}, {code.GetHashCode()}, GETUTCDATE())");
|
||||
}
|
||||
if (!string.IsNullOrEmpty(version))
|
||||
{
|
||||
try
|
||||
{
|
||||
switch (fixDisplaycode)
|
||||
var fixDisplaycode = DisplayCodes.None;
|
||||
var SapCode = 0;
|
||||
if (Enum.TryParse<DisplayCodes>(code.ToString(), out fixDisplaycode))
|
||||
{
|
||||
case DisplayCodes.None:
|
||||
case DisplayCodes.Error:
|
||||
case DisplayCodes.PressureTestedFailed:
|
||||
case DisplayCodes.PickingFailed:
|
||||
case DisplayCodes.FwUpdateActive:
|
||||
case DisplayCodes.FwUpdateFailed:
|
||||
case DisplayCodes.FwUpToDate:
|
||||
case DisplayCodes.FlowTestFailed:
|
||||
case DisplayCodes.FinalTestFailed:
|
||||
case DisplayCodes.PickingStarted:
|
||||
case DisplayCodes.FlowCalibrationOurOfRange:
|
||||
case DisplayCodes.ZeroFlowFailed:
|
||||
case DisplayCodes.FlowCalibrated:
|
||||
case DisplayCodes.PickingTested:
|
||||
default:
|
||||
break;
|
||||
switch (fixDisplaycode)
|
||||
{
|
||||
case DisplayCodes.None:
|
||||
case DisplayCodes.Error:
|
||||
case DisplayCodes.PressureTestedFailed:
|
||||
case DisplayCodes.PickingFailed:
|
||||
case DisplayCodes.FwUpdateActive:
|
||||
case DisplayCodes.FwUpdateFailed:
|
||||
case DisplayCodes.FwUpToDate:
|
||||
case DisplayCodes.FlowTestFailed:
|
||||
case DisplayCodes.FinalTestFailed:
|
||||
case DisplayCodes.PickingStarted:
|
||||
case DisplayCodes.FlowCalibrationOurOfRange:
|
||||
case DisplayCodes.ZeroFlowFailed:
|
||||
case DisplayCodes.FlowCalibrated:
|
||||
case DisplayCodes.PickingTested:
|
||||
default:
|
||||
break;
|
||||
|
||||
|
||||
case DisplayCodes.PressureTested:
|
||||
SapCode = 110;
|
||||
break;
|
||||
case DisplayCodes.Mounted:
|
||||
SapCode = 300;
|
||||
break;
|
||||
case DisplayCodes.ZeroFlow:
|
||||
SapCode = 120;
|
||||
break;
|
||||
case DisplayCodes.FlowTested:
|
||||
SapCode = 200;
|
||||
break;
|
||||
case DisplayCodes.PressureTested:
|
||||
SapCode = 110;
|
||||
break;
|
||||
case DisplayCodes.Mounted:
|
||||
SapCode = 300;
|
||||
break;
|
||||
case DisplayCodes.ZeroFlow:
|
||||
SapCode = 120;
|
||||
break;
|
||||
case DisplayCodes.FlowTested:
|
||||
SapCode = 200;
|
||||
break;
|
||||
|
||||
}
|
||||
if (SapCode != 0)
|
||||
{
|
||||
SaveSapState(PcbId, SapCode, version);
|
||||
}
|
||||
|
||||
}
|
||||
if (SapCode != 0)
|
||||
{
|
||||
SaveSapState(PcbId, SapCode, version);
|
||||
}
|
||||
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
|
||||
throw;
|
||||
}
|
||||
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
|
||||
throw;
|
||||
}
|
||||
|
||||
return Request.CreateResponse(HttpStatusCode.OK, await Task.Run(() => { return "store"; }));
|
||||
}
|
||||
return Request.CreateResponse(HttpStatusCode.OK, await Task.Run(() => { return "store"; }));
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -569,12 +581,12 @@ namespace Service.MeterProcessState.Controllers
|
||||
sb.AppendLine($" inner join [Auftrag].[dbo].[Fortschrittsrueckmeldung] ");
|
||||
sb.AppendLine($" sap on sap.FertigungsauftragNr = @order ");
|
||||
sb.AppendLine($" and c.ProgressFeedbackID = sap.id ");
|
||||
sb.AppendLine($" and sap.Vorgangsnr = @ProgressNr ");
|
||||
sb.AppendLine($" if @count =0 ");
|
||||
sb.AppendLine($" begin ");
|
||||
sb.AppendLine($" insert into [Auftrag].[dbo].[Fortschrittsrueckmeldung] ");
|
||||
sb.AppendLine($" and sap.Vorgangsnr = @ProgressNr and c.PcbID = @PcbID ");
|
||||
sb.AppendLine($" if @count =0 ");
|
||||
sb.AppendLine($" begin ");
|
||||
sb.AppendLine($" insert into [Auftrag].[dbo].[Fortschrittsrueckmeldung] ");
|
||||
sb.AppendLine($" select 'GNS', @order, 1, CURRENT_TIMESTAMP, @ProgressNr,null,0,null,0,'{version}','webrequest'; ");
|
||||
sb.AppendLine($" insert into Cordonel_ProgressFeedback ");
|
||||
sb.AppendLine($" insert into Cordonel_ProgressFeedback ");
|
||||
sb.AppendLine($" select @PcbID ,@@IDENTITY ");
|
||||
sb.AppendLine($" end ");
|
||||
sb.AppendLine($" select @count ");
|
||||
|
||||
Reference in New Issue
Block a user