chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善 MCS 桌面代理与开炼机动作同步，修复原料相关菜单权限，桌面端新增上辅机 MES 菜单。

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
chenx
2026-07-27 15:56:05 +08:00
parent 7a9c19e4f3
commit 442a4c8ae2
113 changed files with 10169 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
yy-admin-master/YY.Admin/Views/Dialogs/ServerSettingsDialogView.xaml
View File

@@ -38,6 +38,20 @@
Style="{StaticResource ToggleButtonSwitch}"/>
</DockPanel>
<TextBlock Text="设备库（厂区 SQL Server）" FontWeight="SemiBold" Margin="0,18,0,8"/>
<TextBlock Text="设备 ID" Margin="0,0,0,6"/>
<TextBox Text="{Binding EqDeviceId, UpdateSourceTrigger=PropertyChanged}" Height="32"/>
<TextBlock Text="服务器" Margin="0,12,0,6"/>
<TextBox Text="{Binding EqServerHost, UpdateSourceTrigger=PropertyChanged}" Height="32"/>
<TextBlock Text="端口" Margin="0,12,0,6"/>
<TextBox Text="{Binding EqServerPort, UpdateSourceTrigger=PropertyChanged}" Height="32"/>
<TextBlock Text="数据库" Margin="0,12,0,6"/>
<TextBox Text="{Binding EqDbName, UpdateSourceTrigger=PropertyChanged}" Height="32"/>
<TextBlock Text="用户名" Margin="0,12,0,6"/>
<TextBox Text="{Binding EqUsername, UpdateSourceTrigger=PropertyChanged}" Height="32"/>
<TextBlock Text="密码" Margin="0,12,0,6"/>
<PasswordBox x:Name="EqPasswordBox" Height="32" PasswordChanged="EqPasswordBox_OnPasswordChanged"/>
<TextBlock Text="{Binding ErrorMessage}" Foreground="Red" Margin="0,12,0,0"/>
</StackPanel>

19
yy-admin-master/YY.Admin/Views/Dialogs/ServerSettingsDialogView.xaml.cs
View File

@@ -1,4 +1,6 @@
using System.Windows;
using System.Windows.Controls;
using YY.Admin.ViewModels.Dialogs;
namespace YY.Admin.Views.Dialogs
{
@@ -10,6 +12,23 @@ namespace YY.Admin.Views.Dialogs
public ServerSettingsDialogView()
{
InitializeComponent();
DataContextChanged += OnDataContextChanged;
}
private void OnDataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
{
if (DataContext is ServerSettingsDialogViewModel vm && !string.IsNullOrEmpty(vm.EqPassword))
{
EqPasswordBox.Password = vm.EqPassword;
}
}
private void EqPasswordBox_OnPasswordChanged(object sender, RoutedEventArgs e)
{
if (DataContext is ServerSettingsDialogViewModel vm)
{
vm.EqPassword = EqPasswordBox.Password;
}
}
}
}

100
yy-admin-master/YY.Admin/Views/McsActMill/McsActMillListView.xaml Normal file
View File

@@ -0,0 +1,100 @@
<UserControl x:Class="YY.Admin.Views.McsActMill.McsActMillListView"
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 FilterActName, UpdateSourceTrigger=PropertyChanged}"
Margin="0 0 10 10"
hc:InfoElement.Title="动作名称"
hc:InfoElement.TitlePlacement="Left"
hc:InfoElement.TitleWidth="80"
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 FilterActAddrText, UpdateSourceTrigger=PropertyChanged}"
Margin="0 0 10 10"
hc:InfoElement.Title="动作地址"
hc:InfoElement.TitlePlacement="Left"
hc:InfoElement.TitleWidth="80"
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>
<TextBlock Text="数据直连设备库中间表 MCSToMES_Act_Mill（只读）"
VerticalAlignment="Center"
Foreground="{DynamicResource SecondaryTextBrush}"
FontSize="12"/>
</hc:UniformSpacingPanel>
</Border>
<DataGrid Grid.Row="2"
ItemsSource="{Binding Items}"
AutoGenerateColumns="False"
IsReadOnly="True"
CanUserAddRows="False"
SelectionMode="Single"
GridLinesVisibility="Horizontal"
HorizontalGridLinesBrush="#FFEDEDED"
VerticalGridLinesBrush="Transparent"
HeadersVisibility="All"
ColumnHeaderStyle="{StaticResource CusDataGridColumnHeaderStyle}"
Style="{StaticResource CusDataGridStyle}"
VerticalScrollBarVisibility="Auto"
HorizontalScrollBarVisibility="Auto">
<DataGrid.Columns>
<DataGridTextColumn Header="GUID" Binding="{Binding Guid}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="280"/>
<DataGridTextColumn Header="动作地址" Binding="{Binding ActAddr}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="90"/>
<DataGridTextColumn Header="动作名称" Binding="{Binding ActName}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="140"/>
<DataGridTextColumn Header="动作名称(英)" Binding="{Binding ActNameEn}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="140"/>
<DataGridTextColumn Header="动作备注" Binding="{Binding ActMemo}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="120"/>
<DataGridTextColumn Header="关联地址" Binding="{Binding ActRepaddr}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="90"/>
<DataGridTextColumn Header="写入时间" Binding="{Binding WriteTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="160"/>
<DataGridTextColumn Header="读取时间" Binding="{Binding ReadTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="160"/>
<DataGridTextColumn Header="读写标识" Binding="{Binding RwFlag}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="80"/>
</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>

11
yy-admin-master/YY.Admin/Views/McsActMill/McsActMillListView.xaml.cs Normal file
View File

@@ -0,0 +1,11 @@
using System.Windows.Controls;
namespace YY.Admin.Views.McsActMill;
public partial class McsActMillListView : UserControl
{
public McsActMillListView()
{
InitializeComponent();
}
}

15
yy-admin-master/YY.Admin/Views/UpperMes/BomValidationListView.xaml Normal file
View File

@@ -0,0 +1,15 @@
<UserControl x:Class="YY.Admin.Views.UpperMes.BomValidationListView"
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:prism="http://prismlibrary.com/"
prism:ViewModelLocator.AutoWireViewModel="True"
mc:Ignorable="d">
<Grid Style="{StaticResource BaseViewStyle}">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding Title}" FontSize="22" FontWeight="SemiBold" HorizontalAlignment="Center"/>
<TextBlock Text="功能开发中" Margin="0 16 0 0" FontSize="14" Opacity="0.65" HorizontalAlignment="Center"/>
</StackPanel>
</Grid>
</UserControl>

11
yy-admin-master/YY.Admin/Views/UpperMes/BomValidationListView.xaml.cs Normal file
View File

@@ -0,0 +1,11 @@
using System.Windows.Controls;
namespace YY.Admin.Views.UpperMes;
public partial class BomValidationListView : UserControl
{
public BomValidationListView()
{
InitializeComponent();
}
}

15
yy-admin-master/YY.Admin/Views/UpperMes/EquipmentDowntimeListView.xaml Normal file
View File

@@ -0,0 +1,15 @@
<UserControl x:Class="YY.Admin.Views.UpperMes.EquipmentDowntimeListView"
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:prism="http://prismlibrary.com/"
prism:ViewModelLocator.AutoWireViewModel="True"
mc:Ignorable="d">
<Grid Style="{StaticResource BaseViewStyle}">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding Title}" FontSize="22" FontWeight="SemiBold" HorizontalAlignment="Center"/>
<TextBlock Text="功能开发中" Margin="0 16 0 0" FontSize="14" Opacity="0.65" HorizontalAlignment="Center"/>
</StackPanel>
</Grid>
</UserControl>

11
yy-admin-master/YY.Admin/Views/UpperMes/EquipmentDowntimeListView.xaml.cs Normal file
View File

@@ -0,0 +1,11 @@
using System.Windows.Controls;
namespace YY.Admin.Views.UpperMes;
public partial class EquipmentDowntimeListView : UserControl
{
public EquipmentDowntimeListView()
{
InitializeComponent();
}
}

15
yy-admin-master/YY.Admin/Views/UpperMes/FormulaMaintainListView.xaml Normal file
View File

@@ -0,0 +1,15 @@
<UserControl x:Class="YY.Admin.Views.UpperMes.FormulaMaintainListView"
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:prism="http://prismlibrary.com/"
prism:ViewModelLocator.AutoWireViewModel="True"
mc:Ignorable="d">
<Grid Style="{StaticResource BaseViewStyle}">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding Title}" FontSize="22" FontWeight="SemiBold" HorizontalAlignment="Center"/>
<TextBlock Text="功能开发中" Margin="0 16 0 0" FontSize="14" Opacity="0.65" HorizontalAlignment="Center"/>
</StackPanel>
</Grid>
</UserControl>

11
yy-admin-master/YY.Admin/Views/UpperMes/FormulaMaintainListView.xaml.cs Normal file
View File

@@ -0,0 +1,11 @@
using System.Windows.Controls;
namespace YY.Admin.Views.UpperMes;
public partial class FormulaMaintainListView : UserControl
{
public FormulaMaintainListView()
{
InitializeComponent();
}
}

15
yy-admin-master/YY.Admin/Views/UpperMes/PlanManageListView.xaml Normal file
View File

@@ -0,0 +1,15 @@
<UserControl x:Class="YY.Admin.Views.UpperMes.PlanManageListView"
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:prism="http://prismlibrary.com/"
prism:ViewModelLocator.AutoWireViewModel="True"
mc:Ignorable="d">
<Grid Style="{StaticResource BaseViewStyle}">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding Title}" FontSize="22" FontWeight="SemiBold" HorizontalAlignment="Center"/>
<TextBlock Text="功能开发中" Margin="0 16 0 0" FontSize="14" Opacity="0.65" HorizontalAlignment="Center"/>
</StackPanel>
</Grid>
</UserControl>

11
yy-admin-master/YY.Admin/Views/UpperMes/PlanManageListView.xaml.cs Normal file
View File

@@ -0,0 +1,11 @@
using System.Windows.Controls;
namespace YY.Admin.Views.UpperMes;
public partial class PlanManageListView : UserControl
{
public PlanManageListView()
{
InitializeComponent();
}
}

15
yy-admin-master/YY.Admin/Views/UpperMes/ProductionLogListView.xaml Normal file
View File

@@ -0,0 +1,15 @@
<UserControl x:Class="YY.Admin.Views.UpperMes.ProductionLogListView"
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:prism="http://prismlibrary.com/"
prism:ViewModelLocator.AutoWireViewModel="True"
mc:Ignorable="d">
<Grid Style="{StaticResource BaseViewStyle}">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding Title}" FontSize="22" FontWeight="SemiBold" HorizontalAlignment="Center"/>
<TextBlock Text="功能开发中" Margin="0 16 0 0" FontSize="14" Opacity="0.65" HorizontalAlignment="Center"/>
</StackPanel>
</Grid>
</UserControl>

11
yy-admin-master/YY.Admin/Views/UpperMes/ProductionLogListView.xaml.cs Normal file
View File

@@ -0,0 +1,11 @@
using System.Windows.Controls;
namespace YY.Admin.Views.UpperMes;
public partial class ProductionLogListView : UserControl
{
public ProductionLogListView()
{
InitializeComponent();
}
}

15
yy-admin-master/YY.Admin/Views/UpperMes/ReportQueryListView.xaml Normal file
View File

@@ -0,0 +1,15 @@
<UserControl x:Class="YY.Admin.Views.UpperMes.ReportQueryListView"
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:prism="http://prismlibrary.com/"
prism:ViewModelLocator.AutoWireViewModel="True"
mc:Ignorable="d">
<Grid Style="{StaticResource BaseViewStyle}">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding Title}" FontSize="22" FontWeight="SemiBold" HorizontalAlignment="Center"/>
<TextBlock Text="功能开发中" Margin="0 16 0 0" FontSize="14" Opacity="0.65" HorizontalAlignment="Center"/>
</StackPanel>
</Grid>
</UserControl>

11
yy-admin-master/YY.Admin/Views/UpperMes/ReportQueryListView.xaml.cs Normal file
View File

@@ -0,0 +1,11 @@
using System.Windows.Controls;
namespace YY.Admin.Views.UpperMes;
public partial class ReportQueryListView : UserControl
{
public ReportQueryListView()
{
InitializeComponent();
}
}

15
yy-admin-master/YY.Admin/Views/UpperMes/ShiftHandoverListView.xaml Normal file
View File

@@ -0,0 +1,15 @@
<UserControl x:Class="YY.Admin.Views.UpperMes.ShiftHandoverListView"
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:prism="http://prismlibrary.com/"
prism:ViewModelLocator.AutoWireViewModel="True"
mc:Ignorable="d">
<Grid Style="{StaticResource BaseViewStyle}">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding Title}" FontSize="22" FontWeight="SemiBold" HorizontalAlignment="Center"/>
<TextBlock Text="功能开发中" Margin="0 16 0 0" FontSize="14" Opacity="0.65" HorizontalAlignment="Center"/>
</StackPanel>
</Grid>
</UserControl>

11
yy-admin-master/YY.Admin/Views/UpperMes/ShiftHandoverListView.xaml.cs Normal file
View File

@@ -0,0 +1,11 @@
using System.Windows.Controls;
namespace YY.Admin.Views.UpperMes;
public partial class ShiftHandoverListView : UserControl
{
public ShiftHandoverListView()
{
InitializeComponent();
}
}