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

桌面端胶料快检实验标准添加

Browse Source
This commit is contained in:
jiangxh
2026-06-17 15:41:06 +08:00
parent e28352f8ea
commit 94b15e5237
43 changed files with 2651 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
yy-admin-master/YY.Admin.Core/Core/Events/RubberQuickTestStdChangedEvent.cs Normal file
View File

@@ -0,0 +1,11 @@
using Prism.Events;
namespace YY.Admin.Core.Events;
public class RubberQuickTestStdChangedPayload
{
public string Action { get; set; } = string.Empty;
public string? StdId { get; set; }
}
public class RubberQuickTestStdChangedEvent : PubSubEvent<RubberQuickTestStdChangedPayload> { }

13
yy-admin-master/YY.Admin.Core/Core/Services/IRubberQuickTestOperationService.cs Normal file
View File

@@ -0,0 +1,13 @@
using YY.Admin.Core.Entity;
namespace YY.Admin.Core.Services;
/// <summary>胶料快检记录操作台：密炼计划筛选、实验标准匹配、记录保存</summary>
public interface IRubberQuickTestOperationService
{
Task<List<MesXslMixingProductionPlan>> GetMixingProductionPlansAsync(CancellationToken ct = default);
Task<MesXslRubberQuickTestStd?> GetStdByRubberMaterialNameAsync(string rubberMaterialName, CancellationToken ct = default);
Task<string?> SaveRecordAsync(MesXslRubberQuickTestRecord record, CancellationToken ct = default);
}

24
yy-admin-master/YY.Admin.Core/Core/Services/IRubberQuickTestStdService.cs Normal file
View File

@@ -0,0 +1,24 @@
using YY.Admin.Core.Entity;
namespace YY.Admin.Core.Services;
/// <summary>胶料快检实验标准（MES 只读同步）</summary>
public interface IRubberQuickTestStdService
{
Task<RubberQuickTestStdPageResult> PageAsync(
int pageNo, int pageSize,
string? stdName = null,
string? rubberMaterialName = null,
string? enableStatus = null,
CancellationToken ct = default);
Task<MesXslRubberQuickTestStd?> GetByIdAsync(string id, CancellationToken ct = default);
Task SyncFromRemoteAsync(CancellationToken ct = default);
}
public record RubberQuickTestStdPageResult(
List<MesXslRubberQuickTestStd> Records,
long Total,
int PageNo,
int PageSize);

28
yy-admin-master/YY.Admin.Core/Entity/MesXslMixingProductionPlan.cs Normal file
View File

@@ -0,0 +1,28 @@
namespace YY.Admin.Core.Entity;
/// <summary>密炼生产计划维护（桌面端快检记录筛选用）</summary>
public class MesXslMixingProductionPlan
{
public string? Id { get; set; }
public int? SortNo { get; set; }
public string? MachineId { get; set; }
public string? MachineName { get; set; }
public string? MorningPlanId { get; set; }
public string? MorningPlanType { get; set; }
public string? MorningOrderNo { get; set; }
public DateTime? MorningOrderDate { get; set; }
public string? MorningFormulaName { get; set; }
public string? NoonPlanId { get; set; }
public string? NoonPlanType { get; set; }
public string? NoonOrderNo { get; set; }
public DateTime? NoonOrderDate { get; set; }
public string? NoonFormulaName { get; set; }
public string? NightPlanId { get; set; }
public string? NightPlanType { get; set; }
public string? NightOrderNo { get; set; }
public DateTime? NightOrderDate { get; set; }
public string? NightFormulaName { get; set; }
}

24
yy-admin-master/YY.Admin.Core/Entity/MesXslRubberQuickTestRecord.cs Normal file
View File

@@ -0,0 +1,24 @@
namespace YY.Admin.Core.Entity;
public class MesXslRubberQuickTestRecord
{
public string? Id { get; set; }
public string? RecordNo { get; set; }
public string? RubberMaterialId { get; set; }
public string? RubberMaterialName { get; set; }
public string? StdId { get; set; }
public string? ProdEquipmentLedgerId { get; set; }
public string? ProdEquipmentName { get; set; }
public DateTime? ProductionDate { get; set; }
public string? TrainNo { get; set; }
public string? WorkShift { get; set; }
public int? InspectTimes { get; set; }
public DateTime? InspectTime { get; set; }
public string? InspectorUserId { get; set; }
public string? InspectorUsername { get; set; }
public string? InspectorRealname { get; set; }
public string? InspectResult { get; set; }
public string? ProductionPlanNo { get; set; }
public List<MesXslRubberQuickTestRecordLine>? LineList { get; set; }
public List<MesXslRubberQuickTestRecordRawLine>? RawLineList { get; set; }
}

13
yy-admin-master/YY.Admin.Core/Entity/MesXslRubberQuickTestRecordLine.cs Normal file
View File

@@ -0,0 +1,13 @@
namespace YY.Admin.Core.Entity;
public class MesXslRubberQuickTestRecordLine
{
public string? Id { get; set; }
public string? RecordId { get; set; }
public string? DataPointId { get; set; }
public string? InspectItem { get; set; }
public decimal? LowerLimit { get; set; }
public decimal? InspectValue { get; set; }
public decimal? UpperLimit { get; set; }
public int? SortNo { get; set; }
}

17
yy-admin-master/YY.Admin.Core/Entity/MesXslRubberQuickTestRecordRawLine.cs Normal file
View File

@@ -0,0 +1,17 @@
namespace YY.Admin.Core.Entity;
/// <summary>MES 胶料快检记录原始数据明细</summary>
public class MesXslRubberQuickTestRecordRawLine
{
public string? Id { get; set; }
public string? RecordId { get; set; }
public string? RowNo { get; set; }
public string? DataPointId { get; set; }
public string? InspectItem { get; set; }
public decimal? LowerLimit { get; set; }
public decimal? UpperLimit { get; set; }
public decimal? InspectValue { get; set; }
/// <summary>行检验结果：1合格 0不合格</summary>
public string? RowInspectResult { get; set; }
public int? SortNo { get; set; }
}

32
yy-admin-master/YY.Admin.Core/Entity/MesXslRubberQuickTestStd.cs Normal file
View File

@@ -0,0 +1,32 @@
using System;
namespace YY.Admin.Core.Entity;
/// <summary>MES 胶料快检实验标准主表（桌面端只读同步）</summary>
public class MesXslRubberQuickTestStd
{
public string? Id { get; set; }
public string? StdName { get; set; }
public string? TestMethodId { get; set; }
public string? TestMethodName { get; set; }
public string? MixerType { get; set; }
public string? RubberMaterialId { get; set; }
public string? RubberMaterialName { get; set; }
public string? PsCompileId { get; set; }
public string? IssueNumber { get; set; }
public DateTime? IssueDate { get; set; }
public string? IssueDeptId { get; set; }
public string? IssueDeptName { get; set; }
public string? EnableStatus { get; set; }
public string? AuditStatus { get; set; }
public int? TenantId { get; set; }
public string? SysOrgCode { get; set; }
public string? CreateBy { get; set; }
public DateTime? CreateTime { get; set; }
public string? UpdateBy { get; set; }
public DateTime? UpdateTime { get; set; }
public List<MesXslRubberQuickTestStdLine>? LineList { get; set; }
public string EnableStatusText => EnableStatus == "0" ? "已停用" : EnableStatus == "1" ? "使用中" : EnableStatus ?? string.Empty;
public string AuditStatusText => AuditStatus == "1" ? "已批准" : AuditStatus == "0" ? "草稿" : AuditStatus ?? string.Empty;
}

15
yy-admin-master/YY.Admin.Core/Entity/MesXslRubberQuickTestStdLine.cs Normal file
View File

@@ -0,0 +1,15 @@
namespace YY.Admin.Core.Entity;
public class MesXslRubberQuickTestStdLine
{
public string? Id { get; set; }
public string? StdId { get; set; }
public string? DataPointId { get; set; }
public string? PointName { get; set; }
public decimal? LowerLimit { get; set; }
public decimal? UpperLimit { get; set; }
public decimal? LowerWarn { get; set; }
public decimal? UpperWarn { get; set; }
public decimal? TargetValue { get; set; }
public int? SortNo { get; set; }
}

4
yy-admin-master/YY.Admin.Core/SeedData/SysMenuSeedData.cs
View File

@@ -48,6 +48,10 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
new SysMenu{ Id=1300150011001, Pid=1300150000101, Title="库区管理", Path="/xslmes/mesXslWarehouseArea", Name="mesXslWarehouseArea", Component="WarehouseAreaListView", Icon="&#xe7ce;", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=109 },
// 密炼物料皮重策略
new SysMenu{ Id=1300150011101, Pid=1300150000101, Title="密炼物料皮重策略", Path="/xslmes/mesXslMixerMaterialTareStrategy", Name="mesXslMixerMaterialTareStrategy", Component="MixerMaterialTareStrategyListView", Icon="&#xe7ce;", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=110 },
// 快检记录
new SysMenu{ Id=1300150011201, Pid=1300150000101, Title="快检记录", Path="/xslmes/rubberQuickTestOperation", Name="rubberQuickTestOperation", Component="RubberQuickTestOperationView", Icon="&#xe7de;", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=111 },
// 胶料快检实验标准（桌面端只读）
new SysMenu{ Id=1300150011301, Pid=1300150000101, Title="胶料快检实验标准", Path="/xslmes/mesXslRubberQuickTestStd", Name="mesXslRubberQuickTestStd", Component="RubberQuickTestStdListView", Icon="&#xe7ce;", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=112 },
#endregion

2
yy-admin-master/YY.Admin.Core/SeedData/SysTenantMenuSeedData.cs
View File

@@ -32,6 +32,8 @@ public class SysTenantMenuSeedData : ISqlSugarEntitySeedData<SysTenantMenu>
new SysTenantMenu(){ TenantId=1300000000001,MenuId=1300150010901},
new SysTenantMenu(){ TenantId=1300000000001,MenuId=1300150011001},
new SysTenantMenu(){ TenantId=1300000000001,MenuId=1300150011101},
new SysTenantMenu(){ TenantId=1300000000001,MenuId=1300150011201},
new SysTenantMenu(){ TenantId=1300000000001,MenuId=1300150011301},
new SysTenantMenu(){ TenantId=1300000000001,MenuId=1300200012101},
new SysTenantMenu(){ TenantId=1300000000001,MenuId=1300200012111},
new SysTenantMenu(){ TenantId=1300000000001,MenuId=1300200012121},