yuxingheng/009_DI-Elec
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec

Browse Source
This commit is contained in:
xingheng 2025-09-01 13:25:10 +08:00
commit ab7f98b485
1 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
Learun.Application.Web/Areas/ZZDT_EC/Controllers/ec_report_fileController.cs
View File

@ -793,7 +793,18 @@ namespace Learun.Application.Web.Areas.ZZDT_EC.Controllers
!string.IsNullOrEmpty(a.TagNumber) &&
c.DeleteFlg != 1)
.OrderBy((a, b) => a.TagNumber)
.Distinct().ToList();
.Select((a, b, c) => new ec_enginedataEntity
{
CaseID= a.CaseID,
EngineDataID = a.EngineDataID,
TagNumber = a.TagNumber,
ObjectTypeID = a.ObjectTypeID,
ObjectTypeName = b.ObjectTypeName,
DataStatus = a.DataStatus
})
.Distinct()
.ToList();
//24 4 2，过滤掉图面上不存在的
var Equips = SqlSugarHelper.Db.Queryable<ec_enginedataEntity>().AS(enginedataTableName)
@ -913,12 +924,7 @@ namespace Learun.Application.Web.Areas.ZZDT_EC.Controllers
default:
break;
}
if (cable.ObjectTypeName == "变频电缆")
{
//变频
rowCable.Cells[2].SetCellValue("VFD");//电缆类型，信号、电力、本安、动力、随机
rowCable.Cells[4].SetCellValue("CJPF86/SC-VFD");
}
bool flg_IS = false;
bool flg_PairShield = false;
bool flg_fire = false;
@ -951,7 +957,21 @@ namespace Learun.Application.Web.Areas.ZZDT_EC.Controllers
switch (CableType)
{
case CableTypeEnum.动力:
rowCable.Cells[2].SetCellValue("L");//电缆类型，信号、电力、本安、动力、随机
if (cable.ObjectTypeName == "变频电缆")
{
//变频
rowCable.Cells[2].SetCellValue("VFD");//电缆类型，信号、电力、本安、动力、随机
}
else if (cable.ObjectTypeName == "中高压电缆")
{
//中高压电缆
rowCable.Cells[2].SetCellValue("H");//电缆类型，信号、电力、本安、动力、随机
}
else
{
rowCable.Cells[2].SetCellValue("L");//电缆类型，信号、电力、本安、动力、随机
}
break;
case CableTypeEnum.信号:
rowCable.Cells[2].SetCellValue("I");//电缆类型，信号、电力、本安、动力、随机
@ -1012,21 +1032,34 @@ namespace Learun.Application.Web.Areas.ZZDT_EC.Controllers
if (CableType == CableTypeEnum.动力)
{
if (flg_arm == false)
if (cable.ObjectTypeName == "变频电缆")
{
rowCable.Cells[4].SetCellValue("CJPF/SC");
rowCable.Cells[4].SetCellValue("CJPF86/SC-VFD");
}
else if (flg_fire == true)
else if (cable.ObjectTypeName == "中高压电缆")
{
rowCable.Cells[4].SetCellValue("CJ86/NSC");
}
else if (flg_IS == true)
{
rowCable.Cells[4].SetCellValue("CJ86/SC.IS");
var HCableProp = TagProps.Where(x => x.PropertyName == "电压等级" && !string.IsNullOrEmpty(x.PropertyValue)).ToList();
var HCablePropValue = HCableProp.Count() == 0 ? "" : HCableProp.Last()?.PropertyValue;
rowCable.Cells[4].SetCellValue("CJPF86/SC " + HCablePropValue);
}
else
{
rowCable.Cells[4].SetCellValue("CJ86/SC");
if (flg_arm == false)
{
rowCable.Cells[4].SetCellValue("CJPF/SC");
}
else if (flg_fire == true)
{
rowCable.Cells[4].SetCellValue("CJ86/NSC");
}
else if (flg_IS == true)
{
rowCable.Cells[4].SetCellValue("CJ86/SC.IS");
}
else
{
rowCable.Cells[4].SetCellValue("CJ86/SC");
}
}
}
else if (CableType == CableTypeEnum.CAT6)