Changes for 620 meters, OrderInfo is updated in DataEntry.S620 form session.
This commit is contained in:
@@ -132,49 +132,12 @@ namespace TBF.Rig.DataEntry.S620
|
||||
|
||||
delegate void EntryFormDlgt(EntryForm myRef);
|
||||
///
|
||||
void UpdateOrderWorkflow(out string order, out string workflow)
|
||||
{
|
||||
if (ProcessData.OrderInfo is SharedDatabase.Entities.OrderInfo && ProcessData.TracingDB != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
ISession session = ProcessData.TracingDB.SessionFactory.OpenSession();
|
||||
order = Program.MainWnd.SelectedProcedure.OrderInfo.POName;
|
||||
var list = session.QueryOver<SharedDatabase.Entities.OrderInfo>()
|
||||
.Where(x => (x.POName == Program.MainWnd.SelectedProcedure.OrderInfo.POName))
|
||||
.List();
|
||||
ProcessData.OrderInfo = (list.Count == 1) ? list[0] : null;
|
||||
workflow = (list.Count == 1) ? list[0].Workflow : null;
|
||||
ProcessData.WorkflowSummary = SharedDatabase.WorkflowSummary.ReadFromDB(workflow, "test", session);
|
||||
session.Close();
|
||||
}
|
||||
catch (Exception exc)
|
||||
{
|
||||
order = string.Empty;
|
||||
workflow = string.Empty;
|
||||
ProcessData.OrderInfo = null;
|
||||
ProcessData.WorkflowSummary = null;
|
||||
|
||||
log.ErrorFormat("Unable to load order, workflow or workstep: {0}", exc.Message);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
order = string.Empty;
|
||||
workflow = string.Empty;
|
||||
ProcessData.OrderInfo = null;
|
||||
ProcessData.WorkflowSummary = null;
|
||||
}
|
||||
}
|
||||
///
|
||||
void OnCycleStart(EntryForm myRef)
|
||||
{
|
||||
if (entryFormCfg.ProductionTracing)
|
||||
{
|
||||
string order, workflow;
|
||||
UpdateOrderWorkflow(out order, out workflow);
|
||||
myRef.modelessDlg = new FormForMechanicalMetersWithTracing(waterMeters, entryFormCfg.MaxWMsCount, entryFormCfg.CloseButton, false,
|
||||
true, entryFormCfg.OrdersFromProdTracing, order, workflow);
|
||||
true, entryFormCfg.OrdersFromProdTracing);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -189,10 +152,8 @@ namespace TBF.Rig.DataEntry.S620
|
||||
{
|
||||
if (entryFormCfg.ProductionTracing)
|
||||
{
|
||||
string order, workflow;
|
||||
UpdateOrderWorkflow(out order, out workflow);
|
||||
myRef.modelessDlg = new FormForMechanicalMetersWithTracing(waterMeters, entryFormCfg.MaxWMsCount, entryFormCfg.CloseButton, true,
|
||||
true, entryFormCfg.OrdersFromProdTracing, order, workflow);
|
||||
true, entryFormCfg.OrdersFromProdTracing);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user