Compare commits

...

6 Commits

4 changed files with 34 additions and 23 deletions

View File

@@ -735,23 +735,27 @@ namespace RODBInterface
else else
parentValue = nd.InnerText; parentValue = nd.InnerText;
//applicValues = ""; if (parentName != "#whitespace")
applicValues = string.Format("<APL DefaultVal={0}", parentValue);
int pcChildIdx = 0;
//C2022-001 only save the child ro value in the RO.FST if it is different than the parent (default) value
foreach (string c in pcChildern)
{ {
//string csufx = CvtUserFldToFld(c); //applicValues = "";
pcChildIdx++; applicValues = string.Format("<APL DefaultVal={0}", parentValue);
string csufx = string.Format("_PCCHILD{0}", pcChildIdx); int pcChildIdx = 0;
//applicValues += ","; //C2022-001 only save the child ro value in the RO.FST if it is different than the parent (default) value
XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero foreach (string c in pcChildern)
applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
else
{ {
if (parentValue != cn.InnerText) //string csufx = CvtUserFldToFld(c);
applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, cn.InnerText); pcChildIdx++;
string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
//applicValues += ",";
XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero
applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
else
{
if (parentValue != cn.InnerText)
applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, cn.InnerText);
}
} }
} }
applicValues += " /APL>"; applicValues += " /APL>";

View File

@@ -18917,9 +18917,10 @@ GO
Copyright 2020 - Volian Enterprises, Inc. All rights reserved. Copyright 2020 - Volian Enterprises, Inc. All rights reserved.
*****************************************************************************/ *****************************************************************************/
/* /*
========================================================================================================== ==========================================================================================================
Author: Jake Ropar Author: Jake Ropar / Matthew Schill
Create Date: 06/23/2022 Create Date: 06/23/2022
Modify Date: 08/18/2025
Description: Finalizes Rofst Header Record / Updates LoadedDate if Success Description: Finalizes Rofst Header Record / Updates LoadedDate if Success
========================================================================================================== ==========================================================================================================
*/ */
@@ -18936,13 +18937,18 @@ GO
Set LoadedDate = GetDate() Set LoadedDate = GetDate()
Where RofstID = @RofstID; Where RofstID = @RofstID;
--always rebuild the rofst child and default indexes
DBCC DBREINDEX ('RofstChild');
DBCC DBREINDEX ('RofstDefaultValue');
-- Rebuild/Reorganize Indexes -- Rebuild/Reorganize Indexes
Exec [dbo].[vesp_UtilityCheckIndexes] 20.0, 5.0, 0, 1; Exec [dbo].[vesp_UtilityCheckIndexes] 20.0, 5.0, 0, 1;
Return; Return;
End End
Go GO
IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_RofstHeaderFinalizeLoad] Succeeded' IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_RofstHeaderFinalizeLoad] Succeeded'
ELSE PRINT 'Procedure Creation: [vesp_RofstHeaderFinalizeLoad] Error on Creation' ELSE PRINT 'Procedure Creation: [vesp_RofstHeaderFinalizeLoad] Error on Creation'
@@ -24377,8 +24383,8 @@ BEGIN TRY -- Try Block
DECLARE @RevDate varchar(255) DECLARE @RevDate varchar(255)
DECLARE @RevDescription varchar(255) DECLARE @RevDescription varchar(255)
set @RevDate = '08/13/2025 8:07 AM' set @RevDate = '08/18/2025 2:07 PM'
set @RevDescription = 'Improve Performance loading procedures with Alarms' set @RevDescription = 'Updated Index maintenance that occurs after RO FST Load to improve RO Performance'
Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription
PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

View File

@@ -1245,6 +1245,7 @@ namespace VEPROMS
using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi)) using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
{ {
prnDlg.OverwritePDF = false; // turn off overwriting of PDFs B2025-041
prnDlg.SelectedSlave = args.UnitIndex; prnDlg.SelectedSlave = args.UnitIndex;
prnDlg.MySessionInfo = MySessionInfo; prnDlg.MySessionInfo = MySessionInfo;
prnDlg.SetupForProcedure(); // Setup filename prnDlg.SetupForProcedure(); // Setup filename
@@ -1602,7 +1603,7 @@ namespace VEPROMS
{ {
using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi)) using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
{ {
prnDlg.OverwritePDF = false; // turn off overwriting of PDFs. prnDlg.OverwritePDF = false; // turn off overwriting of PDFs C2025-048.
prnDlg.SelectedSlave = pi.ProcedureConfig.SelectedSlave == 0 ? -1 : pi.ProcedureConfig.SelectedSlave; //added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit prnDlg.SelectedSlave = pi.ProcedureConfig.SelectedSlave == 0 ? -1 : pi.ProcedureConfig.SelectedSlave; //added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
prnDlg.MySessionInfo = MySessionInfo; prnDlg.MySessionInfo = MySessionInfo;
prnDlg.SetupForProcedure(); // Setup filename prnDlg.SetupForProcedure(); // Setup filename

View File

@@ -839,7 +839,7 @@ namespace VEPROMS.CSLA.Library
{ {
using (SqlCommand cmd = cn.CreateCommand()) using (SqlCommand cmd = cn.CreateCommand())
{ {
cmd.CommandTimeout = Database.DefaultTimeout; cmd.CommandTimeout = 0;
cmd.CommandType = CommandType.StoredProcedure; cmd.CommandType = CommandType.StoredProcedure;
cmd.CommandText = "vesp_RofstHeaderFinalizeLoad"; cmd.CommandText = "vesp_RofstHeaderFinalizeLoad";