1

Learun.Application.Web/AppApi/IOModuleApiController.cs

@@ -397,6 +397,15 @@ namespace Learun.Application.Web.AppApi
             //#region 1.2
             #region 先分组 1.2.2
             cablesNeedAssigned = cablesNeedAssigned.OrderBy(x => new { x.PanelID, x.PreAssignIOType, x.System }).ToList();
+
+            foreach (var item in cablesNeedAssigned)
+            {
+                foreach (var set in item.Sets)
+                {
+                    set.ConnectionInfo = $"采集箱：{item.ToPanel.TagNumber}/模块(端子排)：{"test_ts"}/通道：{"test_ch"}";
+                    set.AssignedTerms = set.Wires.Select(x => x.PreAssignChannelTermNo).ToList();// new List<string>() { "test_term1", "test_term2" };//假数据
+                }
+            }
             //var curPanel = new ec_PanelEntity();
             //curPanel = panelsNeed.FirstOrDefault(x => x.PanelID == cablesNeedAssigned[0].PanelID);//先定位到第一个电缆所在的箱子
             //curPanel.strips = stripsNeed.Where(x => x.PanelID == curPanel.PanelID).ToList();
@@ -430,7 +439,7 @@ namespace Learun.Application.Web.AppApi
 
             //}
             //#endregion
-            return Success("自动关联完成");
+            return Success(cablesNeedAssigned);
 
 
         }

Learun.Application.Web/Learun.Application.Web.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>C:\repo\CODE\009_DI-Elec\Learun.Application.Web\Properties\PublishProfiles\FolderProfile3.pubxml</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />

Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_cable/ec_CableEntity.cs

@@ -152,6 +152,7 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
         [SugarColumn(IsIgnore = true)]
         public ec_PanelEntity ToPanel { set; get; }
 
+
         #endregion
     }
 }

Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_cable/ec_CableSetEntity.cs

@@ -160,6 +160,11 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
         /// </summary>
         [SugarColumn(IsIgnore = true)]
         public bool DeleteFlg { set; get; } = false;
+
+        #region 预分配后的结果 
+        public List<string> AssignedTerms;
+        #endregion
+
         #endregion
 
         public ec_CableSetEntity()

Learun.Framework.Module/Learun.Cache/Learun.Cache.Base/obj/Release/Learun.Cache.Base.csproj.FileListAbsolute.txt

@@ -4,3 +4,9 @@ C:\repo\CODE\009\Server\Learun.Framework.Module\Learun.Cache\Learun.Cache.Base\o
 C:\repo\CODE\009\Server\Learun.Framework.Module\Learun.Cache\Learun.Cache.Base\obj\Release\Learun.Cache.Base.csproj.CoreCompileInputs.cache
 C:\repo\CODE\009\Server\Learun.Framework.Module\Learun.Cache\Learun.Cache.Base\obj\Release\Learun.Cache.Base.dll
 C:\repo\CODE\009\Server\Learun.Framework.Module\Learun.Cache\Learun.Cache.Base\obj\Release\Learun.Cache.Base.pdb
+C:\repo\CODE\009_DI-Elec\Learun.Framework.Module\Learun.Cache\Learun.Cache.Base\bin\Release\Learun.Cache.Base.dll
+C:\repo\CODE\009_DI-Elec\Learun.Framework.Module\Learun.Cache\Learun.Cache.Base\bin\Release\Learun.Cache.Base.pdb
+C:\repo\CODE\009_DI-Elec\Learun.Framework.Module\Learun.Cache\Learun.Cache.Base\obj\Release\Learun.Cache.Base.csproj.AssemblyReference.cache
+C:\repo\CODE\009_DI-Elec\Learun.Framework.Module\Learun.Cache\Learun.Cache.Base\obj\Release\Learun.Cache.Base.csproj.CoreCompileInputs.cache
+C:\repo\CODE\009_DI-Elec\Learun.Framework.Module\Learun.Cache\Learun.Cache.Base\obj\Release\Learun.Cache.Base.dll
+C:\repo\CODE\009_DI-Elec\Learun.Framework.Module\Learun.Cache\Learun.Cache.Base\obj\Release\Learun.Cache.Base.pdb