Browse Source

Changed default Logikal Component.PackSize query to 1.0
Fixed default Logikal LabourType
Logikal BOM Import now sets UnitCost

frankvandenbos 11 months ago
parent
commit
b66991bc94

+ 2 - 2
prs.classes/Entities/Logikal/LogikalComponent.cs

@@ -18,7 +18,7 @@ namespace Comal.Classes
             "select \n" +
             "select \n" +
             $"  a.[ArticleCode_BaseNumber] as {nameof(Code)}, \n" +
             $"  a.[ArticleCode_BaseNumber] as {nameof(Code)}, \n" +
             $"  a.[description] as {nameof(Description)}, \n" +
             $"  a.[description] as {nameof(Description)}, \n" +
-            $"  a.[PUSize] as {nameof(PackSize)}, \n" +
+            $"  1.0 as {nameof(PackSize)}, \n" +
             $"  a.[units] as {nameof(Quantity)}, \n" +
             $"  a.[units] as {nameof(Quantity)}, \n" +
             $"  a.[Price] as {nameof(Cost)} \n" +
             $"  a.[Price] as {nameof(Cost)} \n" +
             "from \n" +
             "from \n" +
@@ -30,7 +30,7 @@ namespace Comal.Classes
             "select \n" +
             "select \n" +
             $"  a.[ArticleCode_BaseNumber] as {nameof(Code)}, \n" +
             $"  a.[ArticleCode_BaseNumber] as {nameof(Code)}, \n" +
             $"  a.[description] as {nameof(Description)}, \n" +
             $"  a.[description] as {nameof(Description)}, \n" +
-            $"  a.[PUSize] as {nameof(PackSize)}, \n" +
+            $"  1.0 as {nameof(PackSize)}, \n" +
             $"  a.[units] as {nameof(Quantity)}, \n" +
             $"  a.[units] as {nameof(Quantity)}, \n" +
             $"  a.[Price] as {nameof(Cost)} \n" +
             $"  a.[Price] as {nameof(Cost)} \n" +
             "from \n" +
             "from \n" +

+ 1 - 1
prs.classes/Entities/Logikal/LogikalLabour.cs

@@ -14,7 +14,7 @@ namespace Comal.Classes
 
 
         public static String SQL =
         public static String SQL =
             "select \n" +
             "select \n" +
-            $"  t.[labourtimeid] as {nameof(Code)}, \n" +
+            $"  cast(t.[labourtimeid] as text) as {nameof(Code)}, \n" +
             $"  t.[name] as {nameof(Description)}, \n" +
             $"  t.[name] as {nameof(Description)}, \n" +
             $"  t.[totalminutes] as {nameof(Quantity)}, \n" +
             $"  t.[totalminutes] as {nameof(Quantity)}, \n" +
             $"  c.[price] as {nameof(Cost)} \n" +
             $"  c.[price] as {nameof(Cost)} \n" +

+ 1 - 0
prs.desktop/Utils/LogikalUtils/LogikalBillOfMaterialsImport.xaml.cs

@@ -160,6 +160,7 @@ public partial class LogikalBillOfMaterialsImport : Window
             {
             {
                 bomitem.BillOfMaterials.ID = _jobbom.ID;
                 bomitem.BillOfMaterials.ID = _jobbom.ID;
                 bomitem.Quantity = logikalitem.Quantity;
                 bomitem.Quantity = logikalitem.Quantity;
+                bomitem.UnitCost = logikalitem.Cost;
             }
             }
         );
         );
         Client.Save(_bomitems, "Imported From Logikal");
         Client.Save(_bomitems, "Imported From Logikal");