新增MES模块,包含供应商、客户、车辆和地磅数据记录管理功能,支持免密接口和数据同步。更新相关控制器、实体、服务和数据库配置,优化权限管理和数据字典支持,确保系统的灵活性和可扩展性。
This commit is contained in:
@@ -44,6 +44,27 @@ namespace YY.Admin.ViewModels.Dialogs
|
||||
set => SetProperty(ref _errorMessage, value);
|
||||
}
|
||||
|
||||
private bool _disconnectConnection;
|
||||
/// <summary>
|
||||
/// 是否断开连接(true=断开,false=连接)
|
||||
/// </summary>
|
||||
public bool DisconnectConnection
|
||||
{
|
||||
get => _disconnectConnection;
|
||||
set
|
||||
{
|
||||
if (SetProperty(ref _disconnectConnection, value))
|
||||
{
|
||||
RaisePropertyChanged(nameof(IsConnectionFieldsEnabled));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 连接参数是否可编辑(勾选断开连接后禁用)。
|
||||
/// </summary>
|
||||
public bool IsConnectionFieldsEnabled => !DisconnectConnection;
|
||||
|
||||
public DelegateCommand SaveCommand { get; }
|
||||
public DelegateCommand CancelCommand { get; }
|
||||
public DialogCloseListener RequestClose { get; private set; }
|
||||
@@ -68,6 +89,7 @@ namespace YY.Admin.ViewModels.Dialogs
|
||||
: settings.WebSocketUrl;
|
||||
_loadedWebSocketUrl = WebSocketUrl;
|
||||
BasePath = string.IsNullOrWhiteSpace(settings.BasePath) ? "/jeecg-boot" : settings.BasePath;
|
||||
DisconnectConnection = settings.DisconnectConnection;
|
||||
ErrorMessage = string.Empty;
|
||||
}
|
||||
|
||||
@@ -102,7 +124,8 @@ namespace YY.Admin.ViewModels.Dialogs
|
||||
BaseScheme = "http",
|
||||
BasePath = basePath,
|
||||
WebSocketUrl = finalWsUrl,
|
||||
WebSocketPath = DefaultWebSocketPath
|
||||
WebSocketPath = DefaultWebSocketPath,
|
||||
DisconnectConnection = DisconnectConnection
|
||||
});
|
||||
RequestClose.Invoke(new DialogResult(ButtonResult.OK));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user