B2026-050 Problem when Approval with Duplicate Rev Numbers

Merge pull request 'B2026-051 Fix Error loading Display Ros when cannot find RO lookup' (#772 ) from B2026-051 into Development
good for testing phase
2026-05-26 07:01:43 -04:00 · 2026-05-22 11:34:31 -04:00 · 2026-05-22 11:07:57 -04:00 · 2026-05-19 09:24:09 -04:00
2 changed files with 86 additions and 4 deletions
@@ -5227,7 +5227,7 @@ CREATE PROCEDURE [dbo].[getRevisionByItemIDandRevisionNumberAndUnitID]
 WITH EXECUTE AS OWNER
 AS
 declare @RevisionID int
-set @RevisionID = (select revisionid from revisions rr cross apply rr.config.nodes('//Applicability') t1(r1) where itemid = @itemid and revisionnumber = @RevisionNumber and r1.value('@Index','int') = @UnitID)
+set @RevisionID = (select top 1 revisionid from revisions rr cross apply rr.config.nodes('//Applicability') t1(r1) where itemid = @itemid and revisionnumber = @RevisionNumber and r1.value('@Index','int') = @UnitID order by revisionid desc)
 	SELECT
 		[RevisionID],
 		[ItemID],
@@ -24908,6 +24908,88 @@ IF (@@Error = 0) PRINT 'Procedure Creation: getItemsWithNewROs Succeeded'
 ELSE PRINT 'Procedure Creation: getItemsWithNewROs Error on Creation'
 GO

+/****** Object: StoredProcedure [dbo].[getRevisionByItemIDandRevisionNumber] ******/
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[getRevisionByItemIDandRevisionNumber]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+DROP PROCEDURE [dbo].[getRevisionByItemIDandRevisionNumber];
+GO
+
+/*****************************************************************************
+   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
+       Copyright 2012 - Volian Enterprises, Inc. All rights reserved.
+*****************************************************************************/
+CREATE PROCEDURE [dbo].[getRevisionByItemIDandRevisionNumber]
+
+(
+	@ItemID int,
+	@RevisionNumber nvarchar(50)
+)
+WITH EXECUTE AS OWNER
+AS
+declare @RevisionID int
+set @RevisionID = (select top 1 revisionid from revisions where itemid = @itemid and revisionnumber = @RevisionNumber order by revisionid desc)
+	SELECT
+		[RevisionID],
+		[ItemID],
+		[TypeID],
+		[RevisionNumber],
+		[RevisionDate],
+		[Notes],
+		[Config],
+		[DTS],
+		[UserID],
+		[LastChanged],
+		(SELECT COUNT(*) FROM [Checks] WHERE [Checks].[RevisionID]=[Revisions].[RevisionID]) [CheckCount],
+		(SELECT COUNT(*) FROM [Versions] WHERE [Versions].[RevisionID]=[Revisions].[RevisionID]) [VersionCount]
+	FROM [Revisions]
+	WHERE [RevisionID]=@RevisionID
+
+	SELECT
+		[Checks].[CheckID],
+		[Checks].[RevisionID],
+		[Checks].[StageID],
+		[Checks].[ConsistencyChecks],
+		[Checks].[DTS],
+		[Checks].[UserID],
+		[Checks].[LastChanged],
+		[Stages].[Name] [Stage_Name],
+		[Stages].[Description] [Stage_Description],
+		[Stages].[IsApproved] [Stage_IsApproved],
+		[Stages].[DTS] [Stage_DTS],
+		[Stages].[UserID] [Stage_UserID]
+	FROM [Checks]
+		JOIN [Stages]  ON
+			[Stages].[StageID]=[Checks].[StageID]
+	WHERE
+		[Checks].[RevisionID]=@RevisionID
+
+
+	SELECT
+		[Versions].[VersionID],
+		[Versions].[RevisionID],
+		[Versions].[StageID],
+		[Versions].[DTS],
+		[Versions].[UserID],
+		[Versions].[LastChanged],
+		[Versions].[PDF],
+		[Versions].[SummaryPDF],
+		[Stages].[Name] [Stage_Name],
+		[Stages].[Description] [Stage_Description],
+		[Stages].[IsApproved] [Stage_IsApproved],
+		[Stages].[DTS] [Stage_DTS],
+		[Stages].[UserID] [Stage_UserID]
+	FROM [Versions]
+		JOIN [Stages]  ON
+			[Stages].[StageID]=[Versions].[StageID]
+	WHERE
+		[Versions].[RevisionID]=@RevisionID
+
+	RETURN
+
+-- Display the status of Proc creation
+IF (@@Error = 0) PRINT 'Procedure Creation: getRevisionByItemIDandRevisionNumber Succeeded'
+ELSE PRINT 'Procedure Creation: getRevisionByItemIDandRevisionNumber Error on Creation'
+GO
+
 /*
  ---------------------------------------------------------------------------
  |                       ADD New Code Before this Block                    |
@@ -24941,8 +25023,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)

-	set @RevDate = '04/21/2026 7:00 AM'
-	set @RevDescription = 'Store RO Modification date/time'
+	set @RevDate = '05/26/2026 7:00 AM'
+	set @RevDescription = 'Get Most Recent Revision when Duplicates'

 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription
@@ -714,7 +714,7 @@ namespace Volian.Controls.Library
 			if ((ROTypeFilter == E_ROValueType.Text || ROTypeFilter == E_ROValueType.All) && this.MyDvi != null && this.MyDvi.MultiUnitCount > 1)
 			{
 				// Add Unit Information Database if it doesn't exist
-				if (unitInfoNode == null)
+				if (unitInfoNode == null && MyROFSTLookup != null)
 				{
 					TreeNode tnn = tvROFST.Nodes.Add("Unit Information");
 					TreeNode cn = null;
Author	SHA1	Message	Date
mschill	4608c05df0	B2026-050 Problem when Approval with Duplicate Rev Numbers	2026-05-26 07:01:43 -04:00
jjenko	56ff5a0213	Merge pull request 'B2026-051 Fix Error loading Display Ros when cannot find RO lookup' (#772 ) from B2026-051 into Development good for testing phase	2026-05-22 11:34:31 -04:00
mschill	014fde301c	B2026-051 Fix Error loading Display Ros when cannot find RO lookup	2026-05-22 11:07:57 -04:00
jjenko	0080a42423	Merge pull request 'C2026-008 - Re-Architect RO.FST to include RO Modification date/time and use those when updating ROs from the RO.FST' (#756 ) from C2026-008 into Development Reviewed-on: #756 Reviewed-by: John Jenko <jjenko@volian.com> This was pre-tested prior to this merge.	2026-05-19 09:24:09 -04:00