Browse Source

Updated default Logikal SQL statements to better reflect color links

frogsoftware 2 months ago
parent
commit
d5364bdef7

+ 4 - 2
prs.desktop/Integrations/Logikal/Classes/LogikalComponent.cs

@@ -58,8 +58,10 @@ join
     elevations e on i.[elevationid] = e.[elevationid]
 left outer join
     suppliers s on a.[LK_SupplierID] = s.[SupplierID]
-left outer join
-    colors c on a.[lk_colorid] = c.[colorid] 
+left outer join colors c2
+    on trim(c2.[colorname]) = trim(Substr(a.[articlecode_ordercode],Instr(a.[articlecode_ordercode], '.') + 1))
+left outer join colors c
+    on c.[colorid] = coalesce(c2.[ColorID],a.[lk_ColorID])
 where
     a.[ArticleType] not in (5,7)
 group by 

+ 6 - 2
prs.desktop/Integrations/Logikal/Classes/LogikalGasket.cs

@@ -57,8 +57,12 @@ join
     elevations e on i.[elevationid] = e.[elevationid]
 left outer join
     suppliers s on a.[LK_SupplierID] = s.[SupplierID]
-left outer join
-    colors c on a.[lk_colorid] = c.[colorid] 
+left outer join colors c2
+    on trim(c2.[colorname]) = trim(Substr(a.[articlecode_ordercode],Instr(a.[articlecode_ordercode], '.') + 1))
+left outer join colors c2
+    on trim(c2.[colorname]) = trim(Substr(a.[articlecode_ordercode],Instr(a.[articlecode_ordercode], '.') + 1))
+left outer join colors c
+    on c.[colorid] = coalesce(c2.[ColorID],a.[lk_ColorID])
 where
     a.[ArticleType] in (5,7)
 group by 

+ 4 - 2
prs.desktop/Integrations/Logikal/Classes/LogikalProfile.cs

@@ -52,8 +52,10 @@ $@"select
     coalesce(s.[CustomerNo],s.[ActiveTitle]) as [{nameof(Supplier)}]
 from
     profiles p 
-left outer join
-    colors c on p.[lk_colorid] = c.[colorid]      
+left outer join colors c2
+    on trim(c2.[colorname]) = trim(Substr(p.[articlecode_ordercode],Instr(p.[articlecode_ordercode], '.') + 1))
+left outer join colors c
+    on c.[colorid] = coalesce(c2.[ColorID],p.[lk_ColorID])     
 join
     insertions i on p.[insertionid] = i.[insertionid]
 join