浏览代码

Fixing bugs

Kenric Nugteren 3 周之前
父节点
当前提交
36acd5e5af

+ 1 - 1
prs.desktop/Panels/PickingLists/PickingListPanel.xaml.cs

@@ -360,7 +360,7 @@ public partial class PickingListPanel : UserControl, IPanel<PickingList>
                     : "Select Employee";
     }
 
-    private void Requisitions_OnSelectItem(object sender, DynamicGridSelectionEventArgs e)
+    private void PickingLists_OnSelectItem(object sender, DynamicGridSelectionEventArgs e)
     {
         _pickingList = e.Rows?.FirstOrDefault()?.ToObject<PickingList>();
         LoadRequisition();

+ 38 - 0
prs.shared/Database Update Scripts/Update_8_58.cs

@@ -664,6 +664,35 @@ internal class Update_8_58 : DatabaseUpdateScript
 
         provider.Save(settings);
     }
+    private static void ConvertSettingsKey<TSettings, T>(IProvider provider, string fromKey, string toKey)
+        where TSettings : Entity, IDatabaseStoredSettings, new()
+    {
+        var settings = provider.Query(
+            Filter<TSettings>.Where(x => x.Section).IsEqualTo(typeof(T).Name)
+                .And(x => x.Key).IsEqualTo(fromKey),
+            Columns.None<TSettings>()
+                .Add(x => x.ID)
+                .Add(x => x.Key))
+            .ToArray<TSettings>();
+
+        foreach(var setting in settings)
+        {
+            setting.Key = toKey;
+        }
+
+        provider.Save(settings);
+    }
+    private static void ConvertSettingsKey<T>(IProvider provider, string fromKey, string toKey)
+    {
+        ConvertSettingsKey<GlobalSettings, T>(provider, fromKey, toKey);
+        ConvertSettingsKey<UserSettings, T>(provider, fromKey, toKey);
+    }
+
+    private static void ConvertColumnsTag(IProvider provider, string fromTag, string toTag)
+    {
+        ConvertSettingsKey<DynamicGridColumns>(provider, fromTag, toTag);
+        ConvertSettingsKey<DynamicGridColumns>(provider, $"{fromTag}:DirectEdit", $"{toTag}:DirectEdit");
+    }
 
     public override bool Update()
     {
@@ -678,6 +707,15 @@ internal class Update_8_58 : DatabaseUpdateScript
 
         ConvertSettings<UserSettings>(provider, "RequisitionSettings", "PickingListSettings");
 
+        ConvertColumnsTag(provider, nameof(Requisition), nameof(PickingList));
+        ConvertColumnsTag(provider, nameof(RequisitionItem), nameof(PickingListItem));
+        ConvertColumnsTag(provider, nameof(RequisitionDestination), nameof(PickingListDestination));
+        ConvertColumnsTag(provider, nameof(RequisitionDocument), nameof(PickingListDocument));
+        ConvertColumnsTag(provider, nameof(RequisitionKanban), nameof(PickingListKanban));
+
+        ConvertColumnsTag(provider, "PickingList.DeliveryRequi", "PickingList.DeliveryPickingList");
+        ConvertColumnsTag(provider, "RequisitionItem.RequisitionItem_Logistics", "PickingListItem.PickingListItem_Logistics");
+
         ConvertQAQuestions(provider);
 
         return true;