更新MybatisPlusSaasConfig中的租户ID默认值为1002；在ShiroConfig中添加MES密炼物料管理和系统分类字典的免密接口；在MesMixerMaterialController中实现密炼物料信息的免密增删改查接口，并添加相应的事件广播功能；在SysCategoryController中新增分类字典的免密查询接口；更新前端导航和菜单数据以支持密炼物料信息模块。

2026-05-07 09:47:39 +08:00
parent 25629f2df1
commit ce9dc8efd8
31 changed files with 1967 additions and 2 deletions
--- a/yy-admin-master/YY.Admin/Infrastructure/Hubs/StompWebSocketService.cs
+++ b/yy-admin-master/YY.Admin/Infrastructure/Hubs/StompWebSocketService.cs
@@ -138,6 +138,10 @@ public class StompWebSocketService : ISignalRService
                await SendFrameAsync(
                    BuildSubscribeFrame("sub-mes-weight-records", "/topic/sync/mes-weight-records"),
                    cancellationToken).ConfigureAwait(false);
+                // 密炼物料数据变更：订阅 /topic/sync/mes-mixer-materials
+                await SendFrameAsync(
+                    BuildSubscribeFrame("sub-mes-mixer-material", "/topic/sync/mes-mixer-materials"),
+                    cancellationToken).ConfigureAwait(false);

                // 订阅服务端 PONG 回复（应用层假在线检测）
                await SendFrameAsync(
--- a/yy-admin-master/YY.Admin/Module/NavigationExtensions.cs
+++ b/yy-admin-master/YY.Admin/Module/NavigationExtensions.cs
@@ -9,6 +9,7 @@ using YY.Admin.Views.Dialogs;
 using YY.Admin.Views.SysManage;
 using YY.Admin.Views.Customer;
 using YY.Admin.Views.Supplier;
+using YY.Admin.Views.MixerMaterial;
 using YY.Admin.ViewModels.Vehicle;
 using YY.Admin.Views.Vehicle;
 using YY.Admin.Views.WeightRecord;
@@ -52,6 +53,7 @@ namespace YY.Admin
            containerRegistry.RegisterForNavigation<MenuTreeView>();
            containerRegistry.RegisterForNavigation<UserManagementView>();
            containerRegistry.RegisterForNavigation<DataDictionaryManagementView>();
+            containerRegistry.RegisterForNavigation<CategoryDictionaryManagementView>();
            containerRegistry.RegisterForNavigation<RoleManagementView>();
            containerRegistry.RegisterForNavigation<TenantManagementView>();
            containerRegistry.RegisterForNavigation<MenuManagementView>();
@@ -66,6 +68,8 @@ namespace YY.Admin
            containerRegistry.RegisterForNavigation<WeightRecordListView>();
            // 地磅称重操作（大页面操作台）
            containerRegistry.RegisterForNavigation<WeightRecordOperationView>();
+            // 密炼物料信息
+            containerRegistry.RegisterForNavigation<MixerMaterialListView>();
        }
    }
    public class DialogWindow : Window, IDialogWindow
--- a/yy-admin-master/YY.Admin/Module/SyncModule.cs
+++ b/yy-admin-master/YY.Admin/Module/SyncModule.cs
@@ -15,6 +15,7 @@ using YY.Admin.Infrastructure.Storage;
 using YY.Admin.Infrastructure.Sync;
 using YY.Admin.Services.Service.Customer;
 using YY.Admin.Services.Service.Supplier;
+using YY.Admin.Services.Service.MixerMaterial;
 using YY.Admin.Services.Service.Vehicle;
 using YY.Admin.Services.Service.WeightRecord;

@@ -46,6 +47,9 @@ public class SyncModule : IModule
        // 磅单管理：免密 API 直连 + STOMP 实时通知
        containerRegistry.RegisterSingleton<IWeightRecordService, WeightRecordService>();
        containerRegistry.RegisterSingleton<WeightRecordSyncCoordinator>();
+        // 密炼物料信息：API直连 + STOMP实时通知
+        containerRegistry.RegisterSingleton<IMixerMaterialService, MixerMaterialService>();
+        containerRegistry.RegisterSingleton<MixerMaterialSyncCoordinator>();

        var serviceCollection = new ServiceCollection();
        serviceCollection.AddTransient<DisconnectGuardHandler>();
@@ -98,6 +102,8 @@ public class SyncModule : IModule
        _ = containerProvider.Resolve<SupplierSyncCoordinator>();
        // 强制实例化磅单同步协调器
        _ = containerProvider.Resolve<WeightRecordSyncCoordinator>();
+        // 强制实例化密炼物料同步协调器
+        _ = containerProvider.Resolve<MixerMaterialSyncCoordinator>();
    }

    private static IAsyncPolicy<HttpResponseMessage> GetRetryPolicy()
--- a/yy-admin-master/YY.Admin/ViewModels/Control/MenuTreeViewModel.cs
+++ b/yy-admin-master/YY.Admin/ViewModels/Control/MenuTreeViewModel.cs
@@ -54,6 +54,13 @@ namespace YY.Admin.ViewModels.Control
            ["/platform/dict"] = "DataDictionaryManagementView",
            ["sysDict"] = "DataDictionaryManagementView",

+            // 已实现页面：分类字典
+            ["CategoryDictionaryManagementView"] = "CategoryDictionaryManagementView",
+            ["/system/category"] = "CategoryDictionaryManagementView",
+            ["/system/category/index"] = "CategoryDictionaryManagementView",
+            ["/platform/category"] = "CategoryDictionaryManagementView",
+            ["sysCategory"] = "CategoryDictionaryManagementView",
+
            // 已实现页面：角色管理
            ["RoleManagementView"] = "RoleManagementView",
            ["/system/role"] = "RoleManagementView",
@@ -108,7 +115,12 @@ namespace YY.Admin.ViewModels.Control
            // 已实现页面：地磅称重操作
            ["WeightRecordOperationView"] = "WeightRecordOperationView",
            ["/xslmes/weightRecordOperation"] = "WeightRecordOperationView",
-            ["weightRecordOperation"] = "WeightRecordOperationView"
+            ["weightRecordOperation"] = "WeightRecordOperationView",
+
+            // 已实现页面：密炼物料信息
+            ["MixerMaterialListView"] = "MixerMaterialListView",
+            ["/xslmes/mesMixerMaterial"] = "MixerMaterialListView",
+            ["mesMixerMaterial"] = "MixerMaterialListView"
        };

        private MenuItem? _selectedMenuItem;
--- a/yy-admin-master/YY.Admin/ViewModels/MixerMaterial/MixerMaterialEditDialogViewModel.cs
+++ b/yy-admin-master/YY.Admin/ViewModels/MixerMaterial/MixerMaterialEditDialogViewModel.cs
@@ -0,0 +1,186 @@
+using HandyControl.Controls;
+using HandyControl.Tools.Extension;
+using System.Collections.ObjectModel;
+using YY.Admin.Core;
+using YY.Admin.Core.Entity;
+using YY.Admin.Core.Services;
+
+namespace YY.Admin.ViewModels.MixerMaterial;
+
+public class MixerMaterialEditDialogViewModel : BaseViewModel, IDialogResultable<bool>
+{
+    private readonly IMixerMaterialService _mixerMaterialService;
+
+    private MesMixerMaterial? _material;
+    public MesMixerMaterial? Material
+    {
+        get => _material;
+        set => SetProperty(ref _material, value);
+    }
+
+    public bool IsAddMode => string.IsNullOrWhiteSpace(Material?.Id);
+    public string DialogTitle => IsAddMode ? "新增密炼物料" : "编辑密炼物料";
+
+    public ObservableCollection<KeyValuePair<string, string>> MajorCategoryOptions { get; } = new();
+    public ObservableCollection<KeyValuePair<string, string>> MinorCategoryOptions { get; } = new();
+    public ObservableCollection<KeyValuePair<string, int>> FeedManageStatusOptions { get; } =
+    [
+        new("在投管", 1),
+        new("未投管", 0)
+    ];
+    public ObservableCollection<KeyValuePair<string, int>> UseStatusOptions { get; } =
+    [
+        new("使用中", 1),
+        new("停用", 0)
+    ];
+
+    private bool _result;
+    public bool Result { get => _result; set => SetProperty(ref _result, value); }
+    public Action? CloseAction { get; set; }
+
+    public DelegateCommand SaveCommand { get; }
+    public DelegateCommand CancelCommand { get; }
+    public DelegateCommand MajorCategoryChangedCommand { get; }
+
+    public MixerMaterialEditDialogViewModel(
+        IMixerMaterialService mixerMaterialService,
+        IContainerExtension container,
+        IRegionManager regionManager) : base(container, regionManager)
+    {
+        _mixerMaterialService = mixerMaterialService;
+        SaveCommand = new DelegateCommand(async () => await SaveAsync());
+        CancelCommand = new DelegateCommand(() => CloseAction?.Invoke());
+        MajorCategoryChangedCommand = new DelegateCommand(async () => await OnMajorCategoryChangedAsync());
+        _ = LoadMajorCategoryOptionsAsync();
+    }
+
+    public void InitializeForAdd()
+    {
+        Material = new MesMixerMaterial
+        {
+            FeedManageStatus = 1,
+            UseStatus = 1
+        };
+        MinorCategoryOptions.Clear();
+        RaisePropertyChanged(nameof(IsAddMode));
+        RaisePropertyChanged(nameof(DialogTitle));
+    }
+
+    public void InitializeForEdit(MesMixerMaterial material)
+    {
+        Material = new MesMixerMaterial
+        {
+            Id = material.Id,
+            MaterialCode = material.MaterialCode,
+            MaterialName = material.MaterialName,
+            ErpCode = material.ErpCode,
+            MajorCategoryId = material.MajorCategoryId,
+            MinorCategoryId = material.MinorCategoryId,
+            MaterialDesc = material.MaterialDesc,
+            AliasName = material.AliasName,
+            FeedManageStatus = material.FeedManageStatus,
+            UseStatus = material.UseStatus,
+            SpecificGravity = material.SpecificGravity,
+            ShelfLifeDays = material.ShelfLifeDays,
+            MinBakeMinutes = material.MinBakeMinutes,
+            TotalSafetyStockKg = material.TotalSafetyStockKg,
+            QualifiedSafetyStockKg = material.QualifiedSafetyStockKg,
+            Remark = material.Remark,
+            TenantId = material.TenantId,
+        };
+        _ = LoadMinorCategoryOptionsAsync(Material.MajorCategoryId);
+        RaisePropertyChanged(nameof(IsAddMode));
+        RaisePropertyChanged(nameof(DialogTitle));
+    }
+
+    private async Task LoadMajorCategoryOptionsAsync()
+    {
+        try
+        {
+            MajorCategoryOptions.Clear();
+            var options = await _mixerMaterialService.GetMajorCategoryOptionsAsync();
+            foreach (var item in options)
+            {
+                MajorCategoryOptions.Add(item);
+            }
+        }
+        catch
+        {
+            // ignore
+        }
+    }
+
+    private async Task LoadMinorCategoryOptionsAsync(string? majorCategoryId)
+    {
+        MinorCategoryOptions.Clear();
+        if (string.IsNullOrWhiteSpace(majorCategoryId))
+        {
+            return;
+        }
+        try
+        {
+            var options = await _mixerMaterialService.GetMinorCategoryOptionsAsync(majorCategoryId);
+            foreach (var item in options)
+            {
+                MinorCategoryOptions.Add(item);
+            }
+        }
+        catch
+        {
+            // ignore
+        }
+    }
+
+    private async Task OnMajorCategoryChangedAsync()
+    {
+        if (Material == null) return;
+        Material.MinorCategoryId = null;
+        RaisePropertyChanged(nameof(Material));
+        await LoadMinorCategoryOptionsAsync(Material.MajorCategoryId);
+    }
+
+    private async Task SaveAsync()
+    {
+        if (Material == null) return;
+        if (string.IsNullOrWhiteSpace(Material.MaterialCode))
+        {
+            HandyControl.Controls.MessageBox.Warning("物料编码不能为空！");
+            return;
+        }
+        if (string.IsNullOrWhiteSpace(Material.MaterialName))
+        {
+            HandyControl.Controls.MessageBox.Warning("物料名称不能为空！");
+            return;
+        }
+        if (string.IsNullOrWhiteSpace(Material.MajorCategoryId))
+        {
+            HandyControl.Controls.MessageBox.Warning("物料大类不能为空！");
+            return;
+        }
+        if (string.IsNullOrWhiteSpace(Material.MinorCategoryId))
+        {
+            HandyControl.Controls.MessageBox.Warning("物料小类不能为空！");
+            return;
+        }
+
+        try
+        {
+            bool ok = IsAddMode
+                ? await _mixerMaterialService.AddAsync(Material)
+                : await _mixerMaterialService.EditAsync(Material);
+            if (!ok)
+            {
+                HandyControl.Controls.MessageBox.Error($"{(IsAddMode ? "新增" : "编辑")}密炼物料失败！");
+                return;
+            }
+
+            Result = true;
+            CloseAction?.Invoke();
+        }
+        catch (Exception ex)
+        {
+            HandyControl.Controls.MessageBox.Error($"操作失败：{ex.Message}");
+        }
+    }
+}
+
--- a/yy-admin-master/YY.Admin/ViewModels/MixerMaterial/MixerMaterialListViewModel.cs
+++ b/yy-admin-master/YY.Admin/ViewModels/MixerMaterial/MixerMaterialListViewModel.cs
@@ -0,0 +1,232 @@
+using HandyControl.Controls;
+using HandyControl.Tools.Extension;
+using Prism.Events;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Windows;
+using YY.Admin.Core;
+using YY.Admin.Core.Entity;
+using YY.Admin.Core.Events;
+using YY.Admin.Core.Helper;
+using YY.Admin.Core.Services;
+using YY.Admin.Views.MixerMaterial;
+
+namespace YY.Admin.ViewModels.MixerMaterial;
+
+public class MixerMaterialListViewModel : BaseViewModel
+{
+    private readonly IMixerMaterialService _mixerMaterialService;
+    private SubscriptionToken? _materialChangedToken;
+
+    private ObservableCollection<MesMixerMaterial> _materials = new();
+    public ObservableCollection<MesMixerMaterial> Materials
+    {
+        get => _materials;
+        set => SetProperty(ref _materials, value);
+    }
+
+    private long _total;
+    public long Total { get => _total; set => SetProperty(ref _total, value); }
+
+    private int _pageNo = 1;
+    public int PageNo { get => _pageNo; set => SetProperty(ref _pageNo, value); }
+
+    private int _pageSize = 20;
+    public int PageSize { get => _pageSize; set => SetProperty(ref _pageSize, value); }
+
+    private string? _filterMaterialCode;
+    public string? FilterMaterialCode { get => _filterMaterialCode; set => SetProperty(ref _filterMaterialCode, value); }
+
+    private string? _filterMaterialName;
+    public string? FilterMaterialName { get => _filterMaterialName; set => SetProperty(ref _filterMaterialName, value); }
+
+    private string? _filterErpCode;
+    public string? FilterErpCode { get => _filterErpCode; set => SetProperty(ref _filterErpCode, value); }
+
+    private string? _filterMajorCategoryId;
+    public string? FilterMajorCategoryId
+    {
+        get => _filterMajorCategoryId;
+        set
+        {
+            if (SetProperty(ref _filterMajorCategoryId, value))
+            {
+                _ = OnMajorCategoryChangedAsync();
+            }
+        }
+    }
+
+    private string? _filterMinorCategoryId;
+    public string? FilterMinorCategoryId { get => _filterMinorCategoryId; set => SetProperty(ref _filterMinorCategoryId, value); }
+
+    public ObservableCollection<KeyValuePair<string, string>> MajorCategoryOptions { get; } = new();
+    public ObservableCollection<KeyValuePair<string, string>> MinorCategoryOptions { get; } = new();
+
+    public DelegateCommand SearchCommand { get; }
+    public DelegateCommand ResetCommand { get; }
+    public DelegateCommand AddCommand { get; }
+    public DelegateCommand<MesMixerMaterial> EditCommand { get; }
+    public DelegateCommand<MesMixerMaterial> DeleteCommand { get; }
+    public DelegateCommand PrevPageCommand { get; }
+    public DelegateCommand NextPageCommand { get; }
+
+    public MixerMaterialListViewModel(
+        IMixerMaterialService mixerMaterialService,
+        IContainerExtension container,
+        IRegionManager regionManager) : base(container, regionManager)
+    {
+        _mixerMaterialService = mixerMaterialService;
+
+        SearchCommand = new DelegateCommand(async () => { PageNo = 1; await LoadAsync(); });
+        ResetCommand = new DelegateCommand(async () =>
+        {
+            FilterMaterialCode = null;
+            FilterMaterialName = null;
+            FilterErpCode = null;
+            FilterMajorCategoryId = null;
+            FilterMinorCategoryId = null;
+            PageNo = 1;
+            await LoadMinorCategoryOptionsAsync();
+            await LoadAsync();
+        });
+        AddCommand = new DelegateCommand(async () => await ShowAddDialogAsync());
+        EditCommand = new DelegateCommand<MesMixerMaterial>(async m => await ShowEditDialogAsync(m));
+        DeleteCommand = new DelegateCommand<MesMixerMaterial>(async m => await DeleteAsync(m));
+        PrevPageCommand = new DelegateCommand(async () => { if (PageNo > 1) { PageNo--; await LoadAsync(); } });
+        NextPageCommand = new DelegateCommand(async () => { if ((long)PageNo * PageSize < Total) { PageNo++; await LoadAsync(); } });
+
+        _materialChangedToken = _eventAggregator
+            .GetEvent<MixerMaterialChangedEvent>()
+            .Subscribe(async _ => await LoadAsync(), ThreadOption.UIThread);
+
+        _ = InitializeAsync();
+    }
+
+    private async Task InitializeAsync()
+    {
+        try
+        {
+            await LoadMajorCategoryOptionsAsync();
+            await LoadMinorCategoryOptionsAsync();
+            await UIHelper.WaitForRenderAsync();
+            await LoadAsync();
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"密炼物料列表初始化失败: {ex.Message}");
+        }
+    }
+
+    private async Task LoadMajorCategoryOptionsAsync()
+    {
+        MajorCategoryOptions.Clear();
+        var options = await _mixerMaterialService.GetMajorCategoryOptionsAsync();
+        MajorCategoryOptions.Add(new KeyValuePair<string, string>("全部", ""));
+        foreach (var item in options)
+        {
+            MajorCategoryOptions.Add(item);
+        }
+    }
+
+    private async Task LoadMinorCategoryOptionsAsync()
+    {
+        MinorCategoryOptions.Clear();
+        MinorCategoryOptions.Add(new KeyValuePair<string, string>("全部", ""));
+        if (string.IsNullOrWhiteSpace(FilterMajorCategoryId))
+        {
+            return;
+        }
+        var options = await _mixerMaterialService.GetMinorCategoryOptionsAsync(FilterMajorCategoryId!);
+        foreach (var item in options)
+        {
+            MinorCategoryOptions.Add(item);
+        }
+    }
+
+    private async Task OnMajorCategoryChangedAsync()
+    {
+        FilterMinorCategoryId = null;
+        await LoadMinorCategoryOptionsAsync();
+    }
+
+    public async Task LoadAsync()
+    {
+        try
+        {
+            IsLoading = true;
+            var result = await _mixerMaterialService.PageAsync(
+                PageNo, PageSize, FilterMaterialCode, FilterMaterialName, FilterErpCode, FilterMajorCategoryId, FilterMinorCategoryId);
+            Materials = new ObservableCollection<MesMixerMaterial>(result.Records);
+            Total = result.Total;
+        }
+        catch (Exception ex)
+        {
+            Growl.Error($"加载密炼物料列表失败：{ex.Message}");
+        }
+        finally
+        {
+            IsLoading = false;
+        }
+    }
+
+    private async Task ShowAddDialogAsync()
+    {
+        try
+        {
+            var result = await HandyControl.Controls.Dialog.Show<MixerMaterialEditDialogView>()
+                .Initialize<MixerMaterialEditDialogViewModel>(vm => vm.InitializeForAdd())
+                .GetResultAsync<bool>();
+            if (result) await LoadAsync();
+        }
+        catch (Exception ex)
+        {
+            Growl.Error($"打开新增对话框失败：{ex.Message}");
+        }
+    }
+
+    private async Task ShowEditDialogAsync(MesMixerMaterial material)
+    {
+        if (material == null) return;
+        try
+        {
+            var result = await HandyControl.Controls.Dialog.Show<MixerMaterialEditDialogView>()
+                .Initialize<MixerMaterialEditDialogViewModel>(vm => vm.InitializeForEdit(material))
+                .GetResultAsync<bool>();
+            if (result) await LoadAsync();
+        }
+        catch (Exception ex)
+        {
+            Growl.Error($"打开编辑对话框失败：{ex.Message}");
+        }
+    }
+
+    private async Task DeleteAsync(MesMixerMaterial material)
+    {
+        if (material?.Id == null) return;
+        var confirm = System.Windows.MessageBox.Show($"确定删除物料 {material.MaterialName}？此操作不可恢复！", "确认删除",
+            MessageBoxButton.OKCancel, MessageBoxImage.Question);
+        if (confirm != System.Windows.MessageBoxResult.OK) return;
+
+        var ok = await _mixerMaterialService.DeleteAsync(material.Id);
+        if (ok)
+        {
+            Growl.Success("删除成功！");
+            await LoadAsync();
+        }
+        else
+        {
+            Growl.Error("删除失败！");
+        }
+    }
+
+    protected override void CleanUp()
+    {
+        base.CleanUp();
+        if (_materialChangedToken != null)
+        {
+            _eventAggregator.GetEvent<MixerMaterialChangedEvent>().Unsubscribe(_materialChangedToken);
+            _materialChangedToken = null;
+        }
+    }
+}
+
--- a/yy-admin-master/YY.Admin/ViewModels/SysManage/CategoryDictionaryManagementViewModel.cs
+++ b/yy-admin-master/YY.Admin/ViewModels/SysManage/CategoryDictionaryManagementViewModel.cs
@@ -0,0 +1,143 @@
+using HandyControl.Controls;
+using System.Collections.ObjectModel;
+using YY.Admin.Core;
+using YY.Admin.Core.Helper;
+using YY.Admin.Services.Service.Category;
+using YY.Admin.Services.Service.Category.Dto;
+using YY.Admin.ViewModels.Control;
+
+namespace YY.Admin.ViewModels.SysManage;
+
+public class CategoryDictionaryManagementViewModel : BaseViewModel
+{
+    private readonly IJeecgCategorySyncService _categorySyncService;
+
+    private PaginationDataGridViewModel<JeecgCategoryItemOutput> _paginationDataGridViewModel;
+    public PaginationDataGridViewModel<JeecgCategoryItemOutput> PaginationDataGridViewModel
+    {
+        get => _paginationDataGridViewModel;
+        set => SetProperty(ref _paginationDataGridViewModel, value);
+    }
+
+    private PageJeecgCategoryItemInput _input;
+    public PageJeecgCategoryItemInput Input
+    {
+        get => _input;
+        set => SetProperty(ref _input, value);
+    }
+
+    public DelegateCommand SearchCommand { get; }
+    public DelegateCommand ResetCommand { get; }
+    public DelegateCommand SyncCommand { get; }
+    public ObservableCollection<CategoryTreeNode> TreeNodes { get; } = [];
+
+    private CategoryTreeNode? _selectedTreeNode;
+    public CategoryTreeNode? SelectedTreeNode
+    {
+        get => _selectedTreeNode;
+        set => SetProperty(ref _selectedTreeNode, value);
+    }
+
+    public CategoryDictionaryManagementViewModel(
+        IJeecgCategorySyncService categorySyncService,
+        IContainerExtension container,
+        IRegionManager regionManager) : base(container, regionManager)
+    {
+        _categorySyncService = categorySyncService;
+        _paginationDataGridViewModel = new PaginationDataGridViewModel<JeecgCategoryItemOutput>(FetchAsync);
+        _input = new PageJeecgCategoryItemInput();
+
+        SearchCommand = new DelegateCommand(async () => await SearchAsync());
+        ResetCommand = new DelegateCommand(async () => await ResetAsync());
+        SyncCommand = new DelegateCommand(async () => await SyncAsync());
+
+        _ = InitializeAsync();
+    }
+
+    private async Task InitializeAsync()
+    {
+        await LoadTreeAsync();
+        await UIHelper.WaitForRenderAsync();
+        await PaginationDataGridViewModel.LoadDataAsync();
+    }
+
+    private async Task<(IEnumerable<JeecgCategoryItemOutput> data, int totalCount)> FetchAsync()
+    {
+        Input.Page = PaginationDataGridViewModel.PageIndex;
+        Input.PageSize = PaginationDataGridViewModel.DataCountPerPage;
+        var result = await _categorySyncService.PageAsync(Input);
+        return (result.Items, result.Total);
+    }
+
+    private async Task SearchAsync()
+    {
+        PaginationDataGridViewModel.PageIndex = 1;
+        await PaginationDataGridViewModel.LoadDataAsync();
+    }
+
+    private async Task ResetAsync()
+    {
+        Input = new PageJeecgCategoryItemInput();
+        SelectedTreeNode = null;
+        await UIHelper.WaitForRenderAsync();
+        await LoadTreeAsync();
+        await SearchAsync();
+    }
+
+    private async Task SyncAsync()
+    {
+        var count = await _categorySyncService.SyncFromJeecgAsync();
+        if (count > 0)
+        {
+            Growl.Success($"同步完成，共处理 {count} 条分类字典数据");
+        }
+        else
+        {
+            Growl.Warning("未同步到分类字典，请确认后端可访问");
+        }
+        await LoadTreeAsync();
+        await SearchAsync();
+    }
+
+    public async Task OnTreeSelectedAsync(CategoryTreeNode? node)
+    {
+        SelectedTreeNode = node;
+        Input.Pid = node?.Id;
+        await SearchAsync();
+    }
+
+    private async Task LoadTreeAsync()
+    {
+        TreeNodes.Clear();
+        var tree = await _categorySyncService.LoadTreeAsync();
+        foreach (var item in tree)
+        {
+            TreeNodes.Add(MapTreeNode(item));
+        }
+    }
+
+    private static CategoryTreeNode MapTreeNode(JeecgCategoryTreeNodeDto dto)
+    {
+        var node = new CategoryTreeNode
+        {
+            Id = dto.Id,
+            Name = dto.Name ?? dto.Code ?? dto.Id,
+            Code = dto.Code
+        };
+        foreach (var child in dto.Children)
+        {
+            node.Children.Add(MapTreeNode(child));
+        }
+        return node;
+    }
+
+    public class CategoryTreeNode
+    {
+        public string Id { get; set; } = string.Empty;
+        public string? Name { get; set; }
+        public string? Code { get; set; }
+        public ObservableCollection<CategoryTreeNode> Children { get; set; } = [];
+        public string DisplayName => string.IsNullOrWhiteSpace(Code) ? (Name ?? Id) : $"{Name} ({Code})";
+    }
+}
+
--- a/yy-admin-master/YY.Admin/Views/MixerMaterial/MixerMaterialEditDialogView.xaml
+++ b/yy-admin-master/YY.Admin/Views/MixerMaterial/MixerMaterialEditDialogView.xaml
@@ -0,0 +1,174 @@
+<UserControl x:Class="YY.Admin.Views.MixerMaterial.MixerMaterialEditDialogView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
+             xmlns:prism="http://prismlibrary.com/"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             mc:Ignorable="d"
+             Width="760"
+             MinHeight="420">
+
+    <Grid Background="{DynamicResource ThirdlyRegionBrush}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <hc:SimplePanel Margin="20">
+            <TextBlock FontSize="18" Foreground="{DynamicResource PrimaryTextBrush}" Text="{Binding DialogTitle}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+            <Button Width="22" Height="22" Command="hc:ControlCommands.Close" Style="{StaticResource ButtonIcon}"
+                    Foreground="{DynamicResource PrimaryBrush}" hc:IconElement.Geometry="{StaticResource ErrorGeometry}"
+                    Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,4,4,0"/>
+        </hc:SimplePanel>
+
+        <hc:ScrollViewer Grid.Row="1" IsInertiaEnabled="True">
+            <StackPanel Margin="20,0,20,0">
+                <hc:Row Gutter="10">
+                    <hc:Col Span="12">
+                        <hc:TextBox Text="{Binding Material.MaterialCode, UpdateSourceTrigger=PropertyChanged}"
+                                    hc:InfoElement.Title="物料编码"
+                                    hc:InfoElement.TitleWidth="90"
+                                    hc:InfoElement.TitlePlacement="Left"
+                                    hc:InfoElement.Necessary="True"
+                                    hc:InfoElement.Symbol="*"
+                                    hc:InfoElement.Placeholder="请输入物料编码"
+                                    hc:InfoElement.ShowClearButton="True"
+                                    Margin="0,0,0,16"/>
+                    </hc:Col>
+                    <hc:Col Span="12">
+                        <hc:TextBox Text="{Binding Material.MaterialName, UpdateSourceTrigger=PropertyChanged}"
+                                    hc:InfoElement.Title="物料名称"
+                                    hc:InfoElement.TitleWidth="90"
+                                    hc:InfoElement.TitlePlacement="Left"
+                                    hc:InfoElement.Necessary="True"
+                                    hc:InfoElement.Symbol="*"
+                                    hc:InfoElement.Placeholder="请输入物料名称"
+                                    hc:InfoElement.ShowClearButton="True"
+                                    Margin="0,0,0,16"/>
+                    </hc:Col>
+                    <hc:Col Span="12">
+                        <hc:TextBox Text="{Binding Material.ErpCode, UpdateSourceTrigger=PropertyChanged}"
+                                    hc:InfoElement.Title="ERP编号"
+                                    hc:InfoElement.TitleWidth="90"
+                                    hc:InfoElement.TitlePlacement="Left"
+                                    hc:InfoElement.Placeholder="请输入ERP编号"
+                                    hc:InfoElement.ShowClearButton="True"
+                                    Margin="0,0,0,16"/>
+                    </hc:Col>
+                    <hc:Col Span="12">
+                        <hc:ComboBox SelectedValuePath="Value"
+                                     DisplayMemberPath="Key"
+                                     ItemsSource="{Binding MajorCategoryOptions}"
+                                     SelectedValue="{Binding Material.MajorCategoryId}"
+                                     SelectionChanged="MajorCategoryComboBox_SelectionChanged"
+                                     hc:InfoElement.Title="物料大类"
+                                     hc:InfoElement.TitleWidth="90"
+                                     hc:InfoElement.TitlePlacement="Left"
+                                     hc:InfoElement.Necessary="True"
+                                     hc:InfoElement.Symbol="*"
+                                     Margin="0,0,0,16"/>
+                    </hc:Col>
+                    <hc:Col Span="12">
+                        <hc:ComboBox SelectedValuePath="Value"
+                                     DisplayMemberPath="Key"
+                                     ItemsSource="{Binding MinorCategoryOptions}"
+                                     SelectedValue="{Binding Material.MinorCategoryId}"
+                                     hc:InfoElement.Title="物料小类"
+                                     hc:InfoElement.TitleWidth="90"
+                                     hc:InfoElement.TitlePlacement="Left"
+                                     hc:InfoElement.Necessary="True"
+                                     hc:InfoElement.Symbol="*"
+                                     Margin="0,0,0,16"/>
+                    </hc:Col>
+                    <hc:Col Span="12">
+                        <hc:TextBox Text="{Binding Material.AliasName, UpdateSourceTrigger=PropertyChanged}"
+                                    hc:InfoElement.Title="物料别名"
+                                    hc:InfoElement.TitleWidth="90"
+                                    hc:InfoElement.TitlePlacement="Left"
+                                    hc:InfoElement.Placeholder="请输入物料别名"
+                                    hc:InfoElement.ShowClearButton="True"
+                                    Margin="0,0,0,16"/>
+                    </hc:Col>
+                    <hc:Col Span="12">
+                        <hc:ComboBox SelectedValuePath="Value"
+                                     DisplayMemberPath="Key"
+                                     ItemsSource="{Binding FeedManageStatusOptions}"
+                                     SelectedValue="{Binding Material.FeedManageStatus}"
+                                     hc:InfoElement.Title="投管状态"
+                                     hc:InfoElement.TitleWidth="90"
+                                     hc:InfoElement.TitlePlacement="Left"
+                                     Margin="0,0,0,16"/>
+                    </hc:Col>
+                    <hc:Col Span="12">
+                        <hc:ComboBox SelectedValuePath="Value"
+                                     DisplayMemberPath="Key"
+                                     ItemsSource="{Binding UseStatusOptions}"
+                                     SelectedValue="{Binding Material.UseStatus}"
+                                     hc:InfoElement.Title="使用状态"
+                                     hc:InfoElement.TitleWidth="90"
+                                     hc:InfoElement.TitlePlacement="Left"
+                                     Margin="0,0,0,16"/>
+                    </hc:Col>
+                    <hc:Col Span="12">
+                        <hc:NumericUpDown Value="{Binding Material.SpecificGravity}" Minimum="0" DecimalPlaces="4"
+                                          Style="{StaticResource NumericUpDownPlus}"
+                                          hc:InfoElement.Title="比重"
+                                          hc:InfoElement.TitleWidth="90"
+                                          hc:InfoElement.TitlePlacement="Left"
+                                          Margin="0,0,0,16"/>
+                    </hc:Col>
+                    <hc:Col Span="12">
+                        <hc:NumericUpDown Value="{Binding Material.ShelfLifeDays}" Minimum="0" DecimalPlaces="0"
+                                          Style="{StaticResource NumericUpDownPlus}"
+                                          hc:InfoElement.Title="保质期(天)"
+                                          hc:InfoElement.TitleWidth="90"
+                                          hc:InfoElement.TitlePlacement="Left"
+                                          Margin="0,0,0,16"/>
+                    </hc:Col>
+                    <hc:Col Span="12">
+                        <hc:NumericUpDown Value="{Binding Material.MinBakeMinutes}" Minimum="0" DecimalPlaces="0"
+                                          Style="{StaticResource NumericUpDownPlus}"
+                                          hc:InfoElement.Title="最短烘胶(分)"
+                                          hc:InfoElement.TitleWidth="90"
+                                          hc:InfoElement.TitlePlacement="Left"
+                                          Margin="0,0,0,16"/>
+                    </hc:Col>
+                    <hc:Col Span="12">
+                        <hc:NumericUpDown Value="{Binding Material.TotalSafetyStockKg}" Minimum="0" DecimalPlaces="4"
+                                          Style="{StaticResource NumericUpDownPlus}"
+                                          hc:InfoElement.Title="总安全库存KG"
+                                          hc:InfoElement.TitleWidth="90"
+                                          hc:InfoElement.TitlePlacement="Left"
+                                          Margin="0,0,0,16"/>
+                    </hc:Col>
+                    <hc:Col Span="12">
+                        <hc:NumericUpDown Value="{Binding Material.QualifiedSafetyStockKg}" Minimum="0" DecimalPlaces="4"
+                                          Style="{StaticResource NumericUpDownPlus}"
+                                          hc:InfoElement.Title="合格库存KG"
+                                          hc:InfoElement.TitleWidth="90"
+                                          hc:InfoElement.TitlePlacement="Left"
+                                          Margin="0,0,0,16"/>
+                    </hc:Col>
+                    <hc:Col Span="24">
+                        <hc:TextBox Text="{Binding Material.MaterialDesc, UpdateSourceTrigger=PropertyChanged}"
+                                    hc:InfoElement.Title="物料描述"
+                                    hc:InfoElement.TitleWidth="90"
+                                    hc:InfoElement.TitlePlacement="Left"
+                                    hc:InfoElement.Placeholder="请输入物料描述"
+                                    hc:InfoElement.ShowClearButton="True"
+                                    Margin="0,0,0,16"/>
+                    </hc:Col>
+                </hc:Row>
+            </StackPanel>
+        </hc:ScrollViewer>
+
+        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" Margin="20">
+            <Button Content="取消" Command="{Binding CancelCommand}" Style="{StaticResource ButtonDefault}" Margin="0,0,15,0" Width="100"/>
+            <Button Content="确定" Command="{Binding SaveCommand}" Style="{StaticResource ButtonPrimary}" Width="100"/>
+        </StackPanel>
+    </Grid>
+</UserControl>
+
--- a/yy-admin-master/YY.Admin/Views/MixerMaterial/MixerMaterialEditDialogView.xaml.cs
+++ b/yy-admin-master/YY.Admin/Views/MixerMaterial/MixerMaterialEditDialogView.xaml.cs
@@ -0,0 +1,21 @@
+using System.Windows.Controls;
+using YY.Admin.ViewModels.MixerMaterial;
+
+namespace YY.Admin.Views.MixerMaterial;
+
+public partial class MixerMaterialEditDialogView : UserControl
+{
+    public MixerMaterialEditDialogView()
+    {
+        InitializeComponent();
+    }
+
+    private void MajorCategoryComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (DataContext is MixerMaterialEditDialogViewModel vm && vm.MajorCategoryChangedCommand.CanExecute())
+        {
+            vm.MajorCategoryChangedCommand.Execute();
+        }
+    }
+}
+
--- a/yy-admin-master/YY.Admin/Views/MixerMaterial/MixerMaterialListView.xaml
+++ b/yy-admin-master/YY.Admin/Views/MixerMaterial/MixerMaterialListView.xaml
@@ -0,0 +1,174 @@
+<UserControl x:Class="YY.Admin.Views.MixerMaterial.MixerMaterialListView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
+             xmlns:md="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:prism="http://prismlibrary.com/"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             mc:Ignorable="d">
+
+    <Grid Style="{StaticResource BaseViewStyle}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <Border Grid.Row="0" CornerRadius="4" Margin="0 0 -10 0">
+            <hc:Row>
+                <hc:Col Layout="{hc:ColLayout Xs=12, Sm=8, Md=6, Lg=6, Xl=4}">
+                    <hc:TextBox Text="{Binding FilterMaterialCode, UpdateSourceTrigger=PropertyChanged}"
+                                Margin="0 0 10 10"
+                                hc:InfoElement.Title="物料编码"
+                                hc:InfoElement.TitlePlacement="Left"
+                                hc:InfoElement.TitleWidth="65"
+                                hc:InfoElement.Placeholder="请输入物料编码"
+                                hc:InfoElement.ShowClearButton="True"/>
+                </hc:Col>
+                <hc:Col Layout="{hc:ColLayout Xs=12, Sm=8, Md=6, Lg=6, Xl=4}">
+                    <hc:TextBox Text="{Binding FilterMaterialName, UpdateSourceTrigger=PropertyChanged}"
+                                Margin="0 0 10 10"
+                                hc:InfoElement.Title="物料名称"
+                                hc:InfoElement.TitlePlacement="Left"
+                                hc:InfoElement.TitleWidth="65"
+                                hc:InfoElement.Placeholder="请输入物料名称"
+                                hc:InfoElement.ShowClearButton="True"/>
+                </hc:Col>
+                <hc:Col Layout="{hc:ColLayout Xs=12, Sm=8, Md=6, Lg=6, Xl=4}">
+                    <hc:TextBox Text="{Binding FilterErpCode, UpdateSourceTrigger=PropertyChanged}"
+                                Margin="0 0 10 10"
+                                hc:InfoElement.Title="ERP编号"
+                                hc:InfoElement.TitlePlacement="Left"
+                                hc:InfoElement.TitleWidth="65"
+                                hc:InfoElement.Placeholder="请输入ERP编号"
+                                hc:InfoElement.ShowClearButton="True"/>
+                </hc:Col>
+                <hc:Col Layout="{hc:ColLayout Xs=12, Sm=8, Md=6, Lg=6, Xl=4}">
+                    <hc:ComboBox SelectedValuePath="Value"
+                                 DisplayMemberPath="Key"
+                                 ItemsSource="{Binding MajorCategoryOptions}"
+                                 SelectedValue="{Binding FilterMajorCategoryId}"
+                                 Margin="0 0 10 10"
+                                 hc:InfoElement.Title="物料大类"
+                                 hc:InfoElement.TitlePlacement="Left"
+                                 hc:InfoElement.TitleWidth="65"
+                                 hc:InfoElement.Placeholder="请选择物料大类"
+                                 hc:InfoElement.ShowClearButton="True"/>
+                </hc:Col>
+                <hc:Col Layout="{hc:ColLayout Xs=12, Sm=8, Md=6, Lg=6, Xl=4}">
+                    <hc:ComboBox SelectedValuePath="Value"
+                                 DisplayMemberPath="Key"
+                                 ItemsSource="{Binding MinorCategoryOptions}"
+                                 SelectedValue="{Binding FilterMinorCategoryId}"
+                                 Margin="0 0 10 10"
+                                 hc:InfoElement.Title="物料小类"
+                                 hc:InfoElement.TitlePlacement="Left"
+                                 hc:InfoElement.TitleWidth="65"
+                                 hc:InfoElement.Placeholder="请选择物料小类"
+                                 hc:InfoElement.ShowClearButton="True"/>
+                </hc:Col>
+            </hc:Row>
+        </Border>
+
+        <Border Grid.Row="1" Margin="0,10">
+            <hc:UniformSpacingPanel Spacing="10">
+                <Button Style="{StaticResource ButtonPrimary}" Command="{Binding SearchCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <md:PackIcon Kind="Search"/>
+                        <TextBlock Text="搜索" Style="{StaticResource IconButtonStyle}"/>
+                    </StackPanel>
+                </Button>
+                <Button Style="{StaticResource ButtonDefault}" Command="{Binding ResetCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <md:PackIcon Kind="Refresh"/>
+                        <TextBlock Text="重置" Style="{StaticResource IconButtonStyle}"/>
+                    </StackPanel>
+                </Button>
+                <Button Style="{StaticResource ButtonSuccess}" Command="{Binding AddCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <md:PackIcon Kind="Plus"/>
+                        <TextBlock Text="新增" Style="{StaticResource IconButtonStyle}"/>
+                    </StackPanel>
+                </Button>
+            </hc:UniformSpacingPanel>
+        </Border>
+
+        <DataGrid Grid.Row="2"
+                  ItemsSource="{Binding Materials}"
+                  AutoGenerateColumns="False"
+                  IsReadOnly="True"
+                  CanUserAddRows="False"
+                  SelectionMode="Extended"
+                  SelectionUnit="FullRow"
+                  RowHeaderWidth="55"
+                  GridLinesVisibility="Horizontal"
+                  HorizontalGridLinesBrush="#FFEDEDED"
+                  VerticalGridLinesBrush="Transparent"
+                  HeadersVisibility="All"
+                  ColumnHeaderStyle="{StaticResource CusDataGridColumnHeaderStyle}"
+                  Style="{StaticResource CusDataGridStyle}"
+                  hc:DataGridAttach.ShowSelectAllButton="True"
+                  VerticalScrollBarVisibility="Auto"
+                  HorizontalScrollBarVisibility="Auto">
+            <DataGrid.RowHeaderTemplate>
+                <DataTemplate>
+                    <CheckBox IsChecked="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=DataGridRow}}"/>
+                </DataTemplate>
+            </DataGrid.RowHeaderTemplate>
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="物料编码" Binding="{Binding MaterialCode}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="120"/>
+                <DataGridTextColumn Header="物料名称" Binding="{Binding MaterialName}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="140"/>
+                <DataGridTextColumn Header="ERP编号" Binding="{Binding ErpCode}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="120"/>
+                <DataGridTextColumn Header="物料大类" Binding="{Binding MajorCategoryText}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="120"/>
+                <DataGridTextColumn Header="物料小类" Binding="{Binding MinorCategoryText}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="120"/>
+                <DataGridTextColumn Header="物料描述" Binding="{Binding MaterialDesc}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="160"/>
+                <DataGridTextColumn Header="物料别名" Binding="{Binding AliasName}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="120"/>
+                <DataGridTextColumn Header="投管状态" Binding="{Binding FeedManageStatusText}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="100"/>
+                <DataGridTextColumn Header="使用状态" Binding="{Binding UseStatusText}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="100"/>
+                <DataGridTextColumn Header="比重" Binding="{Binding SpecificGravity, StringFormat=N4}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="90"/>
+                <DataGridTextColumn Header="保质期(天)" Binding="{Binding ShelfLifeDays}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="100"/>
+                <DataGridTemplateColumn Header="操作" Width="150" CellStyle="{StaticResource CusOperDataGridCellStyle}">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <hc:UniformSpacingPanel Spacing="5">
+                                <Border Style="{DynamicResource DataGridOpeButtonStyle}">
+                                    <Border.InputBindings>
+                                        <MouseBinding Command="{Binding DataContext.EditCommand, RelativeSource={RelativeSource AncestorType=DataGrid}}"
+                                                      CommandParameter="{Binding}" MouseAction="LeftClick"/>
+                                    </Border.InputBindings>
+                                    <StackPanel Orientation="Horizontal">
+                                        <md:PackIcon Kind="SquareEditOutline" VerticalAlignment="Center"/>
+                                        <TextBlock Text="修改" VerticalAlignment="Center"/>
+                                    </StackPanel>
+                                </Border>
+                                <Border Style="{DynamicResource DataGridOpeButtonStyle}">
+                                    <Border.InputBindings>
+                                        <MouseBinding Command="{Binding DataContext.DeleteCommand, RelativeSource={RelativeSource AncestorType=DataGrid}}"
+                                                      CommandParameter="{Binding}" MouseAction="LeftClick"/>
+                                    </Border.InputBindings>
+                                    <StackPanel Orientation="Horizontal">
+                                        <md:PackIcon Kind="TrashCanOutline" VerticalAlignment="Center"/>
+                                        <TextBlock Text="删除" VerticalAlignment="Center"/>
+                                    </StackPanel>
+                                </Border>
+                            </hc:UniformSpacingPanel>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+            </DataGrid.Columns>
+        </DataGrid>
+
+        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,0,0">
+            <TextBlock Text="{Binding Total, StringFormat=共 {0} 条}" VerticalAlignment="Center" Margin="0,0,16,0"
+                       Foreground="{DynamicResource SecondaryTextBrush}"/>
+            <Button Content="上一页" Command="{Binding PrevPageCommand}" Style="{StaticResource ButtonDefault}" Margin="0,0,4,0" Width="80"/>
+            <TextBlock Text="{Binding PageNo, StringFormat=第 {0} 页}" VerticalAlignment="Center" Margin="8,0"
+                       Foreground="{DynamicResource PrimaryTextBrush}"/>
+            <Button Content="下一页" Command="{Binding NextPageCommand}" Style="{StaticResource ButtonDefault}" Width="80"/>
+        </StackPanel>
+    </Grid>
+</UserControl>
+
--- a/yy-admin-master/YY.Admin/Views/MixerMaterial/MixerMaterialListView.xaml.cs
+++ b/yy-admin-master/YY.Admin/Views/MixerMaterial/MixerMaterialListView.xaml.cs
@@ -0,0 +1,12 @@
+using System.Windows.Controls;
+
+namespace YY.Admin.Views.MixerMaterial;
+
+public partial class MixerMaterialListView : UserControl
+{
+    public MixerMaterialListView()
+    {
+        InitializeComponent();
+    }
+}
+
--- a/yy-admin-master/YY.Admin/Views/SysManage/CategoryDictionaryManagementView.xaml
+++ b/yy-admin-master/YY.Admin/Views/SysManage/CategoryDictionaryManagementView.xaml
@@ -0,0 +1,117 @@
+<UserControl x:Class="YY.Admin.Views.SysManage.CategoryDictionaryManagementView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
+             xmlns:md="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:components="clr-namespace:YY.Admin.Views.Control"
+             mc:Ignorable="d">
+
+    <Grid Style="{StaticResource BaseViewStyle}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <Border Grid.Row="0" CornerRadius="4" Margin="0 0 -10 0">
+            <hc:Row>
+                <hc:Col Layout="{hc:ColLayout Xs=12, Sm=8, Md=6, Lg=6, Xl=4}">
+                    <hc:TextBox
+                        Text="{Binding Input.Code, UpdateSourceTrigger=PropertyChanged}"
+                        hc:InfoElement.Placeholder="请输入分类编码"
+                        hc:InfoElement.Title="分类编码"
+                        hc:InfoElement.TitleWidth="70"
+                        hc:InfoElement.TitlePlacement="Left"
+                        hc:InfoElement.ShowClearButton="True"
+                        Margin="0 0 10 10"/>
+                </hc:Col>
+                <hc:Col Layout="{hc:ColLayout Xs=12, Sm=8, Md=6, Lg=6, Xl=4}">
+                    <hc:TextBox
+                        Text="{Binding Input.Name, UpdateSourceTrigger=PropertyChanged}"
+                        hc:InfoElement.Placeholder="请输入分类名称"
+                        hc:InfoElement.Title="分类名称"
+                        hc:InfoElement.TitleWidth="70"
+                        hc:InfoElement.TitlePlacement="Left"
+                        hc:InfoElement.ShowClearButton="True"
+                        Margin="0 0 10 10"/>
+                </hc:Col>
+                <hc:Col Layout="{hc:ColLayout Xs=12, Sm=8, Md=6, Lg=6, Xl=4}">
+                    <hc:TextBox
+                        Text="{Binding Input.Pid, UpdateSourceTrigger=PropertyChanged}"
+                        hc:InfoElement.Placeholder="请输入父级ID"
+                        hc:InfoElement.Title="父级ID"
+                        hc:InfoElement.TitleWidth="70"
+                        hc:InfoElement.TitlePlacement="Left"
+                        hc:InfoElement.ShowClearButton="True"
+                        Margin="0 0 10 10"/>
+                </hc:Col>
+            </hc:Row>
+        </Border>
+
+        <Border Grid.Row="1" Margin="0,10">
+            <hc:UniformSpacingPanel Spacing="10">
+                <Button Style="{StaticResource ButtonPrimary}" Command="{Binding SearchCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <md:PackIcon Kind="Search"/>
+                        <TextBlock Text="搜索" Style="{StaticResource IconButtonStyle}"/>
+                    </StackPanel>
+                </Button>
+                <Button Style="{StaticResource ButtonDefault}" Command="{Binding ResetCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <md:PackIcon Kind="Refresh"/>
+                        <TextBlock Text="重置" Style="{StaticResource IconButtonStyle}"/>
+                    </StackPanel>
+                </Button>
+                <Button Style="{StaticResource ButtonSuccess}" Command="{Binding SyncCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <md:PackIcon Kind="CloudSyncOutline"/>
+                        <TextBlock Text="同步分类字典" Style="{StaticResource IconButtonStyle}"/>
+                    </StackPanel>
+                </Button>
+            </hc:UniformSpacingPanel>
+        </Border>
+
+        <Grid Grid.Row="2">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="300"/>
+                <ColumnDefinition Width="10"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+
+            <Border Grid.Column="0" BorderBrush="#FFEDEDED" BorderThickness="1" CornerRadius="4" Padding="8">
+                <TreeView x:Name="CategoryTreeView"
+                          ItemsSource="{Binding TreeNodes}"
+                          SelectedItemChanged="CategoryTreeView_SelectedItemChanged">
+                    <TreeView.ItemTemplate>
+                        <HierarchicalDataTemplate ItemsSource="{Binding Children}">
+                            <TextBlock Text="{Binding DisplayName}" />
+                        </HierarchicalDataTemplate>
+                    </TreeView.ItemTemplate>
+                </TreeView>
+            </Border>
+
+            <DataGrid
+                Grid.Column="2"
+                AutoGenerateColumns="False"
+                HeadersVisibility="All"
+                ItemsSource="{Binding PaginationDataGridViewModel.Data}"
+                ColumnHeaderStyle="{StaticResource CusDataGridColumnHeaderStyle}"
+                Style="{StaticResource CusDataGridStyle}">
+                <DataGrid.Columns>
+                    <DataGridTextColumn IsReadOnly="True" Binding="{Binding Code}" Header="分类编码" Width="200" CellStyle="{StaticResource CusDataGridCellStyle}"/>
+                    <DataGridTextColumn IsReadOnly="True" Binding="{Binding Name}" Header="分类名称" Width="200" CellStyle="{StaticResource CusDataGridCellStyle}"/>
+                    <DataGridTextColumn IsReadOnly="True" Binding="{Binding Pid}" Header="父级ID" Width="220" CellStyle="{StaticResource CusDataGridCellStyle}"/>
+                    <DataGridTextColumn IsReadOnly="True" Binding="{Binding HasChild}" Header="有子级" Width="80" CellStyle="{StaticResource CusDataGridCellStyle}"/>
+                    <DataGridTextColumn IsReadOnly="True" Binding="{Binding CreateTime, StringFormat='yyyy-MM-dd HH:mm:ss'}" Header="创建时间" Width="170" CellStyle="{StaticResource CusDataGridCellStyle}"/>
+                    <DataGridTextColumn IsReadOnly="True" Binding="{Binding UpdateTime, StringFormat='yyyy-MM-dd HH:mm:ss'}" Header="更新时间" Width="170" CellStyle="{StaticResource CusDataGridCellStyle}"/>
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+        <components:PaginationDataGridControl Grid.Row="3" DataContext="{Binding PaginationDataGridViewModel}"/>
+    </Grid>
+</UserControl>
+
--- a/yy-admin-master/YY.Admin/Views/SysManage/CategoryDictionaryManagementView.xaml.cs
+++ b/yy-admin-master/YY.Admin/Views/SysManage/CategoryDictionaryManagementView.xaml.cs
@@ -0,0 +1,26 @@
+using System.Windows.Controls;
+using System.Windows;
+using YY.Admin.ViewModels.SysManage;
+
+namespace YY.Admin.Views.SysManage
+{
+    /// <summary>
+    /// CategoryDictionaryManagementView.xaml 的交互逻辑
+    /// </summary>
+    public partial class CategoryDictionaryManagementView : UserControl
+    {
+        public CategoryDictionaryManagementView()
+        {
+            InitializeComponent();
+        }
+
+        private async void CategoryTreeView_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            if (DataContext is CategoryDictionaryManagementViewModel vm)
+            {
+                await vm.OnTreeSelectedAsync(e.NewValue as CategoryDictionaryManagementViewModel.CategoryTreeNode);
+            }
+        }
+    }
+}
+