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

改了点小地方，不然没有房间号只有肋位号的位号出不来。

Browse Source
This commit is contained in:
supercjj2023 2025-10-20 18:11:47 +08:00
parent d88f2c2654
commit 560d62a6d6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,9 +244,8 @@ namespace Learun.Application.Web.AppApi
area = "ERR", area = "ERR",
}; };
basePoint.Tags.Add(layoutTagInfoInvalid); basePoint.Tags.Add(layoutTagInfoInvalid);
foreach (var item in EquipPropAll) foreach (var item in EquipPropAll.Where(x=>x.EngineDataID== matchPointTagId))
{ {
if (matchPointTagIdSet.Contains(item.EngineDataID))
item.Marker = true; item.Marker = true;
} }
continue; continue;
@ -266,6 +265,11 @@ namespace Learun.Application.Web.AppApi
{ {
strRoom = matchedRoom.DataItemName; strRoom = matchedRoom.DataItemName;
} }
if(matchedRoom==null && basePoint.RoomNo!=string.Empty)//这里基点也要判断下，只有是基点带ROOMNO值的才不统计
{
//如果房间号没有匹配的，肋位号有，则不打标记，而且应该把该位号放到只有肋位号的基点上去，没有这种基点则不统计
continue;
}
var Prop_FrameOff = tagProps.FirstOrDefault(x => x.PropertyName == GlobalObject.propName_FrameOff)?.PropertyValue; var Prop_FrameOff = tagProps.FirstOrDefault(x => x.PropertyName == GlobalObject.propName_FrameOff)?.PropertyValue;
var Prop_YOff = tagProps.FirstOrDefault(x => x.PropertyName == GlobalObject.propName_YOff)?.PropertyValue; var Prop_YOff = tagProps.FirstOrDefault(x => x.PropertyName == GlobalObject.propName_YOff)?.PropertyValue;
@ -365,9 +369,8 @@ namespace Learun.Application.Web.AppApi
RoomNo = strRoom RoomNo = strRoom
}; };
basePoint.Tags.Add(layoutTagInfo); basePoint.Tags.Add(layoutTagInfo);
foreach (var item in EquipPropAll) foreach (var item in EquipPropAll.Where(x => x.EngineDataID == matchPointTagId))
{ {
if (matchPointTagIdSet.Contains(item.EngineDataID))
item.Marker = true; item.Marker = true;
} }
} }