完成板卡履历记录
This commit is contained in:
parent
08af2a04e8
commit
1f1376e5f7
@ -11,6 +11,7 @@ using System;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Linq.Dynamic.Core;
|
using System.Linq.Dynamic.Core;
|
||||||
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Xml.Serialization;
|
using System.Xml.Serialization;
|
||||||
using ToolLibrary.LogHelper;
|
using ToolLibrary.LogHelper;
|
||||||
@ -150,7 +151,13 @@ namespace YunDa.ISAS.Application.GeneralInformation
|
|||||||
var deviceBoardCard = boardCards.FirstOrDefault(t => t.ProtectionDeviceInfoId == protectionDevice.Id&&t.BoardId == input.BoardId);
|
var deviceBoardCard = boardCards.FirstOrDefault(t => t.ProtectionDeviceInfoId == protectionDevice.Id&&t.BoardId == input.BoardId);
|
||||||
if (deviceBoardCard!=null)
|
if (deviceBoardCard!=null)
|
||||||
{
|
{
|
||||||
if (deviceBoardCard.SerialNumber != input.SerialNumber)
|
if (deviceBoardCard.SerialNumber != input.SerialNumber
|
||||||
|
|| deviceBoardCard.MaintenanceRecord != input.MaintenanceRecord
|
||||||
|
|| deviceBoardCard.VerificationRecords != input.VerificationRecords
|
||||||
|
|| deviceBoardCard.VerificationDate != input.VerificationDate
|
||||||
|
|| deviceBoardCard.VerificationPerson != input.VerificationPerson
|
||||||
|
|| deviceBoardCard.ProductionDate != input.ProductionDate
|
||||||
|
)
|
||||||
{
|
{
|
||||||
var deviceBoardCardHistory = _boardCardHistoryRepository.GetAll().Where(t => t.BoardCardInfoId == deviceBoardCard.Id).ToList();
|
var deviceBoardCardHistory = _boardCardHistoryRepository.GetAll().Where(t => t.BoardCardInfoId == deviceBoardCard.Id).ToList();
|
||||||
|
|
||||||
@ -174,23 +181,42 @@ namespace YunDa.ISAS.Application.GeneralInformation
|
|||||||
deviceBoardCard.VerificationRecords = input.VerificationRecords;
|
deviceBoardCard.VerificationRecords = input.VerificationRecords;
|
||||||
var newjson = JsonConvert.SerializeObject(deviceBoardCard);
|
var newjson = JsonConvert.SerializeObject(deviceBoardCard);
|
||||||
boardHistory.ContentNewJson = newjson;
|
boardHistory.ContentNewJson = newjson;
|
||||||
|
// 记录变更内容
|
||||||
|
var eventDescription = new StringBuilder();
|
||||||
|
// 通过判定每个字段是否发生变化,动态生成描述
|
||||||
|
if (deviceBoardCard.SerialNumber != input.SerialNumber)
|
||||||
|
{
|
||||||
|
eventDescription.AppendLine($"更换了设备的厂商序列号: {deviceBoardCard.SerialNumber} -> {input.SerialNumber}");
|
||||||
|
}
|
||||||
|
if (deviceBoardCard.MaintenanceRecord != input.MaintenanceRecord)
|
||||||
|
{
|
||||||
|
eventDescription.AppendLine($"更新了设备的维修记录: {deviceBoardCard.MaintenanceRecord} -> {input.MaintenanceRecord}");
|
||||||
|
}
|
||||||
|
if (deviceBoardCard.VerificationRecords != input.VerificationRecords)
|
||||||
|
{
|
||||||
|
eventDescription.AppendLine($"更改了设备的验证记录: {deviceBoardCard.VerificationRecords} -> {input.VerificationRecords}");
|
||||||
|
}
|
||||||
|
if (deviceBoardCard.VerificationDate != input.VerificationDate)
|
||||||
|
{
|
||||||
|
eventDescription.AppendLine($"修改了设备的验证日期: {deviceBoardCard.VerificationDate} -> {input.VerificationDate}");
|
||||||
|
}
|
||||||
|
if (deviceBoardCard.VerificationPerson != input.VerificationPerson)
|
||||||
|
{
|
||||||
|
eventDescription.AppendLine($"更新了设备的验证人员: {deviceBoardCard.VerificationPerson} -> {input.VerificationPerson}");
|
||||||
|
}
|
||||||
|
if (deviceBoardCard.ProductionDate != input.ProductionDate)
|
||||||
|
{
|
||||||
|
eventDescription.AppendLine($"更改了设备的生产日期: {deviceBoardCard.ProductionDate} -> {input.ProductionDate}");
|
||||||
|
}
|
||||||
|
boardHistory.EventDescription = eventDescription.ToString();
|
||||||
|
boardHistory.EventRecordType = EventRecordTypeEnum.Board;
|
||||||
|
boardHistory.Remark = input.Remark;
|
||||||
_boardCardHistoryRepository.Insert(boardHistory);
|
_boardCardHistoryRepository.Insert(boardHistory);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_boardCardInfoRepository.Insert(new BoardCardInfo
|
|
||||||
{
|
|
||||||
SeqNo = 1,
|
|
||||||
BoardId=input.BoardId,
|
|
||||||
SerialNumber=input.SerialNumber,
|
|
||||||
BoardType=input.BoardType,
|
|
||||||
ProductionDate=input.ProductionDate,
|
|
||||||
VerificationDate=input.VerificationDate,
|
|
||||||
VerificationPerson=input.VerificationPerson,
|
|
||||||
VerificationRecords=input.VerificationRecords,
|
|
||||||
ProtectionDeviceInfoId=deviceBoardCard.Id,
|
|
||||||
});
|
|
||||||
//rst.Message = "未找到对应板卡";
|
//rst.Message = "未找到对应板卡";
|
||||||
}
|
}
|
||||||
rst.Flag = true;
|
rst.Flag = true;
|
||||||
@ -545,54 +571,131 @@ namespace YunDa.ISAS.Application.GeneralInformation
|
|||||||
{
|
{
|
||||||
var device = devices[0];
|
var device = devices[0];
|
||||||
device.ProtectionDeviceTypeId = protectionDeviceTypes.FirstOrDefault(t => t.Model == input.DeviceType)?.Id;
|
device.ProtectionDeviceTypeId = protectionDeviceTypes.FirstOrDefault(t => t.Model == input.DeviceType)?.Id;
|
||||||
//device.BaselineBoardVersion = input.
|
|
||||||
var deviceBoards = boards.Where(t => t.ProtectionDeviceInfoId == device.Id);
|
var deviceBoards = boards.Where(t => t.ProtectionDeviceInfoId == device.Id).ToList();
|
||||||
//保护
|
|
||||||
BoardCardInfo cpuCardInfo = deviceBoards.FirstOrDefault(t => t.BoardId == "B01");
|
// 记录历史数据的方法
|
||||||
cpuCardInfo.FpgaVersion = input.FpgaVer;
|
void RecordBoardCardHistory(BoardCardInfo oldCardInfo, BoardCardInfo newCardInfo, string boardId)
|
||||||
cpuCardInfo.InterfaceDatabaseVersion = input.CommcpuCfgVer;
|
|
||||||
cpuCardInfo.InterfaceVersion = input.CommcpuVer;
|
|
||||||
cpuCardInfo.InterfaceChecksum = input.CommcpuCrc;
|
|
||||||
cpuCardInfo.SystemVersion = input.LinuxVer;
|
|
||||||
cpuCardInfo.ProtectionChecksum = input.ProtectCrc;
|
|
||||||
cpuCardInfo.ProtectionDatabaseVersion = input.ProtectCfgVer;
|
|
||||||
cpuCardInfo.ProtectionVersion = input.ProtectVer;
|
|
||||||
//液晶
|
|
||||||
BoardCardInfo ioyjCardInfo = deviceBoards.FirstOrDefault(t => t.BoardId == "液晶");
|
|
||||||
ioyjCardInfo.YjVersion = input.YjVer;
|
|
||||||
ioyjCardInfo.YjCrc = input.YjCrc;
|
|
||||||
if (input.IoVersion.Count==5)
|
|
||||||
{
|
{
|
||||||
BoardCardInfo io1CardInfo = deviceBoards.FirstOrDefault(t => t.BoardId == "B03");
|
if (oldCardInfo != null && newCardInfo != null)
|
||||||
io1CardInfo.IOVersion = input.IoVersion[0].IoVer;
|
{
|
||||||
io1CardInfo.IOCrc = input.IoVersion[0].IoCrc;
|
var eventDescription = new StringBuilder();
|
||||||
|
var eventRecordType = EventRecordTypeEnum.Software; // 默认修改事件类型
|
||||||
|
// 比较各个字段,如果不一致则记录
|
||||||
|
if (oldCardInfo.FpgaVersion != newCardInfo.FpgaVersion)
|
||||||
|
eventDescription.AppendLine($"FPGA版本更改: {oldCardInfo.FpgaVersion} -> {newCardInfo.FpgaVersion}");
|
||||||
|
if (oldCardInfo.InterfaceDatabaseVersion != newCardInfo.InterfaceDatabaseVersion)
|
||||||
|
eventDescription.AppendLine($"接口数据库版本更改: {oldCardInfo.InterfaceDatabaseVersion} -> {newCardInfo.InterfaceDatabaseVersion}");
|
||||||
|
if (oldCardInfo.InterfaceVersion != newCardInfo.InterfaceVersion)
|
||||||
|
eventDescription.AppendLine($"接口版本更改: {oldCardInfo.InterfaceVersion} -> {newCardInfo.InterfaceVersion}");
|
||||||
|
if (oldCardInfo.InterfaceChecksum != newCardInfo.InterfaceChecksum)
|
||||||
|
eventDescription.AppendLine($"接口校验和更改: {oldCardInfo.InterfaceChecksum} -> {newCardInfo.InterfaceChecksum}");
|
||||||
|
if (oldCardInfo.SystemVersion != newCardInfo.SystemVersion)
|
||||||
|
eventDescription.AppendLine($"系统版本更改: {oldCardInfo.SystemVersion} -> {newCardInfo.SystemVersion}");
|
||||||
|
if (oldCardInfo.ProtectionChecksum != newCardInfo.ProtectionChecksum)
|
||||||
|
eventDescription.AppendLine($"保护校验和更改: {oldCardInfo.ProtectionChecksum} -> {newCardInfo.ProtectionChecksum}");
|
||||||
|
if (oldCardInfo.ProtectionDatabaseVersion != newCardInfo.ProtectionDatabaseVersion)
|
||||||
|
eventDescription.AppendLine($"保护数据库版本更改: {oldCardInfo.ProtectionDatabaseVersion} -> {newCardInfo.ProtectionDatabaseVersion}");
|
||||||
|
if (oldCardInfo.ProtectionVersion != newCardInfo.ProtectionVersion)
|
||||||
|
eventDescription.AppendLine($"保护版本更改: {oldCardInfo.ProtectionVersion} -> {newCardInfo.ProtectionVersion}");
|
||||||
|
if (oldCardInfo.YjVersion != newCardInfo.YjVersion)
|
||||||
|
eventDescription.AppendLine($"液晶版本更改: {oldCardInfo.YjVersion} -> {newCardInfo.YjVersion}");
|
||||||
|
if (oldCardInfo.YjCrc != newCardInfo.YjCrc)
|
||||||
|
eventDescription.AppendLine($"液晶CRC更改: {oldCardInfo.YjCrc} -> {newCardInfo.YjCrc}");
|
||||||
|
|
||||||
BoardCardInfo io2CardInfo = deviceBoards.FirstOrDefault(t => t.BoardId == "B04");
|
if (eventDescription.Length > 0)
|
||||||
io2CardInfo.IOVersion = input.IoVersion[1].IoVer;
|
{
|
||||||
io2CardInfo.IOCrc = input.IoVersion[1].IoCrc;
|
var json = JsonConvert.SerializeObject(oldCardInfo);
|
||||||
|
var newJson = JsonConvert.SerializeObject(newCardInfo);
|
||||||
BoardCardInfo io3CardInfo = deviceBoards.FirstOrDefault(t => t.BoardId == "B05");
|
|
||||||
io3CardInfo.IOVersion = input.IoVersion[2].IoVer;
|
|
||||||
io3CardInfo.IOCrc = input.IoVersion[2].IoCrc;
|
|
||||||
|
|
||||||
BoardCardInfo io4CardInfo = deviceBoards.FirstOrDefault(t => t.BoardId == "B06");
|
|
||||||
io4CardInfo.IOVersion = input.IoVersion[3].IoVer;
|
|
||||||
io4CardInfo.IOCrc = input.IoVersion[3].IoCrc;
|
|
||||||
|
|
||||||
BoardCardInfo io5CardInfo = deviceBoards.FirstOrDefault(t => t.BoardId == "B07");
|
|
||||||
io5CardInfo.IOVersion = input.IoVersion[4].IoVer;
|
|
||||||
io5CardInfo.IOCrc = input.IoVersion[4].IoCrc;
|
|
||||||
|
|
||||||
|
// 创建历史记录
|
||||||
|
var historyRecord = new BoardCardHistory
|
||||||
|
{
|
||||||
|
ProtectionDeviceInfoId = device.Id,
|
||||||
|
BoardCardInfoId = oldCardInfo.Id,
|
||||||
|
BoardId = boardId,
|
||||||
|
RecodeDate = DateTime.Now,
|
||||||
|
ContentJson = json,
|
||||||
|
ContentNewJson = newJson,
|
||||||
|
EventDescription = eventDescription.ToString(),
|
||||||
|
EventRecordType = eventRecordType,
|
||||||
|
SeqNo = deviceBoards.Count > 0 ? deviceBoards.Max(t => t.SeqNo) + 1 : 1,
|
||||||
|
IsSend = false // 默认为未发送,您可以根据需要调整
|
||||||
|
};
|
||||||
|
|
||||||
|
// 记录历史
|
||||||
|
_boardCardHistoryRepository.Insert(historyRecord);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 保护板卡
|
||||||
|
BoardCardInfo cpuCardInfo = deviceBoards.FirstOrDefault(t => t.BoardId == "B01");
|
||||||
|
if (cpuCardInfo != null)
|
||||||
|
{
|
||||||
|
var newCpuCardInfo = new BoardCardInfo
|
||||||
|
{
|
||||||
|
FpgaVersion = input.FpgaVer,
|
||||||
|
InterfaceDatabaseVersion = input.CommcpuCfgVer,
|
||||||
|
InterfaceVersion = input.CommcpuVer,
|
||||||
|
InterfaceChecksum = input.CommcpuCrc,
|
||||||
|
SystemVersion = input.LinuxVer,
|
||||||
|
ProtectionChecksum = input.ProtectCrc,
|
||||||
|
ProtectionDatabaseVersion = input.ProtectCfgVer,
|
||||||
|
ProtectionVersion = input.ProtectVer
|
||||||
|
};
|
||||||
|
|
||||||
|
RecordBoardCardHistory(cpuCardInfo, newCpuCardInfo, "B01");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 液晶板卡
|
||||||
|
BoardCardInfo ioyjCardInfo = deviceBoards.FirstOrDefault(t => t.BoardId == "液晶");
|
||||||
|
if (ioyjCardInfo != null)
|
||||||
|
{
|
||||||
|
var newIoyjCardInfo = new BoardCardInfo
|
||||||
|
{
|
||||||
|
YjVersion = input.YjVer,
|
||||||
|
YjCrc = input.YjCrc
|
||||||
|
};
|
||||||
|
|
||||||
|
RecordBoardCardHistory(ioyjCardInfo, newIoyjCardInfo, "液晶");
|
||||||
|
}
|
||||||
|
|
||||||
|
// IO板卡
|
||||||
|
if (input.IoVersion.Count > 0)
|
||||||
|
{
|
||||||
|
var boardIdMap = new Dictionary<string, int>
|
||||||
|
{
|
||||||
|
{ "B03", 0 },
|
||||||
|
{ "B04", 1 },
|
||||||
|
{ "B05", 2 },
|
||||||
|
{ "B06", 3 },
|
||||||
|
{ "B07", 4 }
|
||||||
|
};
|
||||||
|
|
||||||
|
foreach (var boardId in boardIdMap.Keys)
|
||||||
|
{
|
||||||
|
var boardCardInfo = deviceBoards.FirstOrDefault(t => t.BoardId == boardId);
|
||||||
|
if (boardCardInfo != null)
|
||||||
|
{
|
||||||
|
var ioVersion = input.IoVersion[boardIdMap[boardId]];
|
||||||
|
var newIoCardInfo = new BoardCardInfo
|
||||||
|
{
|
||||||
|
IOVersion = ioVersion.IoVer,
|
||||||
|
IOCrc = ioVersion.IoCrc
|
||||||
|
};
|
||||||
|
|
||||||
|
RecordBoardCardHistory(boardCardInfo, newIoCardInfo, boardId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
rst.Flag = true;
|
rst.Flag = true;
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
rst.Message = ex.Message;
|
||||||
|
|
||||||
}
|
}
|
||||||
return rst;
|
return rst;
|
||||||
}
|
}
|
||||||
|
@ -6,6 +6,7 @@ using YunDa.ISAS.DataTransferObject;
|
|||||||
using YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoDto;
|
using YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoDto;
|
||||||
using YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoDto.HistoryData;
|
using YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoDto.HistoryData;
|
||||||
using YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoDto.SearchCondition;
|
using YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoDto.SearchCondition;
|
||||||
|
using YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionSettingDto;
|
||||||
|
|
||||||
namespace YunDa.ISAS.Application.GeneralInformation
|
namespace YunDa.ISAS.Application.GeneralInformation
|
||||||
{
|
{
|
||||||
@ -24,5 +25,16 @@ namespace YunDa.ISAS.Application.GeneralInformation
|
|||||||
/// <param name="deviceId"></param>
|
/// <param name="deviceId"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
Task<RequestResult<List<DeviceRunState>>> GetBoardStateInfo(Guid equipmentId, Guid deviceId);
|
Task<RequestResult<List<DeviceRunState>>> GetBoardStateInfo(Guid equipmentId, Guid deviceId);
|
||||||
|
/// <summary>
|
||||||
|
/// 扫码枪输入设备信息
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="input"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
RequestEasyResult ScanDeviceQRCode(EditBoardCardQrCodeInput input);
|
||||||
|
/// <summary>
|
||||||
|
/// 更新版本信息
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
RequestEasyResult ModifyBoardInfoList(ProtectionDeviceVersionInfo input);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -10,6 +10,7 @@ using System;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Linq.Dynamic.Core;
|
using System.Linq.Dynamic.Core;
|
||||||
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using ToolLibrary.LogHelper;
|
using ToolLibrary.LogHelper;
|
||||||
using YunDa.ISAS.Application.Core;
|
using YunDa.ISAS.Application.Core;
|
||||||
@ -201,7 +202,13 @@ namespace YunDa.ISAS.Application.GeneralInformation
|
|||||||
if (protectionDevice != null)
|
if (protectionDevice != null)
|
||||||
{
|
{
|
||||||
//当出厂编号不一致进行履历更新
|
//当出厂编号不一致进行履历更新
|
||||||
if (protectionDevice.EquipmentInfo.FactorySerialNumber != input.SerialNumber)
|
if (protectionDevice.EquipmentInfo.FactorySerialNumber != input.SerialNumber
|
||||||
|
|| protectionDevice.EquipmentInfo.MaintenanceRecord!= input.MaintenanceRecord
|
||||||
|
|| protectionDevice.EquipmentInfo.VerificationRecords != input.VerificationRecords
|
||||||
|
|| protectionDevice.EquipmentInfo.VerificationDate != input.VerificationDate
|
||||||
|
|| protectionDevice.EquipmentInfo.VerificationPerson!= input.VerificationPerson
|
||||||
|
|| protectionDevice.EquipmentInfo.ProductionDate != input.ProductionDate
|
||||||
|
)
|
||||||
{
|
{
|
||||||
var json = JsonConvert.SerializeObject(protectionDevice);
|
var json = JsonConvert.SerializeObject(protectionDevice);
|
||||||
var protectionDeviceHistory = _protectionDeviceHistoryRepository.GetAll().Where(t => t.ProtectionDeviceInfoId == protectionDevice.Id).ToList();
|
var protectionDeviceHistory = _protectionDeviceHistoryRepository.GetAll().Where(t => t.ProtectionDeviceInfoId == protectionDevice.Id).ToList();
|
||||||
@ -223,8 +230,38 @@ namespace YunDa.ISAS.Application.GeneralInformation
|
|||||||
protectionDevice.EquipmentInfo.VerificationRecords = input.VerificationRecords;
|
protectionDevice.EquipmentInfo.VerificationRecords = input.VerificationRecords;
|
||||||
var newjson = JsonConvert.SerializeObject(protectionDevice);
|
var newjson = JsonConvert.SerializeObject(protectionDevice);
|
||||||
deviceHistory.ContentNewJson = newjson;
|
deviceHistory.ContentNewJson = newjson;
|
||||||
_protectionDeviceHistoryRepository.Insert(deviceHistory);
|
// 记录变更内容
|
||||||
|
var eventDescription = new StringBuilder();
|
||||||
|
|
||||||
|
// 通过判定每个字段是否发生变化,动态生成描述
|
||||||
|
if (protectionDevice.EquipmentInfo.FactorySerialNumber != input.SerialNumber)
|
||||||
|
{
|
||||||
|
eventDescription.AppendLine($"更换了设备的厂商序列号: {protectionDevice.EquipmentInfo.FactorySerialNumber} -> {input.SerialNumber}");
|
||||||
|
}
|
||||||
|
if (protectionDevice.EquipmentInfo.MaintenanceRecord != input.MaintenanceRecord)
|
||||||
|
{
|
||||||
|
eventDescription.AppendLine($"更新了设备的维修记录: {protectionDevice.EquipmentInfo.MaintenanceRecord} -> {input.MaintenanceRecord}");
|
||||||
|
}
|
||||||
|
if (protectionDevice.EquipmentInfo.VerificationRecords != input.VerificationRecords)
|
||||||
|
{
|
||||||
|
eventDescription.AppendLine($"更改了设备的检验记录: {protectionDevice.EquipmentInfo.VerificationRecords} -> {input.VerificationRecords}");
|
||||||
|
}
|
||||||
|
if (protectionDevice.EquipmentInfo.VerificationDate != input.VerificationDate)
|
||||||
|
{
|
||||||
|
eventDescription.AppendLine($"修改了设备的检验日期: {protectionDevice.EquipmentInfo.VerificationDate} -> {input.VerificationDate}");
|
||||||
|
}
|
||||||
|
if (protectionDevice.EquipmentInfo.VerificationPerson != input.VerificationPerson)
|
||||||
|
{
|
||||||
|
eventDescription.AppendLine($"更新了设备的检验人员: {protectionDevice.EquipmentInfo.VerificationPerson} -> {input.VerificationPerson}");
|
||||||
|
}
|
||||||
|
if (protectionDevice.EquipmentInfo.ProductionDate != input.ProductionDate)
|
||||||
|
{
|
||||||
|
eventDescription.AppendLine($"更改了设备的生产日期: {protectionDevice.EquipmentInfo.ProductionDate} -> {input.ProductionDate}");
|
||||||
|
}
|
||||||
|
deviceHistory.EventDescription = eventDescription.ToString();
|
||||||
|
deviceHistory.EventRecordType = EventRecordTypeEnum.Device;
|
||||||
|
deviceHistory.Remark = input.Remark;
|
||||||
|
_protectionDeviceHistoryRepository.Insert(deviceHistory);
|
||||||
}
|
}
|
||||||
rst.Flag = true;
|
rst.Flag = true;
|
||||||
}
|
}
|
||||||
@ -236,7 +273,7 @@ namespace YunDa.ISAS.Application.GeneralInformation
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
throw;
|
rst.Message = ex.Message;
|
||||||
}
|
}
|
||||||
|
|
||||||
return rst;
|
return rst;
|
||||||
|
@ -118,6 +118,14 @@ namespace YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoD
|
|||||||
/// 检验记录
|
/// 检验记录
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public virtual string VerificationRecords { get; set; }
|
public virtual string VerificationRecords { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 维修记录,用字符串来表示,可记录关于维修相关的文字描述等信息
|
||||||
|
/// </summary>
|
||||||
|
public virtual string MaintenanceRecord { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 备注
|
||||||
|
/// </summary>
|
||||||
|
public virtual string Remark { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -113,6 +113,15 @@ namespace YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoD
|
|||||||
/// 检验记录
|
/// 检验记录
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public virtual string VerificationRecords { get; set; }
|
public virtual string VerificationRecords { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 维修记录
|
||||||
|
/// </summary>
|
||||||
|
public virtual string MaintenanceRecord { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 备注
|
||||||
|
/// </summary>
|
||||||
|
public virtual string Remark { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class EditProtectionQrCodeBoardCardInput
|
public class EditProtectionQrCodeBoardCardInput
|
||||||
|
@ -40,8 +40,25 @@ namespace YunDa.SOMS.Entities.GeneralInformation
|
|||||||
/// 更换后数据
|
/// 更换后数据
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public virtual string ContentNewJson { get; set; }
|
public virtual string ContentNewJson { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// baohuzhuangzhi ID
|
/// 事件描述
|
||||||
|
/// </summary>
|
||||||
|
public virtual string EventDescription { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 事件类型
|
||||||
|
/// </summary>
|
||||||
|
public virtual EventRecordTypeEnum EventRecordType { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 备注
|
||||||
|
/// </summary>
|
||||||
|
public virtual string Remark { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 是否已经发送给主站
|
||||||
|
/// </summary>
|
||||||
|
public virtual bool IsSend { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 保护装置 ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
||||||
public virtual Guid? ProtectionDeviceInfoId { get; set; }
|
public virtual Guid? ProtectionDeviceInfoId { get; set; }
|
||||||
|
@ -96,7 +96,10 @@ namespace YunDa.SOMS.Entities.GeneralInformation
|
|||||||
/// 检验记录
|
/// 检验记录
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public virtual string VerificationRecords { get; set; }
|
public virtual string VerificationRecords { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 维修记录,用字符串来表示,可记录关于维修相关的文字描述等信息
|
||||||
|
/// </summary>
|
||||||
|
public virtual string MaintenanceRecord { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 备注
|
/// 备注
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -58,6 +58,10 @@ namespace YunDa.ISAS.Entities.GeneralInformation
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public virtual DateTime? ProductionDate { get; set; }
|
public virtual DateTime? ProductionDate { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
/// 维修记录,用字符串来表示,可记录关于维修相关的文字描述等信息
|
||||||
|
/// </summary>
|
||||||
|
public virtual string MaintenanceRecord { get; set; }
|
||||||
|
/// <summary>
|
||||||
/// 检验人员
|
/// 检验人员
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public virtual string VerificationPerson { get; set; }
|
public virtual string VerificationPerson { get; set; }
|
||||||
|
@ -46,9 +46,39 @@ namespace YunDa.SOMS.Entities.GeneralInformation
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public virtual string ContentNewJson { get; set; }
|
public virtual string ContentNewJson { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
/// 事件描述
|
||||||
|
/// </summary>
|
||||||
|
public virtual string EventDescription { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 事件类型
|
||||||
|
/// </summary>
|
||||||
|
public virtual EventRecordTypeEnum EventRecordType { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 备注
|
||||||
|
/// </summary>
|
||||||
|
public virtual string Remark { get; set; }
|
||||||
|
/// <summary>
|
||||||
/// 是否已经发送给主站
|
/// 是否已经发送给主站
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public virtual bool IsSend { get; set; }
|
public virtual bool IsSend { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public enum EventRecordTypeEnum
|
||||||
|
{
|
||||||
|
None = 0,
|
||||||
|
/// <summary>
|
||||||
|
/// 装置
|
||||||
|
/// </summary>
|
||||||
|
Device =1,
|
||||||
|
/// <summary>
|
||||||
|
/// 板卡
|
||||||
|
/// </summary>
|
||||||
|
Board =2,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 软件版本
|
||||||
|
/// </summary>
|
||||||
|
Software =3
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
5425
src/YunDa.Domain/YunDa.ISAS.EntityFrameworkCore/Migrations/20241210032229_update_table_v92.Designer.cs
generated
Normal file
5425
src/YunDa.Domain/YunDa.ISAS.EntityFrameworkCore/Migrations/20241210032229_update_table_v92.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,128 @@
|
|||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace YunDa.ISAS.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class update_table_v92 : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AddColumn<string>(
|
||||||
|
name: "EventDescription",
|
||||||
|
table: "gi_protection_device_history",
|
||||||
|
type: "longtext",
|
||||||
|
nullable: true)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4");
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<int>(
|
||||||
|
name: "EventRecordType",
|
||||||
|
table: "gi_protection_device_history",
|
||||||
|
type: "int",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: 0);
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<bool>(
|
||||||
|
name: "IsSend",
|
||||||
|
table: "gi_protection_device_history",
|
||||||
|
type: "tinyint(1)",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: false);
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<string>(
|
||||||
|
name: "Remark",
|
||||||
|
table: "gi_protection_device_history",
|
||||||
|
type: "longtext",
|
||||||
|
nullable: true)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4");
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<string>(
|
||||||
|
name: "MaintenanceRecord",
|
||||||
|
table: "gi_equipment_info",
|
||||||
|
type: "longtext",
|
||||||
|
nullable: true)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4");
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<string>(
|
||||||
|
name: "MaintenanceRecord",
|
||||||
|
table: "gi_board_card_info",
|
||||||
|
type: "longtext",
|
||||||
|
nullable: true)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4");
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<string>(
|
||||||
|
name: "EventDescription",
|
||||||
|
table: "gi_board_card_history",
|
||||||
|
type: "longtext",
|
||||||
|
nullable: true)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4");
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<int>(
|
||||||
|
name: "EventRecordType",
|
||||||
|
table: "gi_board_card_history",
|
||||||
|
type: "int",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: 0);
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<bool>(
|
||||||
|
name: "IsSend",
|
||||||
|
table: "gi_board_card_history",
|
||||||
|
type: "tinyint(1)",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: false);
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<string>(
|
||||||
|
name: "Remark",
|
||||||
|
table: "gi_board_card_history",
|
||||||
|
type: "longtext",
|
||||||
|
nullable: true)
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "EventDescription",
|
||||||
|
table: "gi_protection_device_history");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "EventRecordType",
|
||||||
|
table: "gi_protection_device_history");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "IsSend",
|
||||||
|
table: "gi_protection_device_history");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "Remark",
|
||||||
|
table: "gi_protection_device_history");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "MaintenanceRecord",
|
||||||
|
table: "gi_equipment_info");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "MaintenanceRecord",
|
||||||
|
table: "gi_board_card_info");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "EventDescription",
|
||||||
|
table: "gi_board_card_history");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "EventRecordType",
|
||||||
|
table: "gi_board_card_history");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "IsSend",
|
||||||
|
table: "gi_board_card_history");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "Remark",
|
||||||
|
table: "gi_board_card_history");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1149,6 +1149,9 @@ namespace YunDa.ISAS.Migrations
|
|||||||
b.Property<Guid?>("LastModifierUserId")
|
b.Property<Guid?>("LastModifierUserId")
|
||||||
.HasColumnType("char(36)");
|
.HasColumnType("char(36)");
|
||||||
|
|
||||||
|
b.Property<string>("MaintenanceRecord")
|
||||||
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
b.Property<Guid?>("ManufacturerInfoId")
|
b.Property<Guid?>("ManufacturerInfoId")
|
||||||
.HasColumnType("char(36)");
|
.HasColumnType("char(36)");
|
||||||
|
|
||||||
@ -3277,9 +3280,18 @@ namespace YunDa.ISAS.Migrations
|
|||||||
b.Property<DateTime?>("DeletionTime")
|
b.Property<DateTime?>("DeletionTime")
|
||||||
.HasColumnType("datetime(6)");
|
.HasColumnType("datetime(6)");
|
||||||
|
|
||||||
|
b.Property<string>("EventDescription")
|
||||||
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
|
b.Property<int>("EventRecordType")
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
b.Property<bool>("IsDeleted")
|
b.Property<bool>("IsDeleted")
|
||||||
.HasColumnType("tinyint(1)");
|
.HasColumnType("tinyint(1)");
|
||||||
|
|
||||||
|
b.Property<bool>("IsSend")
|
||||||
|
.HasColumnType("tinyint(1)");
|
||||||
|
|
||||||
b.Property<DateTime?>("LastModificationTime")
|
b.Property<DateTime?>("LastModificationTime")
|
||||||
.HasColumnType("datetime(6)");
|
.HasColumnType("datetime(6)");
|
||||||
|
|
||||||
@ -3295,6 +3307,9 @@ namespace YunDa.ISAS.Migrations
|
|||||||
b.Property<DateTime?>("RecodeDate")
|
b.Property<DateTime?>("RecodeDate")
|
||||||
.HasColumnType("datetime(6)");
|
.HasColumnType("datetime(6)");
|
||||||
|
|
||||||
|
b.Property<string>("Remark")
|
||||||
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
b.Property<int>("SeqNo")
|
b.Property<int>("SeqNo")
|
||||||
.HasColumnType("int");
|
.HasColumnType("int");
|
||||||
|
|
||||||
@ -3378,6 +3393,9 @@ namespace YunDa.ISAS.Migrations
|
|||||||
b.Property<Guid?>("LastModifierUserId")
|
b.Property<Guid?>("LastModifierUserId")
|
||||||
.HasColumnType("char(36)");
|
.HasColumnType("char(36)");
|
||||||
|
|
||||||
|
b.Property<string>("MaintenanceRecord")
|
||||||
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
b.Property<Guid?>("ManufacturerInfoId")
|
b.Property<Guid?>("ManufacturerInfoId")
|
||||||
.HasColumnType("char(36)");
|
.HasColumnType("char(36)");
|
||||||
|
|
||||||
@ -3544,9 +3562,18 @@ namespace YunDa.ISAS.Migrations
|
|||||||
b.Property<DateTime?>("DeletionTime")
|
b.Property<DateTime?>("DeletionTime")
|
||||||
.HasColumnType("datetime(6)");
|
.HasColumnType("datetime(6)");
|
||||||
|
|
||||||
|
b.Property<string>("EventDescription")
|
||||||
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
|
b.Property<int>("EventRecordType")
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
b.Property<bool>("IsDeleted")
|
b.Property<bool>("IsDeleted")
|
||||||
.HasColumnType("tinyint(1)");
|
.HasColumnType("tinyint(1)");
|
||||||
|
|
||||||
|
b.Property<bool>("IsSend")
|
||||||
|
.HasColumnType("tinyint(1)");
|
||||||
|
|
||||||
b.Property<DateTime?>("LastModificationTime")
|
b.Property<DateTime?>("LastModificationTime")
|
||||||
.HasColumnType("datetime(6)");
|
.HasColumnType("datetime(6)");
|
||||||
|
|
||||||
@ -3562,6 +3589,9 @@ namespace YunDa.ISAS.Migrations
|
|||||||
b.Property<DateTime?>("RecodeDate")
|
b.Property<DateTime?>("RecodeDate")
|
||||||
.HasColumnType("datetime(6)");
|
.HasColumnType("datetime(6)");
|
||||||
|
|
||||||
|
b.Property<string>("Remark")
|
||||||
|
.HasColumnType("longtext");
|
||||||
|
|
||||||
b.Property<int>("SeqNo")
|
b.Property<int>("SeqNo")
|
||||||
.HasColumnType("int");
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
@ -3,10 +3,7 @@ using Abp.Castle.Logging.Log4Net;
|
|||||||
using Abp.Collections.Extensions;
|
using Abp.Collections.Extensions;
|
||||||
using Abp.Dependency;
|
using Abp.Dependency;
|
||||||
using Castle.Facilities.Logging;
|
using Castle.Facilities.Logging;
|
||||||
using MiniDumpLib;
|
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
|
||||||
using System.Security.Permissions;
|
|
||||||
using YunDa.ISAS.Core;
|
using YunDa.ISAS.Core;
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user