diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs index 640c1b0..c851f48 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs @@ -289,6 +289,9 @@ public class FruitBankDbContext : MgDbContextBase, shippingItem.MeasuredGrossWeight += shippingItemPallet.GrossWeight; } + shippingItem.MeasuredNetWeight = double.Round(shippingItem.MeasuredNetWeight, 1); + shippingItem.MeasuredGrossWeight = double.Round(shippingItem.MeasuredGrossWeight, 1); + //if (shippingItem.MeasuredQuantity < 0) shippingItem.MeasuredQuantity = 0; //if (!shippingItem.IsMeasurable || shippingItem.MeasuredNetWeight < 0) shippingItem.MeasuredNetWeight = 0; //if (!shippingItem.IsMeasurable || shippingItem.MeasuredGrossWeight < 0) shippingItem.MeasuredGrossWeight = 0; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDbTable.cs index df0f83e..17a037f 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDbTable.cs @@ -6,6 +6,7 @@ using Nop.Core.Configuration; using Nop.Core.Events; using Nop.Data; using Nop.Services.Logging; +using static LinqToDB.Reflection.Methods.LinqToDB.Insert; namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer; @@ -23,9 +24,11 @@ public class ShippingDbTable : MgDbTableBase { return loadRelations ? GetAll() - .LoadWith(sd => sd.ShippingDocuments).ThenLoad(si => si.ShippingItems).ThenLoad(sip => sip.ShippingItemPallets) - .LoadWith(sd => sd.ShippingDocuments).ThenLoad(sdtof => sdtof.ShippingDocumentToFiles).ThenLoad(f => f.ShippingDocumentFile) - .LoadWith(sd => sd.ShippingDocuments).ThenLoad(p => p.Partner) + .LoadWith(s => s.ShippingDocuments).ThenLoad(sd => sd.ShippingItems).ThenLoad(si => si.ShippingItemPallets) + .LoadWith(s => s.ShippingDocuments).ThenLoad(sd => sd.ShippingItems).ThenLoad(si => si.Pallet) + .LoadWith(s => s.ShippingDocuments).ThenLoad(sd => sd.ShippingItems).ThenLoad(si => si.Product) + .LoadWith(s => s.ShippingDocuments).ThenLoad(sd => sd.ShippingDocumentToFiles).ThenLoad(sdtof => sdtof.ShippingDocumentFile) + .LoadWith(s => s.ShippingDocuments).ThenLoad(sd => sd.Partner) : GetAll(); } diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDocumentDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDocumentDbTable.cs index 6d5bcbf..1c45bb3 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDocumentDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDocumentDbTable.cs @@ -24,7 +24,9 @@ public class ShippingDocumentDbTable : MgDbTableBase return loadRelations ? GetAll() .LoadWith(sd => sd.Shipping) - .LoadWith(sd => sd.ShippingItems).ThenLoad(sip => sip.ShippingItemPallets) + .LoadWith(sd => sd.ShippingItems).ThenLoad(si => si.Pallet) + .LoadWith(sd => sd.ShippingItems).ThenLoad(si => si.Product) + .LoadWith(sd => sd.ShippingItems).ThenLoad(si => si.ShippingItemPallets) .LoadWith(sd => sd.ShippingDocumentToFiles).ThenLoad(sdtof => sdtof.ShippingDocumentFile) .LoadWith(sd => sd.Partner) : GetAll(); diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingItemDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingItemDbTable.cs index 6c47805..2474eee 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingItemDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingItemDbTable.cs @@ -39,7 +39,8 @@ public class ShippingItemDbTable : MgDbTableBase .LoadWith(si => si.ShippingDocument).ThenLoad(sd => sd.ShippingDocumentToFiles).ThenLoad(sdtof => sdtof.ShippingDocumentFile) .LoadWith(si => si.ShippingItemPallets) .LoadWith(si => si.Product) - : GetAll().LoadWith(si => si.ShippingItemPallets).LoadWith(si => si.Product); + .LoadWith(si => si.Pallet) + : GetAll().LoadWith(si => si.ShippingItemPallets).LoadWith(si => si.Product).LoadWith(si => si.Pallet); } public IQueryable GetAllNotMeasured(bool loadRelations) @@ -59,6 +60,5 @@ public class ShippingItemDbTable : MgDbTableBase { shippingItem.MeasuredNetWeight = double.Round(shippingItem.MeasuredNetWeight, 1); shippingItem.MeasuredGrossWeight = double.Round(shippingItem.MeasuredGrossWeight, 1); - } } \ No newline at end of file diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingItemPalletDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingItemPalletDbTable.cs index e7aaf11..74517ec 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingItemPalletDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingItemPalletDbTable.cs @@ -34,10 +34,11 @@ public class ShippingItemPalletDbTable : MgDbTableBase { return loadRelations ? GetAll() - .LoadWith(sip => sip.ShippingItem).ThenLoad(si => si.ShippingDocument).ThenLoad(sd => sd.Shipping) - .LoadWith(sip => sip.ShippingItem).ThenLoad(si => si.ShippingDocument).ThenLoad(p => p.Partner) - .LoadWith(sip => sip.ShippingItem).ThenLoad(si => si.ShippingDocument).ThenLoad(sd => sd.ShippingDocumentToFiles).ThenLoad(sdtof => sdtof.ShippingDocumentFile) - .LoadWith(sip => sip.ShippingItem).ThenLoad(si => si.Product) + .LoadWith(sip => sip.ShippingItem) + //.LoadWith(sip => sip.ShippingItem).ThenLoad(si => si.ShippingDocument).ThenLoad(sd => sd.Shipping) + //.LoadWith(sip => sip.ShippingItem).ThenLoad(si => si.ShippingDocument).ThenLoad(p => p.Partner) + //.LoadWith(sip => sip.ShippingItem).ThenLoad(si => si.ShippingDocument).ThenLoad(sd => sd.ShippingDocumentToFiles).ThenLoad(sdtof => sdtof.ShippingDocumentFile) + //.LoadWith(sip => sip.ShippingItem).ThenLoad(si => si.Product) : GetAll(); } @@ -47,9 +48,10 @@ public class ShippingItemPalletDbTable : MgDbTableBase public IQueryable GetAllByShippingItemIdAsync(int shippingItemId, bool loadRelations) => GetAll(loadRelations).Where(sip => sip.ShippingItemId == shippingItemId); - private static void RoundMeasuredValue(ShippingItemPallet shippingItem) + private static void RoundMeasuredValue(ShippingItemPallet shippingItemPallet) { - shippingItem.NetWeight = double.Round(shippingItem.NetWeight, 1); - shippingItem.GrossWeight = double.Round(shippingItem.GrossWeight, 1); + shippingItemPallet.PalletWeight = double.Round(shippingItemPallet.PalletWeight, 1); + shippingItemPallet.NetWeight = double.Round(shippingItemPallet.NetWeight, 1); + shippingItemPallet.GrossWeight = double.Round(shippingItemPallet.GrossWeight, 1); } } \ No newline at end of file diff --git a/Nop.Plugin.Misc.AIPlugin/Mapping/NameCompatibility.cs b/Nop.Plugin.Misc.AIPlugin/Mapping/NameCompatibility.cs index b2b9ccf..dbd82f3 100644 --- a/Nop.Plugin.Misc.AIPlugin/Mapping/NameCompatibility.cs +++ b/Nop.Plugin.Misc.AIPlugin/Mapping/NameCompatibility.cs @@ -11,6 +11,7 @@ public partial class NameCompatibility : INameCompatibility /// public Dictionary TableNames => new Dictionary { + { typeof(Pallet), FruitBankConstClient.PalletDbTableName}, { typeof(Files), FruitBankConstClient.FilesDbTableName}, { typeof(Partner), FruitBankConstClient.PartnerDbTableName }, { typeof(Shipping), FruitBankConstClient.ShippingDbTableName },