michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Production tracing clean-up, ver. 3.1.1848

Browse Source
This commit is contained in:
Milan Hanajik
2022-01-12 07:53:03 +01:00
parent 2f1a8cc9d6
commit 1af0b71503
8 changed files with 88 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.1.1847.0")]
[assembly: AssemblyFileVersion("3.1.1847.0")]
[assembly: AssemblyVersion("3.1.1848.0")]
[assembly: AssemblyFileVersion("3.1.1848.0")]
TBF/Rig/DataEntry/S620/EntryForm.cs
+7 -2
View File
@@ -146,8 +146,13 @@ namespace TBF.Rig.DataEntry.S620
try
{
ISession session = ProcessData.TracingDB.SessionFactory.OpenSession();
ProcessData.Workflow = ProcessData.TracingDB.GetWorkflowAndWorkstep(ProcessData.OrderInfo, out ProcessData.Workstep,
out ProcessData.PreviousStepName, out ProcessData.Part1Name, out ProcessData.Part2Name, session);
ProcessData.Workflow = SharedDatabase.TracingDB
.GetWorkflowAndWorkstep((ProcessData.OrderInfo != null) ? ProcessData.OrderInfo.POName : null, "test",
out ProcessData.Workstep,
out ProcessData.PreviousStepName,
out ProcessData.Part1Name,
out ProcessData.Part2Name,
session);
session.Close();
order = ProcessData.OrderInfo.POName;
workflow = ProcessData.Workflow.Name;
TBF/Rig/DataEntry/iPerl/CycleBeginningForm.cs
+7 -2
View File
@@ -242,8 +242,13 @@ namespace TBF.Rig.DataEntry.iPerl
{
ISession session = ProcessData.TracingDB.SessionFactory.OpenSession();
ProcessData.OrderInfo = ProcessData.TracingDB.ReReadOneOrder(oInfo as SharedDatabase.Entities.OrderInfo, session);
ProcessData.Workflow = ProcessData.TracingDB.GetWorkflowAndWorkstep(ProcessData.OrderInfo, out ProcessData.Workstep,
out ProcessData.PreviousStepName, out ProcessData.Part1Name, out ProcessData.Part2Name, session);
ProcessData.Workflow = SharedDatabase.TracingDB
.GetWorkflowAndWorkstep((ProcessData.OrderInfo != null) ? ProcessData.OrderInfo.POName : null, "test",
out ProcessData.Workstep,
out ProcessData.PreviousStepName,
out ProcessData.Part1Name,
out ProcessData.Part2Name,
session);
session.Close();
}
catch (Exception exc)
TBF/Rig/Output/DB/ProductionTracing/Tracing.cs
+1 -50
View File
@@ -199,58 +199,9 @@ namespace TBF.Rig.Output.DB.ProductionTracing
session.Flush();
}
}
public void StopDevice2() {}
public Process GetWorkflowAndWorkstep(IOrderInfo order, out Workstep workstep, out string previousStepName,
out string part1name, out string part2name, ISession session = null)
{
bool openAndCloseSession = (session == null) || !session.IsOpen;
workstep = null;
previousStepName = null;
part1name = null;
part2name = null;
if (order is OrderInfo)
{
string workflowName = (order as OrderInfo).Workflow;
try
{
if (openAndCloseSession) session = SessionFactory.OpenSession();
var wflows = session.QueryOver<Process>()
.Where(x => x.Name == workflowName)
.And(x => (x.ReleaseStatus == ReleaseStatus.ToBeApproved ||
x.ReleaseStatus == ReleaseStatus.Released ||
x.ReleaseStatus == ReleaseStatus.ReleasedActive))
.List();
if (wflows.Count == 1)
{
workstep = wflows[0].Worksteps.FirstOrDefault(x => x.Name.ToLower().Contains("test"));
int previousStepNr = workstep.WorkstepNr - 1;
var previousStep = (previousStepNr < 1) ? null : wflows[0].Worksteps.FirstOrDefault(x => x.WorkstepNr == previousStepNr);
var part1 = wflows[0].Parts.FirstOrDefault(x => x.StepNumber == 1);
var part2 = wflows[0].Parts.FirstOrDefault(x => x.StepNumber == 2);
if (previousStep != null) previousStepName = previousStep.Name;
if (part1 != null) part1name = part1.Name;
if (part2 != null) part2name = part2.Name;
}
if (openAndCloseSession) session.Close();
if (wflows.Count == 1)
{
return wflows[0]; /// Successful
}
}
catch (Exception exc)
{
log.ErrorFormat("GetWorkflow({0}) failed: {1}", order, exc.Message);
}
}
return null;
}
public IList<OrderInfo> ReadOrders(ISession session = null)
{
bool openAndCloseSession = (session == null) || !session.IsOpen;
TBF/Rig/Sequences/MainSeq.cs
+7 -3
View File
@@ -229,9 +229,13 @@ namespace TBF.Rig.Sequences
ISession session = ProcessData.TracingDB.SessionFactory.OpenSession();
ProcessData.OrderInfo = ProcessData.TracingDB
.ReReadOneOrder(Program.MainWnd.SelectedProcedure.OrderInfo as SharedDatabase.Entities.OrderInfo, session);
ProcessData.Workflow = ProcessData.TracingDB
.GetWorkflowAndWorkstep(ProcessData.OrderInfo, out ProcessData.Workstep, out ProcessData.PreviousStepName,
out ProcessData.Part1Name, out ProcessData.Part2Name, session);
ProcessData.Workflow = SharedDatabase.TracingDB
.GetWorkflowAndWorkstep((ProcessData.OrderInfo != null) ? ProcessData.OrderInfo.POName : null, "test",
out ProcessData.Workstep,
out ProcessData.PreviousStepName,
out ProcessData.Part1Name,
out ProcessData.Part2Name,
session);
session.Close();
}
catch (Exception exc)
TBF/Rig/Sequences/ProcessData.cs
+5 -5
View File
@@ -38,11 +38,11 @@ namespace TBF.Rig.Sequences
public static TBF.UI.ProcedureInfo SelectedProcedure;
public static Common.IOrderInfo OrderInfo;
///
public static SharedDatabase.Entities.Process Workflow;
public static SharedDatabase.Entities.Workstep Workstep;
public static string PreviousStepName;
public static string Part1Name;
public static string Part2Name;
public static SharedDatabase.Entities.Process Workflow; /// Selected production tracing workflow
public static SharedDatabase.Entities.Workstep Workstep; /// Selected production tracing workstep
public static string PreviousStepName; /// Previous workstep name
public static string Part1Name; /// 1st reference part name
public static string Part2Name; /// 2nd reference part name or null
///
/// Test related (instance) variables.
TBF/Rig/TestMethods/S640Communication/S640CommForm.cs
+4 -4
View File
@@ -959,8 +959,8 @@ namespace TBF.Rig.TestMethods.S640Communication
wm.Suffix = order.SNSuffix;
wm.CompleteSerialNr = string.Empty;
assignedSNs[i].Text = wm.CompleteSerialNr;
assignedRadioAddresses[i].Text = wm.RadioAddress;
assignedSNs[i].Text = string.Empty;
assignedRadioAddresses[i].Text = string.Empty;
}
else if (order.CurrentPcsCount >= order.PiecesCount)
{
@@ -971,8 +971,8 @@ namespace TBF.Rig.TestMethods.S640Communication
wm.Suffix = order.SNSuffix;
wm.CompleteSerialNr = string.Empty;
assignedSNs[i].Text = wm.CompleteSerialNr;
assignedRadioAddresses[i].Text = wm.RadioAddress;
assignedSNs[i].Text = string.Empty;
assignedRadioAddresses[i].Text = string.Empty;
}
else
{