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

Compare commits

base: yuxingheng:1efa2ff9fdefcaa2d1112fbec11025910b61532b
Branches Tags
yuxingheng:main
yuxingheng:自动分配信号
...
compare: yuxingheng:0748365cdbc67a64f2375e035a115063bbb6e624
Branches Tags
yuxingheng:main
yuxingheng:自动分配信号

3 Commits
1efa2ff9fd ... 0748365cdb

Author SHA1 Message Date
xingheng
0748365cdb Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec 2025-10-01 23:36:08 +08:00
xingheng
af328bdb8f 增加了homerun的分配逻辑（不需要考虑预留空白） 2025-10-01 23:35:57 +08:00
xingheng
b8b6fde9b0 重写自动分配的逻辑 2025-10-01 00:18:02 +08:00
4 changed files with 596 additions and 280 deletions
Show Stats Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

5
Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_cable/ec_CableSetEntity.cs
View File

@ -148,7 +148,7 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
/// 是否被连接 /// 是否被连接
/// </summary> /// </summary>
[SugarColumn(IsIgnore = true)] [SugarColumn(IsIgnore = true)]
public bool? IsConned { set; get; } public bool? IsConned { set; get; } = false;
/// <summary> /// <summary>
/// 当前这个set的连接情况 /// 当前这个set的连接情况
@ -168,8 +168,7 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
#endregion #endregion
public ec_CableSetEntity() public ec_CableSetEntity()
{ {
IsConned = null;
} }
} }
} }

2
Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_panel_channel/ec_PanelChannelEntity.cs
View File

@ -117,7 +117,7 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
this.ChannelID = Guid.NewGuid().ToString(); this.ChannelID = Guid.NewGuid().ToString();
this.CreateTime = Time.MySqlTime; this.CreateTime = Time.MySqlTime;
UserInfo userInfo = LoginUserInfo.Get(); UserInfo userInfo = LoginUserInfo.Get();
this.CreateUserID = userInfo.userId; this.CreateUserID = userInfo?.userId;
} }

14
Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_panel_strip/ec_PanelStripEntity.cs
View File

@ -73,7 +73,7 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
this.StripID = Guid.NewGuid().ToString(); this.StripID = Guid.NewGuid().ToString();
this.CreateTime = Time.MySqlTime; this.CreateTime = Time.MySqlTime;
UserInfo userInfo = LoginUserInfo.Get(); UserInfo userInfo = LoginUserInfo.Get();
this.CreateUserID = userInfo.userId; this.CreateUserID = userInfo?.userId;
} }
@ -96,15 +96,23 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
/// </summary> /// </summary>
[SugarColumn(IsIgnore = true)] [SugarColumn(IsIgnore = true)]
public List<ec_PanelChannelEntity> Channels { set; get; } = new List<ec_PanelChannelEntity>(); public List<ec_PanelChannelEntity> Channels { set; get; } = new List<ec_PanelChannelEntity>();
/// <summary>
/// channel在<see cref="ec_WireTerminalEntity"/>里有，同时<see cref="ec_Wire_GroupEntity.ChannelID"/>也有
/// </summary>
[SugarColumn(IsIgnore = true)] [SugarColumn(IsIgnore = true)]
public int ChannelsUsed { set; get; } = 0; public int ChannelsUsed { set; get; } = 0;
/// <summary>
/// channel在<see cref="ec_WireTerminalEntity"/>里有，但是没有信号
/// </summary>
[SugarColumn(IsIgnore = true)] [SugarColumn(IsIgnore = true)]
public int ChannelsUsedNoSignal { set; get; } = 0; public int ChannelsUsedNoSignal { set; get; } = 0;
/// <summary>
/// channel在<see cref="ec_WireTerminalEntity"/>里没有
/// </summary>
[SugarColumn(IsIgnore = true)] [SugarColumn(IsIgnore = true)]
public int ChannelsSpared { set; get; } = 0; public int ChannelsSpared { set; get; } = 0;
[SugarColumn(IsIgnore = true)] [SugarColumn(IsIgnore = true)]
public string TagNumber { set; get; } public string TagNumber { set; get; }