界面微调 program 冲突

Shuxia Ning

2024-08-14 9407658b38b9925685e9e47c89491edf2ebdd15b

 Hydro/Yw.Hydro.Core/ParseHelper.cs

@@ -283,7 +283,7 @@
                    pipeModel.Name = pipe.Name;
                    pipeModel.StartNode = allNodes.Find(x => x.Id == pipe.StartCode);
                    pipeModel.EndNode = allNodes.Find(x => x.Id == pipe.EndCode);
                    //还有一个状态
                    pipeModel.LinkStatus = pipe.LinkStatus;
                    pipeModel.Length = pipe.Length;
                    pipeModel.Diameter = pipe.Diameter;
                    pipeModel.Roughness = pipe.Roughness;
@@ -302,7 +302,7 @@
                    translationModel.Name = translation.Name;
                    translationModel.StartNode = allNodes.Find(x => x.Id == translation.StartCode);
                    translationModel.EndNode = allNodes.Find(x => x.Id == translation.EndCode);
                    //还有一个状态
                    translationModel.LinkStatus = translation.LinkStatus;
                    translationModel.Length = translation.Length;
                    translationModel.Diameter = translation.Diameter;
                    translationModel.Roughness = translation.Roughness;
@@ -321,6 +321,7 @@
                    pumpModel.Name = pump.Name;
                    pumpModel.StartNode = allNodes.Find(x => x.Id == pump.StartCode);
                    pumpModel.EndNode = allNodes.Find(x => x.Id == pump.EndCode);
                    pumpModel.LinkStatus = pump.LinkStatus;
                    pumpModel.RatedPower = pump.RatedPower;
                    pumpModel.CurveQH = pump.CurveQH;
                    pumpModel.SpeedRatio = pump.SpeedRatio;
@@ -342,6 +343,7 @@
                    valveModel.Name = valve.Name;
                    valveModel.StartNode = allNodes.Find(x => x.Id == valve.StartCode);
                    valveModel.EndNode = allNodes.Find(x => x.Id == valve.EndCode);
                    valveModel.LinkStatus = valve.LinkStatus;
                    valveModel.Diameter = valve.Diameter;
                    valveModel.MinorLoss = valve.MinorLoss;
                    valveModel.ValveType = valve.ValveType;