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

11
yy-admin-master/YY.Admin/Module/NavigationExtensions.cs
View File

@@ -21,6 +21,8 @@ using YY.Admin.Views.MixerMaterialTareStrategy;
using YY.Admin.Views.RubberQuickTest;
using YY.Admin.Views.RubberQuickTestStd;
using YY.Admin.Views.MixingProductionPlan;
using YY.Admin.Views.McsActMill;
using YY.Admin.Views.UpperMes;
namespace YY.Admin
{
@@ -105,6 +107,15 @@ namespace YY.Admin
containerRegistry.RegisterForNavigation<RubberQuickTestStdListView>();
// 密炼计划（只读）
containerRegistry.RegisterForNavigation<MixingProductionPlanListView>();
containerRegistry.RegisterForNavigation<McsActMillListView>();
// 上辅机mes功能（占位）
containerRegistry.RegisterForNavigation<ShiftHandoverListView>();
containerRegistry.RegisterForNavigation<BomValidationListView>();
containerRegistry.RegisterForNavigation<FormulaMaintainListView>();
containerRegistry.RegisterForNavigation<PlanManageListView>();
containerRegistry.RegisterForNavigation<ReportQueryListView>();
containerRegistry.RegisterForNavigation<EquipmentDowntimeListView>();
containerRegistry.RegisterForNavigation<ProductionLogListView>();
// 打印设置
containerRegistry.RegisterForNavigation<PrintSettingsView>();
// 打印模板列表

21
yy-admin-master/YY.Admin/Module/SyncModule.cs
View File

@@ -30,6 +30,7 @@ using YY.Admin.Services.Service.Print;
using YY.Admin.Services.Service.RubberQuickTest;
using YY.Admin.Services.Service.RubberQuickTestStd;
using YY.Admin.Services.Service.MixingProductionPlan;
using YY.Admin.Services.Service.EquipmentDb;
namespace YY.Admin.Module;
@@ -103,6 +104,11 @@ public class SyncModule : IModule
containerRegistry.RegisterSingleton<IMixingProductionPlanService, MixingProductionPlanService>();
containerRegistry.RegisterSingleton<MixingProductionPlanSyncCoordinator>();
// 设备库代理（厂区 SQL Server 直连 + EQ_* 命令执行）
containerRegistry.RegisterSingleton<IEquipmentDbConnectionFactory, EquipmentDbConnectionFactory>();
containerRegistry.RegisterSingleton<EquipmentDbCommandHandler>();
containerRegistry.RegisterSingleton<IMcsActMillService, McsActMillService>();
var serviceCollection = new ServiceCollection();
serviceCollection.AddTransient<DisconnectGuardHandler>();
serviceCollection.AddHttpClient("JeecgApi", (sp, client) =>
@@ -179,6 +185,21 @@ public class SyncModule : IModule
_ = containerProvider.Resolve<RubberQuickTestStdSyncCoordinator>();
// 密炼计划只读同步协调器
_ = containerProvider.Resolve<MixingProductionPlanSyncCoordinator>();
// 设备库命令处理器（订阅 EQ_*）
var eqHandler = containerProvider.Resolve<EquipmentDbCommandHandler>();
_ = Task.Run(async () =>
{
try
{
var factory = containerProvider.Resolve<IEquipmentDbConnectionFactory>();
var (ok, msg) = await factory.TestAsync(CancellationToken.None).ConfigureAwait(false);
await eqHandler.ReportStatusAsync(ok, msg, CancellationToken.None).ConfigureAwait(false);
}
catch (Exception ex)
{
await eqHandler.ReportStatusAsync(false, ex.Message, CancellationToken.None).ConfigureAwait(false);
}
});
}
private static IAsyncPolicy<HttpResponseMessage> GetRetryPolicy()