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

merge from cjj

Browse Source
This commit is contained in:
xingheng 2025-09-22 15:45:25 +08:00
commit 460894e56c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Learun.Application.Web/AppApi/IOModuleApiController.cs
View File

@ -90,7 +90,7 @@ namespace Learun.Application.Web.AppApi
return -1;//无效的x off导致的 return -1;//无效的x off导致的
} }
if (double.TryParse(nearPanelProps.FirstOrDefault(x => x.PropertyName == GlobalObject.propName_YOff)?.PropertyValue, if (double.TryParse(nearPanelProps.FirstOrDefault(x => x.PropertyName == GlobalObject.propName_YOff)?.PropertyValue,
out double YOffValue)) out double YOffValue))
{ {
} }
@ -131,7 +131,7 @@ namespace Learun.Application.Web.AppApi
return null;//无效的x off导致的 return null;//无效的x off导致的
} }
if (double.TryParse(curPanelProps.FirstOrDefault(x => x.PropertyName == GlobalObject.propName_YOff)?.PropertyValue, if (double.TryParse(curPanelProps.FirstOrDefault(x => x.PropertyName == GlobalObject.propName_YOff)?.PropertyValue,
out double AssignPanelYValue)) out double AssignPanelYValue))
{ {
} }

2
Learun.Application.Web/AppApi/PlotLayoutApiController.cs
View File

@ -181,7 +181,7 @@ namespace Learun.Application.Web.AppApi
{ {
#region 每个基点关联的设备 #region 每个基点关联的设备
//甲板 区域都和基点一致的设备 //甲板 区域都和基点一致的设备
var DeckMatchedTagIds = EquipPropAll.Where(x => x.PropertyName == "甲板号" && x.PropertyValue == basePoint.deck).Select(X => X.EngineDataID).ToList(); var DeckMatchedTagIds = EquipPropAll.Where(x => x.PropertyName == "甲板号" && (x.PropertyValue?.Split(new[] { "||" }, StringSplitOptions.None)[0] == basePoint.deck)).Select(X => X.EngineDataID).ToList();
//var AreaMatchedTagIds = EquipPropAll.Where(x => x.PropertyName == "区域" && x.PropertyValue == basePoint.area).Select(X => X.EngineDataID).ToList(); //var AreaMatchedTagIds = EquipPropAll.Where(x => x.PropertyName == "区域" && x.PropertyValue == basePoint.area).Select(X => X.EngineDataID).ToList();
//#task 9542 //#task 9542
var matchPointTagIds = DeckMatchedTagIds;//.Intersect(AreaMatchedTagIds).ToList(); var matchPointTagIds = DeckMatchedTagIds;//.Intersect(AreaMatchedTagIds).ToList();