feat(BI): 添加轮播大屏功能及相关接口实现
实现质量、工单、毛坯和设备报警大屏的轮播数据展示功能 新增ICarouselBoardService接口及实现类 添加CarouselBoardController控制器处理请求 创建相关DTO模型用于数据传输
This commit is contained in:
349
ZR.Model/MES/BI/carouselBoard/CarouselBoardDto.cs
Normal file
349
ZR.Model/MES/BI/carouselBoard/CarouselBoardDto.cs
Normal file
@@ -0,0 +1,349 @@
|
||||
using MiniExcelLibs.Attributes;
|
||||
|
||||
namespace ZR.Model.mes.carouselBoard
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// 查询内容
|
||||
///</summary>
|
||||
public class CarouselBoardQuery
|
||||
{
|
||||
public string Text { get; set; } = string.Empty;
|
||||
public string SubText { get; set; } = string.Empty;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 工单大屏信息
|
||||
/// </summary>
|
||||
public class WorkOrderCarouseDto
|
||||
{
|
||||
/// <summary>
|
||||
/// 工单号WO20240301001
|
||||
/// </summary>
|
||||
public string Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 毛坯号
|
||||
/// </summary>
|
||||
public string BlankNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 成品零件号
|
||||
/// </summary>
|
||||
public string FinishedPartNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 产品描述
|
||||
/// </summary>
|
||||
public string ProductDescription { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 颜色
|
||||
/// </summary>
|
||||
public string Colour { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 规格
|
||||
/// </summary>
|
||||
public string Specifications { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 编码号
|
||||
/// </summary>
|
||||
public string CodeNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 车数
|
||||
/// </summary>
|
||||
public int VehicleNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 挂具摆放
|
||||
/// </summary>
|
||||
public int HangNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 上件数
|
||||
/// </summary>
|
||||
public int PreviousNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 双组号缸号
|
||||
/// </summary>
|
||||
public string CylinderNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 备注1
|
||||
/// </summary>
|
||||
public string Remark1 { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 备注2
|
||||
/// </summary>
|
||||
public string Remark2 { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 备注3,识别是否需要工单
|
||||
/// </summary>
|
||||
public string Remark3 { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 备注4 :来源
|
||||
/// </summary>
|
||||
public string Remark4 { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 序号
|
||||
/// </summary>
|
||||
public int Sort { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 客户工单号
|
||||
/// </summary>
|
||||
public string ClientWorkorder { get; set; }
|
||||
/// <summary>
|
||||
/// 状态:0初态 1上线
|
||||
/// </summary>
|
||||
public int Status { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 年
|
||||
/// </summary>
|
||||
public int Year { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 周
|
||||
/// </summary>
|
||||
public int Week { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 日
|
||||
/// </summary>
|
||||
public int Date { get; set; }
|
||||
}
|
||||
/// <summary>
|
||||
/// 质量大屏信息
|
||||
/// </summary>
|
||||
public class QualityStatisticsCarouseDto
|
||||
{
|
||||
/// <summary>
|
||||
/// id
|
||||
///</summary>
|
||||
public string Id { get; set; }
|
||||
/// <summary>
|
||||
/// 工单号
|
||||
///</summary>
|
||||
public string WorkorderId { get; set; }
|
||||
/// <summary>
|
||||
/// 零件号
|
||||
///</summary>
|
||||
public string FinishedPartNumber { get; set; }
|
||||
/// <summary>
|
||||
/// 描述
|
||||
///</summary>
|
||||
public string ProductDescription { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 颜色
|
||||
///</summary>
|
||||
public string Color { get; set; }
|
||||
/// <summary>
|
||||
/// 生产投入数
|
||||
///</summary>
|
||||
public int? RequireNumber { get; set; }
|
||||
/// <summary>
|
||||
/// 班次
|
||||
///</summary>
|
||||
public string Team { get; set; }
|
||||
/// <summary>
|
||||
/// 合格数
|
||||
///</summary>
|
||||
public int? QualifiedNumber { get; set; }
|
||||
/// <summary>
|
||||
/// 合格率
|
||||
///</summary>
|
||||
public decimal? QualifiedRate { get; set; }
|
||||
/// <summary>
|
||||
/// 抛光总数
|
||||
///</summary>
|
||||
public int? PaoguangTotal { get; set; }
|
||||
/// <summary>
|
||||
/// 打磨总数
|
||||
///</summary>
|
||||
public int? DamoTotal { get; set; }
|
||||
/// <summary>
|
||||
/// 报废总数
|
||||
///</summary>
|
||||
public int? BaofeiTotal { get; set; }
|
||||
/// <summary>
|
||||
/// 开始时间
|
||||
///</summary>
|
||||
public DateTime? StartTime { get; set; }
|
||||
/// <summary>
|
||||
/// 结束时间
|
||||
///</summary>
|
||||
public DateTime? EndTime { get; set; }
|
||||
/// <summary>
|
||||
/// 备注(报废,打磨,抛光)
|
||||
///</summary>
|
||||
public string Remark { get; set; }
|
||||
/// <summary>
|
||||
/// 备注(报废1,打磨2,抛光3)
|
||||
///</summary>
|
||||
public int Remark2 { get; set; }
|
||||
}
|
||||
/// <summary>
|
||||
/// 毛坯大屏信息
|
||||
/// </summary>
|
||||
public class BlankInventoryCarouseDto
|
||||
{
|
||||
/// <summary>
|
||||
/// 主键
|
||||
/// </summary>
|
||||
[SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
|
||||
public string Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 油漆id
|
||||
/// </summary>
|
||||
public string FkPaintId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 毛坯号
|
||||
/// </summary>
|
||||
public string BlankNum { get; set; }
|
||||
/// <summary>
|
||||
/// 描述
|
||||
/// </summary>
|
||||
public string Description { get; set; }
|
||||
/// <summary>
|
||||
/// 颜色
|
||||
/// </summary>
|
||||
public string Color { get; set; }
|
||||
/// <summary>
|
||||
/// 规格
|
||||
/// </summary>
|
||||
public string Specification { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 库存数量
|
||||
/// </summary>
|
||||
public int? Quantity { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 最大库存
|
||||
/// </summary>
|
||||
public int? MaxNum { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 最小库存
|
||||
/// </summary>
|
||||
public int? MinNum { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 预警库存
|
||||
/// </summary>
|
||||
public int? WarnNum { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 类别
|
||||
/// </summary>
|
||||
public int? Type { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 状态
|
||||
/// </summary>
|
||||
public int? Status { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 备注
|
||||
/// </summary>
|
||||
public string Remark { get; set; }
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 设备报警大屏信息
|
||||
/// </summary>
|
||||
public class DeviceAlarmCarouseDto
|
||||
{
|
||||
/// <summary>
|
||||
/// 编号
|
||||
/// </summary>
|
||||
public string Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 报警类别
|
||||
/// </summary>
|
||||
public string AlarmType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 报警内容
|
||||
/// </summary>
|
||||
public string AlarmContent { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 报警时间
|
||||
/// </summary>
|
||||
public DateTime? AlarmTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 处理状态
|
||||
/// </summary>
|
||||
public string HandleStatus { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 设备实时状态
|
||||
/// </summary>
|
||||
public class DeviceLiveCarouseDto
|
||||
{
|
||||
/// <summary>
|
||||
/// 底漆循环温度
|
||||
/// </summary>
|
||||
public string PrimerCycleTemperature { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 底漆循环湿度
|
||||
/// </summary>
|
||||
public string PrimerCycleHumidity { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 色漆循环温度
|
||||
/// </summary>
|
||||
public string ColorCycleTemperature { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 色漆循环湿度
|
||||
/// </summary>
|
||||
public string ColorCycleHumidity { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 清漆循环温度
|
||||
/// </summary>
|
||||
public string ClearCycleTemperature { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 清漆循环湿度
|
||||
/// </summary>
|
||||
public string ClearCycleHumidity { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 纯水电导率
|
||||
/// </summary>
|
||||
public string PureWaterConductivity { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 水份烘干温度
|
||||
/// </summary>
|
||||
public string MoistureDryingTemperature { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 清漆烘干温度
|
||||
/// </summary>
|
||||
public string ClearDryingTemperature { get; set; }
|
||||
}
|
||||
}
|
||||
91
ZR.Model/MES/Device/DeviceAlarmLog.cs
Normal file
91
ZR.Model/MES/Device/DeviceAlarmLog.cs
Normal file
@@ -0,0 +1,91 @@
|
||||
|
||||
namespace ZR.Model.Business
|
||||
{
|
||||
/// <summary>
|
||||
/// 设备报警日志表
|
||||
/// </summary>
|
||||
[SugarTable("device_alarm_log")]
|
||||
public class DeviceAlarmLog
|
||||
{
|
||||
/// <summary>
|
||||
/// 主键ID
|
||||
/// </summary>
|
||||
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
|
||||
public int Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 编号
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "alarm_no")]
|
||||
public string AlarmNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 时间
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "alarm_time")]
|
||||
public DateTime? AlarmTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 区域
|
||||
/// </summary>
|
||||
public string Area { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 消息文本
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "message_text")]
|
||||
public string MessageText { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 错误点
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "error_point")]
|
||||
public string ErrorPoint { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 状态
|
||||
/// </summary>
|
||||
public string Status { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 优先级
|
||||
/// </summary>
|
||||
public string Priority { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 持续时间(秒)
|
||||
/// </summary>
|
||||
public int? Duration { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 报警回路
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "alarm_circuit")]
|
||||
public string AlarmCircuit { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 确认状态
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "confirm_status")]
|
||||
public string ConfirmStatus { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 消息类型
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "message_type")]
|
||||
public string MessageType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建时间
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "create_time")]
|
||||
public DateTime? CreateTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 更新时间
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "update_time")]
|
||||
public DateTime? UpdateTime { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
@@ -80,20 +80,17 @@
|
||||
[SugarColumn(ColumnName = "end_time")]
|
||||
public DateTime? EndTime { get; set; }
|
||||
/// <summary>
|
||||
/// 备注(报废,打磨,抛光)
|
||||
/// 备注(抛光,打磨,报废)
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "remark")]
|
||||
public string Remark { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 备注(报废1,打磨2,抛光3)
|
||||
/// 备注(抛光1,打磨2,报废3)
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "remark2")]
|
||||
public int Remark2 { get; set; }
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 油漆-缩孔
|
||||
///</summary>
|
||||
|
||||
Reference in New Issue
Block a user