Change Password procces
This commit is contained in:
@@ -155,7 +155,7 @@
|
||||
</site>
|
||||
<site name="MeterProcessState" id="2">
|
||||
<application path="/" applicationPool="Clr4IntegratedAppPool">
|
||||
<virtualDirectory path="/" physicalPath="D:\Projekte\SENSUS_GitLab\laa_production\Common\Service\MeterProcessState" />
|
||||
<virtualDirectory path="/" physicalPath="C:\Users\drabesch_ro\Repo\lab\la_operations\laa_production\Common\Service\MeterProcessState" />
|
||||
</application>
|
||||
<bindings>
|
||||
<binding protocol="http" bindingInformation="*:56011:localhost" />
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -71,7 +71,7 @@ namespace Xylem.Common.Metrology.Measurements
|
||||
|
||||
//for calibration the RefVolumeCm is essential, the refTimeS is needed for flying start/stop
|
||||
var measurementResult = GetFinalMeasurementResult(refVolumeCm, refTimeS);
|
||||
|
||||
//todo recalcualted
|
||||
//adjust the calibration scale factor to the required deviation
|
||||
return measurementResult.ScaleFactorRefToDut * reqDeviationRel;
|
||||
}
|
||||
|
||||
@@ -71,6 +71,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
|
||||
var url = $"{ServiceUrls.GenesisFinalCheckServiceUrl()}GetProgrammingParameters?PcbID={base.Meter.PcbId}";
|
||||
var csdRet = LocalWebRequest.GetRequest(url, 80000);
|
||||
|
||||
|
||||
return Newtonsoft.Json.JsonConvert.DeserializeObject<IList<ProgrammingParameters>>(csdRet);
|
||||
|
||||
}
|
||||
|
||||
+2
-3
@@ -58,8 +58,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
|
||||
|
||||
public override void StartProcess()
|
||||
{
|
||||
base.currentProcessState = ProductionProcessState.Done;
|
||||
return;
|
||||
|
||||
bool ret = RequestPassword();
|
||||
updateImage(UserControl.RequestPassword, ret);
|
||||
base.Progress = base.Progress + 16;
|
||||
@@ -187,7 +186,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
|
||||
var passwordSetServiceUrl = ServiceUrls.GenesisSetPasswordServiceUrl();
|
||||
|
||||
|
||||
var responseJson = LocalWebRequest.GetRequest(passwordSetServiceUrl + Meter.PcbId + "&Password=" + newPs + "&keepOldPw=true", 8000);
|
||||
var responseJson = LocalWebRequest.GetRequest(passwordSetServiceUrl + Meter.PcbId + "&Password=" + newPs , 8000);
|
||||
if (responseJson.ToLower().Contains("store"))
|
||||
{
|
||||
return true;
|
||||
|
||||
@@ -39,21 +39,15 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
if (keepOldPw == true)
|
||||
{
|
||||
throw new ApplicationException("Not Suppoted keepOldPw");
|
||||
}
|
||||
using (var dataAccess = new SqlDataAccess(GlobalConfig.connectionString.Value))
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
if (keepOldPw)
|
||||
{
|
||||
sb.AppendLine(
|
||||
$"update auftrag.dbo.Genesis_PcbPassword set KitronSkeletonKey = [password] , [password] ='{password}' where PcbId='{PcbId}'");
|
||||
}
|
||||
else
|
||||
{
|
||||
sb.AppendLine(
|
||||
$"Insert into dbo.Genesis_PcbPassword(PcbId, [password]) values('{PcbId}', '{password}')");
|
||||
|
||||
}
|
||||
sb.AppendLine($"update auftrag.dbo.Genesis_PcbPassword set [password] ='{password}' where PcbId='{PcbId}'");
|
||||
|
||||
|
||||
var dt = dataAccess.ExecuteQuery(sb.ToString());
|
||||
|
||||
@@ -1956,7 +1956,7 @@ namespace XylemCommonUiLegacyGenCtl
|
||||
try
|
||||
{
|
||||
var genesis = (GenesisMeter)baseMeter;
|
||||
genesis.QuickLogin();
|
||||
genesis.ReLogin();
|
||||
genesis.BuildAndCheckCalibFactorsAllChannels(StoreRefVolume, StoreTestTimeRef, calFactor);
|
||||
|
||||
//genesis.SetCalibFactorsAllChannels(true);
|
||||
|
||||
Reference in New Issue
Block a user