diff --git a/EgwCoreLib.Lux.Data/Repository/Production/ProductionGroupRepository.cs b/EgwCoreLib.Lux.Data/Repository/Production/ProductionGroupRepository.cs
index 5f97bae9..9e5e582b 100644
--- a/EgwCoreLib.Lux.Data/Repository/Production/ProductionGroupRepository.cs
+++ b/EgwCoreLib.Lux.Data/Repository/Production/ProductionGroupRepository.cs
@@ -89,7 +89,7 @@
                                         newBal.Add(item.Key, new ProdMachineDetailDto());
                                     }
                                 }
-                                rawBalance = JsonConvert.SerializeObject(newBal);
+                                rawBalance = JsonConvert.SerializeObject(newBal.OrderBy(x => x.Key).ToList());
                             }
 
                             currRec.WorkGroupListRaw = rawBalance;
diff --git a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor
index 6fa5ba87..e738a3ca 100644
--- a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor
+++ b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor
@@ -174,7 +174,7 @@
                                                             </td>
                                                         }
                                                         <td class="text-end @TitleTableCss">
-                                                            @NumParts(item)
+                                                            @wld.Value.NumParts
                                                         </td>
                                                         <td class="text-end @TitleTableCss">
                                                             @DisplayDurata(item.TotalEstimTime)