DataEntry.S620 bug fixes when invoked without an order (after restoring results).
This commit is contained in:
@@ -178,8 +178,8 @@ namespace TBF.Rig.DataEntry.S620
|
||||
{
|
||||
if (entryFormCfg.ProductionTracing)
|
||||
{
|
||||
string order = ProcessData.SelectedProcedure.OrderInfo.POName;
|
||||
string workflow = ProcessData.SelectedProcedure.Workflow;
|
||||
string order = (ProcessData.OrderInfo != null) ? ProcessData.OrderInfo.POName : string.Empty;
|
||||
string workflow = (ProcessData.Workflow != null) ? ProcessData.Workflow.Name : string.Empty;
|
||||
|
||||
myRef.modelessDlg = new FormForMechanicalMetersWithTracing(waterMeters, entryFormCfg.MaxWMsCount, entryFormCfg.CloseButton, true,
|
||||
true, entryFormCfg.OrdersFromProdTracing, order, workflow);
|
||||
|
||||
@@ -414,19 +414,24 @@ namespace TBF.Rig.DataEntry.S620
|
||||
/// <summary>
|
||||
/// Assign serial numbers
|
||||
/// </summary>
|
||||
/// <returns>true = s/n-s are assigned, false = order information or DB connection</returns>
|
||||
/// <returns>true = s/n-s are assigned, false = no order information or DB connection</returns>
|
||||
bool AssignSerialNumbers()
|
||||
{
|
||||
assignedSNs.Clear();
|
||||
|
||||
var order = ProcessData.OrderInfo;
|
||||
///
|
||||
|
||||
if (order == null)
|
||||
{
|
||||
return false; /// No order information available
|
||||
}
|
||||
|
||||
var oraOrder = order as TBF.Rig.Output.DB.SensusOracle.OrderDetails;
|
||||
if (oraOrder != null && (ProcessData.OracleDB == null || !ProcessData.OracleDB.ReadOrderDetails(ref oraOrder)))
|
||||
{
|
||||
return false; /// Oracle order details could not be loaded
|
||||
}
|
||||
|
||||
assignedSNs.Clear();
|
||||
|
||||
lastProducedPcsCount = order.CurrentPcsCount;
|
||||
lastAssignedSN = order.CurrentSN;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user