refactor(datamart): changed the getDelbyDateRange to the new 2.0 way

2026-01-05 15:17:15 -06:00
parent 0dda6ae744
commit 46bf310dce
1 changed files with 140 additions and 63 deletions
--- a/lstV2/server/services/sqlServer/querys/dataMart/deleveryByDateRange.ts
+++ b/lstV2/server/services/sqlServer/querys/dataMart/deleveryByDateRange.ts
@@ -1,80 +1,157 @@
 export const deliveryByDateRange = `
-use AlplaPROD_test1
+use [test1_AlplaPROD2.0_Read]
+
 DECLARE @StartDate DATE = '[startDate]' -- 2025-1-1
 DECLARE @EndDate DATE = '[endDate]' -- 2025-1-31
-select * from
-(select (select wert from dbo.T_SystemParameter where Bezeichnung = 'Werkskuerzel') as Plant,
-AuftragsNummer as OrderNumber,
-PositionsNummer as CustomerLineNumber,
-AbrufNummer as CustomerReleaseNumber,
-CONVERT(date, AbrufLiefertermin) as DeliveryDate,
-CONVERT(DATE,JournalDatum) Bol_PrintDate,
-AbrufMenge AS OrderQuantity,
-AbrufMengeVPK as OrderPallets,
-GelieferteMenge AS DeliveredQTY,
-GelieferteMengeVPK as DeliverdPallets,
-JournalNummer as BOLNum,
-ProdArtikelBez AS ProductFamily,
-dbo.V_LadePlanungenLadeAuftragAbruf.AbrufIdKundenAdresse AS IdCustomer,
-dbo.V_LadePlanungenLadeAuftragAbruf.AdressBez AS CustName,
-dbo.T_EAIJournal.IdJournalStatus as bolStatus,
-V_TrackerAuftragsAbrufe.IdAuftragsAbruf as releaseNum,
-V_LadePlanungenLadeAuftragAbruf.IdLadeAuftrag as truckPostion
-,dbo.V_TrackerAuftragsAbrufe.IdArtikelvarianten as av
-,dbo.V_TrackerAuftragsAbrufe.ArtikelVariantenAlias as alias
-,'Base Plant' as plantType
-from dbo.V_TrackerAuftragsAbrufe (nolock)
+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

 left join
-dbo.V_LadePlanungenLadeAuftragAbruf on V_TrackerAuftragsAbrufe.IdAuftragsAbruf =
-dbo.V_LadePlanungenLadeAuftragAbruf.AbrufIdAuftragsAbruf
+ [order].LineItem as x on 
+
+ r.LineItemId = x.id

 left join
-dbo.T_EAIJournal on dbo.V_LadePlanungenLadeAuftragAbruf.IdLadeAuftrag =
-dbo.T_EAIJournal.IdLadeAuftrag
+ [order].Header as h on
+ x.HeaderId = h.id
+
+ --bol stuff
+ left join 
+ AlplaPROD_test1.dbo.V_LadePlanungenLadeAuftragAbruf (nolock) as zz 
+ on zz.AbrufIdAuftragsAbruf = r.ReleaseNumber

 left join
-dbo.V_ArtikelKomplett on V_TrackerAuftragsAbrufe.IdArtikelVarianten =
-dbo.V_ArtikelKomplett.IdArtikelvarianten
-where GelieferteMengeVPK > 0 AND (
-    AbrufLiefertermin IS NULL
-    OR CONVERT(date, JournalDatum) BETWEEN @StartDate AND @EndDate
-)
+(select * from (SELECT 
+ROW_NUMBER() OVER (PARTITION BY IdJournal ORDER BY add_date DESC) AS RowNum
+,*
+  FROM [AlplaPROD_test1].[dbo].[T_Lieferungen] (nolock)) x

-/*in house*/
-union all
+  where  RowNum = 1) as ea on 
+ zz.IdLieferschein = ea.IdJournal

-select top (50) (select wert from dbo.T_SystemParameter where Bezeichnung = 'Werkskuerzel') as Plant
-,[KundenAuftragsNummer] as OrderNumber
-,[KundenPositionsNummer] as CustomerLineNumber
-, null as CustomerReleaseNumber
-,CONVERT(date, i.Add_Date) as DeliveryDate
-,CONVERT(DATE,i.Upd_Date) Bol_PrintDate
-,null AS OrderQuantity
-,null as OrderPallets
-,LieferMengeVereinbart AS DeliveredQTY
-,null as DeliverdPallets
-,JournalNummer as BOLNum
-,null AS ProductFamily
-,IdAdresse AS IdCustomer
-,null AS CustName
-,null as bolStatus
-,null as releaseNum
-,null as truckPostion
-,i.IdArtikelVariante as av
-,null as alias
-,'In-House' as plantType
--,*
+where 
+--r.ArticleHumanReadableId in ([articles]) 
+--r.ReleaseNumber = 1452

-from [dbo].[T_InhouseLieferungen] as i (nolock)
+r.DeliveryDate between @StartDate AND @EndDate
+and DeliveredQuantity > 0
+--and Journalnummer = 169386

-where CONVERT(date, Upd_Date) BETWEEN @StartDate AND @EndDate
-) x
-
-
-order by Bol_PrintDate desc
 `;

+// export const deliveryByDateRange = `
+// use AlplaPROD_test1
+// DECLARE @StartDate DATE = '[startDate]' -- 2025-1-1
+// DECLARE @EndDate DATE = '[endDate]' -- 2025-1-31
+// select * from
+// (select (select wert from dbo.T_SystemParameter where Bezeichnung = 'Werkskuerzel') as Plant,
+// AuftragsNummer as OrderNumber,
+// PositionsNummer as CustomerLineNumber,
+// AbrufNummer as CustomerReleaseNumber,
+// CONVERT(date, AbrufLiefertermin) as DeliveryDate,
+// CONVERT(DATE,JournalDatum) Bol_PrintDate,
+// AbrufMenge AS OrderQuantity,
+// AbrufMengeVPK as OrderPallets,
+// GelieferteMenge AS DeliveredQTY,
+// GelieferteMengeVPK as DeliverdPallets,
+// JournalNummer as BOLNum,
+// ProdArtikelBez AS ProductFamily,
+// dbo.V_LadePlanungenLadeAuftragAbruf.AbrufIdKundenAdresse AS IdCustomer,
+// dbo.V_LadePlanungenLadeAuftragAbruf.AdressBez AS CustName,
+// dbo.T_EAIJournal.IdJournalStatus as bolStatus,
+// V_TrackerAuftragsAbrufe.IdAuftragsAbruf as releaseNum,
+// V_LadePlanungenLadeAuftragAbruf.IdLadeAuftrag as truckPostion
+// ,dbo.V_TrackerAuftragsAbrufe.IdArtikelvarianten as av
+// ,dbo.V_TrackerAuftragsAbrufe.ArtikelVariantenAlias as alias
+// ,'Base Plant' as plantType
+// from dbo.V_TrackerAuftragsAbrufe (nolock)
+
+// left join
+// dbo.V_LadePlanungenLadeAuftragAbruf on V_TrackerAuftragsAbrufe.IdAuftragsAbruf =
+// dbo.V_LadePlanungenLadeAuftragAbruf.AbrufIdAuftragsAbruf
+
+// left join
+// dbo.T_EAIJournal on dbo.V_LadePlanungenLadeAuftragAbruf.IdLadeAuftrag =
+// dbo.T_EAIJournal.IdLadeAuftrag
+
+// left join
+// dbo.V_ArtikelKomplett on V_TrackerAuftragsAbrufe.IdArtikelVarianten =
+// dbo.V_ArtikelKomplett.IdArtikelvarianten
+// where GelieferteMengeVPK > 0 AND (
+//     AbrufLiefertermin IS NULL
+//     OR CONVERT(date, JournalDatum) BETWEEN @StartDate AND @EndDate
+// )
+
+// /*in house*/
+// union all
+
+// select top (50) (select wert from dbo.T_SystemParameter where Bezeichnung = 'Werkskuerzel') as Plant
+// ,[KundenAuftragsNummer] as OrderNumber
+// ,[KundenPositionsNummer] as CustomerLineNumber
+// , null as CustomerReleaseNumber
+// ,CONVERT(date, i.Add_Date) as DeliveryDate
+// ,CONVERT(DATE,i.Upd_Date) Bol_PrintDate
+// ,null AS OrderQuantity
+// ,null as OrderPallets
+// ,LieferMengeVereinbart AS DeliveredQTY
+// ,null as DeliverdPallets
+// ,JournalNummer as BOLNum
+// ,null AS ProductFamily
+// ,IdAdresse AS IdCustomer
+// ,null AS CustName
+// ,null as bolStatus
+// ,null as releaseNum
+// ,null as truckPostion
+// ,i.IdArtikelVariante as av
+// ,null as alias
+// ,'In-House' as plantType
+// --,*
+
+// from [dbo].[T_InhouseLieferungen] as i (nolock)
+
+// where CONVERT(date, Upd_Date) BETWEEN @StartDate AND @EndDate
+// ) x
+
+// order by Bol_PrintDate desc
+// `;
+
 export const deliveryByDateRangeAndAv = `
 use [test1_AlplaPROD2.0_Read]