From a1eeadeec438f7c5c6d31f190fee5c22f83dc6b0 Mon Sep 17 00:00:00 2001
From: Blake Matthes <cowchmonkey@gmail.com>
Date: Fri, 17 Apr 2026 16:46:44 -0500
Subject: [PATCH] fix(psi): refactor psi queries

---
 .gitignore                                    |  1 +
 .../queries/datamart.deliveryByDateRange.sql  | 14 ++--
 .../queries/datamart.psiDeliveryData.sql      | 78 ++++++++++++++++---
 package.json                                  |  3 +-
 4 files changed, 77 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index dc26466..1d2cb79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ builds
 .buildNumber
 temp
 brunoApi
+downloads
 .scriptCreds
 node-v24.14.0-x64.msi
 postgresql-17.9-2-windows-x64.exe
diff --git a/backend/prodSql/queries/datamart.deliveryByDateRange.sql b/backend/prodSql/queries/datamart.deliveryByDateRange.sql
index 5474ea4..af11aa8 100644
--- a/backend/prodSql/queries/datamart.deliveryByDateRange.sql
+++ b/backend/prodSql/queries/datamart.deliveryByDateRange.sql
@@ -13,12 +13,12 @@ r.[ArticleHumanReadableId]
 	  ,ea.JournalNummer as BOL_Number
       ,[ReleaseConfirmationState]
       ,[PlanningState]
-      --,format(r.[OrderDate], 'yyyy-MM-dd HH:mm') as OrderDate
-      ,r.[OrderDate]
-      --,FORMAT(r.[DeliveryDate], 'yyyy-MM-dd HH:mm') as DeliveryDate
-      ,r.[DeliveryDate]
-      --,FORMAT(r.[LoadingDate], 'yyyy-MM-dd HH:mm') as LoadingDate
-      ,r.[LoadingDate]
+      ,format(r.[OrderDate], 'yyyy-MM-dd HH:mm') as OrderDate
+      --,r.[OrderDate]
+      ,FORMAT(r.[DeliveryDate], 'yyyy-MM-dd HH:mm') as DeliveryDate
+      --,r.[DeliveryDate]
+      ,FORMAT(r.[LoadingDate], 'yyyy-MM-dd HH:mm') as LoadingDate
+      --,r.[LoadingDate]
       ,[Quantity]
       ,[DeliveredQuantity]
       ,r.[AdditionalInformation1]
@@ -66,9 +66,9 @@ ROW_NUMBER() OVER (PARTITION BY IdJournal ORDER BY add_date DESC) AS RowNum
  zz.IdLieferschein = ea.IdJournal
 
 where 
---r.ArticleHumanReadableId in ([articles]) 
 --r.ReleaseNumber = 1452
 
 r.DeliveryDate between @StartDate AND @EndDate
 and DeliveredQuantity > 0
+--and r.ArticleHumanReadableId in ([articles]) 
 --and Journalnummer = 169386
\ No newline at end of file
diff --git a/backend/prodSql/queries/datamart.psiDeliveryData.sql b/backend/prodSql/queries/datamart.psiDeliveryData.sql
index b69e0b0..32c8c1c 100644
--- a/backend/prodSql/queries/datamart.psiDeliveryData.sql
+++ b/backend/prodSql/queries/datamart.psiDeliveryData.sql
@@ -5,19 +5,75 @@ move this over to the delivery date range query once we have the shift data mapp
 
 update the psi stuff on this as well.
 **/
-declare @start_date nvarchar(30) = '[startDate]' --'2025-01-01'
-declare @end_date nvarchar(30) = '[endDate]' --'2025-08-09'
+DECLARE @StartDate DATE = '[startDate]' -- 2025-1-1
+DECLARE @EndDate DATE = '[endDate]' -- 2025-1-31
+SELECT 
+r.[ArticleHumanReadableId]
+      ,[ReleaseNumber]
+	  ,h.CustomerOrderNumber
+	  ,x.CustomerLineItemNumber
+      ,[CustomerReleaseNumber]
+      ,[ReleaseState]
+      ,[DeliveryState]
+	  ,ea.JournalNummer as BOL_Number
+      ,[ReleaseConfirmationState]
+      ,[PlanningState]
+      --,format(r.[OrderDate], 'yyyy-MM-dd HH:mm') as OrderDate
+      ,r.[OrderDate]
+      --,FORMAT(r.[DeliveryDate], 'yyyy-MM-dd HH:mm') as DeliveryDate
+      ,r.[DeliveryDate]
+      --,FORMAT(r.[LoadingDate], 'yyyy-MM-dd HH:mm') as LoadingDate
+      ,r.[LoadingDate]
+      ,[Quantity]
+      ,[DeliveredQuantity]
+      ,r.[AdditionalInformation1]
+      ,r.[AdditionalInformation2]
+      ,[TradeUnits]
+      ,[LoadingUnits]
+      ,[Trucks]
+      ,[LoadingToleranceType]
+      ,[SalesPrice]
+      ,[Currency]
+      ,[QuantityUnit]
+      ,[SalesPriceRemark]
+      ,r.[Remark]
+      ,[Irradiated]
+      ,r.[CreatedByEdi]
+      ,[DeliveryAddressHumanReadableId]
+	  ,DeliveryAddressDescription
+      ,[CustomerArtNo]
+      ,[TotalPrice]
+      ,r.[ArticleAlias]
 
+  FROM [order].[Release] (nolock) as r
 
-select  IdArtikelVarianten, 
-ArtikelVariantenBez,
-sum(Menge) totalDelivered,
-case when convert(time, upd_date) between '00:00' and '07:00' then convert(date, upd_date - 1) else convert(date, upd_date) end as ShippingDate
+ left join
+ [order].LineItem as x on 
 
-from dbo.V_LadePlanungenLadeAuftragAbruf (nolock)
+ r.LineItemId = x.id
 
-where upd_date between CONVERT(datetime, @start_date + ' 7:00') and CONVERT(datetime, @end_date + ' 7:00') 
-and IdArtikelVarianten in ([articles])
+ left join
+ [order].Header as h on
+ x.HeaderId = h.id
 
-group by IdArtikelVarianten, upd_date,
-ArtikelVariantenBez
\ No newline at end of file
+ --bol stuff
+ left join 
+ AlplaPROD_test1.dbo.V_LadePlanungenLadeAuftragAbruf (nolock) as zz 
+ on zz.AbrufIdAuftragsAbruf = r.ReleaseNumber
+
+ left join
+(select * from (SELECT 
+ROW_NUMBER() OVER (PARTITION BY IdJournal ORDER BY add_date DESC) AS RowNum
+,*
+  FROM [AlplaPROD_test1].[dbo].[T_Lieferungen] (nolock)) x
+
+  where  RowNum = 1) as ea on 
+ zz.IdLieferschein = ea.IdJournal
+
+where 
+r.ArticleHumanReadableId in ([articles]) 
+--r.ReleaseNumber = 1452
+
+and r.DeliveryDate between @StartDate AND @EndDate
+--and DeliveredQuantity > 0
+--and Journalnummer = 169386
diff --git a/package.json b/package.json
index 79ddfd0..d4437cc 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,8 @@
 		"version": "changeset version",
 		"specCheck": "node scripts/check-route-specs.mjs",
 		"commit": "cz",
-		"release": "commit-and-tag-version"
+		"release": "commit-and-tag-version",
+		"build:apk": "cd lstMobile && expo prebuild --clean && cd android && gradlew.bat assembleRelease "
 	},
 	"repository": {
 		"type": "git",