更新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/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}");
+        }
+    }
+}
+