新增MES模块,包含供应商、客户、车辆和地磅数据记录管理功能,支持免密接口和数据同步。更新相关控制器、实体、服务和数据库配置,优化权限管理和数据字典支持,确保系统的灵活性和可扩展性。

This commit is contained in:
geht
2026-04-30 15:28:20 +08:00
parent 142a0bdaba
commit b03cbeff9b
121 changed files with 10540 additions and 424 deletions

View File

@@ -6,6 +6,7 @@ using System.Windows;
using YY.Admin.Core;
using YY.Admin.Core.Extension;
using YY.Admin.Core.Helper;
using YY.Admin.Infrastructure.Sync;
using YY.Admin.Services.Service;
using YY.Admin.Services.Service.User;
using YY.Admin.ViewModels.Control;
@@ -20,9 +21,11 @@ namespace YY.Admin.ViewModels.SysManage
private PageUserInput _userInput;
private readonly ISysUserService _sysUserService;
private readonly OutboxProcessor _outboxProcessor;
private readonly IDialogService _dialogService;
private SubscriptionToken? _jeecgSyncToken;
private bool _isManualUploading;
public PaginationDataGridViewModel<UserOutput> PaginationDataGridViewModel
{
get => _paginationDataGridViewModel;
@@ -94,6 +97,7 @@ namespace YY.Admin.ViewModels.SysManage
public DelegateCommand<UserOutput> EditCommand { get; private set; }
public DelegateCommand<UserOutput> StatusToggleCommand { get; private set; }
public DelegateCommand ManualUploadCommand { get; private set; }
// 行选择改变命令
@@ -101,12 +105,14 @@ namespace YY.Admin.ViewModels.SysManage
public UserManagementViewModel(
ISysUserService sysUserService,
OutboxProcessor outboxProcessor,
IContainerExtension container,
IDialogService dialogService,
IRegionManager regionManager
) : base(container, regionManager)
{
_sysUserService= sysUserService;
_outboxProcessor = outboxProcessor;
_dialogService = dialogService;
// 创建分页控件的 ViewModel传递一个获取数据的委托
_paginationDataGridViewModel = new PaginationDataGridViewModel<UserOutput>(FetchUsersAsync);
@@ -132,6 +138,7 @@ namespace YY.Admin.ViewModels.SysManage
EditCommand = new DelegateCommand<UserOutput>(async (user) => await ShowEditDialog(user));
StatusToggleCommand = new DelegateCommand<UserOutput>(async (user) => await ToggleStatus(user));
ManualUploadCommand = new DelegateCommand(async () => await ManualUploadAsync(), () => !_isManualUploading);
//RowSelectionChangedCommand = new DelegateCommand<UserOutput>(OnRowSelectionChanged);
@@ -457,6 +464,31 @@ namespace YY.Admin.ViewModels.SysManage
}
}
private async Task ManualUploadAsync()
{
if (_isManualUploading)
{
return;
}
_isManualUploading = true;
ManualUploadCommand.RaiseCanExecuteChanged();
try
{
await _outboxProcessor.FlushPendingAsync(CancellationToken.None);
Growl.Success("已触发手动上传,请稍后查看后端数据。");
}
catch (Exception ex)
{
Growl.Warning($"手动上传失败:{ex.Message}");
}
finally
{
_isManualUploading = false;
ManualUploadCommand.RaiseCanExecuteChanged();
}
}
// 全选/取消全选方法
//private void SelectAll(bool isSelected)
//{