1

.gitignore

@@ -1109,3 +1109,4 @@ newFront/c#前端/.vs/
 /newFront/c#前端/CAD.Extend/obj/Debug/CAD.Extend.csproj.AssemblyReference.cache
 /newFront/c#前端/.vs/SWS.CAD/FileContentIndex/f03e1583-e8e0-43b7-9dbb-a1896ce4b92d.vsidx
 /newFront/c#前端/.vs/SWS.CAD/FileContentIndex/f2e37380-e651-406b-9320-af642620eee9.vsidx
+/SWSDBSchemeUpgradeTool/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Learun.Application.Web/AppApi/IOModuleApiController.cs

@@ -104,7 +104,7 @@ namespace Learun.Application.Web.AppApi
                 nodeCatalogue.NodeExtData = Loc;
                 treeList.Add(nodeCatalogue);
 
-                var listPanel = Panels.Where(x => x.Panel_Loc_ID == Loc.DataItemDetailID && x.systempanel == specialType.系统柜.ToString()).ToList();
+                var listPanel = Panels.Where(x => x.Panel_Loc_ID == Loc.DataItemDetailID && x.systempanel == GlobalEnum.specialType.系统柜.ToString()).ToList();
                 if (listPanel != null && listPanel.Count > 0)
                 {
                     foreach (var Panel in listPanel)
@@ -234,6 +234,184 @@ namespace Learun.Application.Web.AppApi
                 return Success(res);
             }
 
+        }
+        /// <summary>
+        /// 自动分配通道(点表信号自动分配)。
+        /// 
+        /// </summary>
+        /// <param name="projId"></param> 
+        /// <param name="AcceptNearbyPanel"></param>
+        /// <returns></returns>
+        public IHttpActionResult AutoAssignCable2Channel_step1(string projId, bool AcceptNearbyPanel)
+        {
+            #region 数据准备
+            var cbll = new ec_CableBLL();
+            var panelTable = ProjectSugar.TableName<ec_PanelEntity>(projId);
+            var stripTable = ProjectSugar.TableName<ec_PanelStripEntity>(projId);
+            #endregion
+
+            #region 先要知道有哪些待分配的信号
+
+            var cablesNeedAssigned = cbll.GetCablesPreAssign(projId, true);
+
+            #endregion
+            //涉及到哪些箱子
+            var panelsNeed = SqlSugarHelper.Db.Queryable<ec_PanelEntity>().AS(panelTable).
+     Where(x => cablesNeedAssigned.Select(xx => xx.PanelID).Contains(x.PanelID)).ToList();
+            var stripsNeed = SqlSugarHelper.Db.Queryable<ec_PanelStripEntity>().AS(stripTable).
+                 Where(x => panelsNeed.Select(xx => xx.PanelID).Contains(x.PanelID)).
+                ToList();
+            #region 1.1判断(信号预分配选择的采集箱可能并没有该电缆需要的信号类型)
+            var cablesNotMatchIO = cablesNeedAssigned.Where(x => x.IOTypesNotMatchedList.Count > 0).ToList(); // GetCablesPreAssign 查询时已经处理过io是否匹配了
+            if (cablesNotMatchIO != null && cablesNotMatchIO.Count > 0)
+            {
+                if (!AcceptNearbyPanel)//允许进行
+                {
+                    //有不匹配的，但是用户允许继续
+                    //在之后的自动分配过程中会自动寻找匹配的采集箱，原则上从就近的开始找，如果没有匹配的采集箱，则提示“未找到具有XX类型的采集箱，请新增后再次分配，是否取消自动分配进程？”
+                    return Success("OK");
+                }
+                else
+                {
+                    //不继续自动分配，中断进程，等添加完正确的模块后再继续自动分配
+                    var cableNamesNotMatched = string.Join(",", cablesNotMatchIO.Select(x => x.TagNumber).ToList());
+                    var panelIOMissing = new List<string>();
+                    foreach (ec_CableEntity cableNotMatchIO in cablesNotMatchIO)
+                    {
+                        panelIOMissing.Add(cableNotMatchIO.PanelID + "缺失IO: " + string.Join(",", cableNotMatchIO.IOTypesNotMatchedList));
+                    }
+                    return Fail($"预分配结果中，以下电缆【{cableNamesNotMatched}】的IO类型和其预分配采集箱的IO类型无法匹配。等添加完正确的模块后再继续自动分配。\r\n" +
+                        $"需要添加的正确模块有：{string.Join(",", panelIOMissing)}");
+
+                }
+            }
+            else
+            {
+                //没有不匹配的，可以继续进行
+                return Success("OK");
+            }
+            #endregion
+
+            #region 1.2
+            #region 先分组 1.2.2
+            cablesNeedAssigned = cablesNeedAssigned.OrderBy(x => new { x.PreAssignIOType, x.System, x.PanelID }).ToList();
+            var curPanel = new ec_PanelEntity();
+            curPanel = panelsNeed.FirstOrDefault(x => x.PanelID == cablesNeedAssigned[0].PanelID);//先定位到第一个电缆所在的箱子
+            curPanel.strips = stripsNeed.Where(x => x.PanelID == curPanel.PanelID).ToList();
+            var curStrip = new ec_PanelStripEntity();
+            #endregion
+            for (var i = 0; i < cablesNeedAssigned.Count; i++)
+            {
+
+                #region 是否有端子排 1.2.1
+                if (curPanel.PanelID != cablesNeedAssigned[i].PanelID)
+                {
+                    curPanel = panelsNeed.FirstOrDefault(x => x.PanelID == cablesNeedAssigned[0].PanelID);//切换箱子
+                    curPanel.strips = stripsNeed.Where(x => x.PanelID == curPanel.PanelID).ToList();
+                }
+                foreach (var set in cablesNeedAssigned[i].Sets)
+                {
+                    var availableStrips = curPanel.strips.Where(x => x.IO_TYPE.ToUpper() == set.IOType.ToString().ToUpper()).ToList();
+
+                    if (availableStrips != null && availableStrips.Count > 0)
+                    {
+                        //已经存在端子排
+                    }
+                    else
+                    {
+                        //没有端子排，根据信号数里自动新建端子排，通道数里根据端子io模板的默认值获得
+                        //？？？？？？？？？？？？？？？？？？？？？？？？？？？？？？？？？
+                    }
+                }
+                //可能要换一下循环主体，评估下是按照cable循环好，还是按strip循环好
+                #endregion
+
+            }
+            #endregion
+            return Success("自动关联完成");
+
+
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="projId"></param> 
+        /// <returns></returns>
+        public IHttpActionResult AutoAssignCable2Channel_step2(string projId)
+        {
+            //       #region 数据准备
+            //       var cbll = new ec_CableBLL();
+            //       var panelTable = ProjectSugar.TableName<ec_PanelEntity>(projId);
+            //       var stripTable = ProjectSugar.TableName<ec_PanelStripEntity>(projId);
+            //       #endregion
+
+            //       #region 先要知道有哪些待分配的信号
+
+            //       var cablesNeedAssigned = cbll.GetCablesPreAssign(projId, true);
+
+            //       #endregion
+            //       //涉及到哪些箱子
+            //       var panelsNeed = SqlSugarHelper.Db.Queryable<ec_PanelEntity>().AS(panelTable).
+            //Where(x => cablesNeedAssigned.Select(xx => xx.PanelID).Contains(x.PanelID)).ToList();
+            //       var stripsNeed = SqlSugarHelper.Db.Queryable<ec_PanelStripEntity>().AS(stripTable).
+            //            Where(x => panelsNeed.Select(xx => xx.PanelID).Contains(x.PanelID)).
+            //           ToList();
+            //       #region 1.1判断(信号预分配选择的采集箱可能并没有该电缆需要的信号类型)
+            //       var cablesNotMatchIO = cablesNeedAssigned.Where(x => x.IOTypesNotMatchedList.Count > 0).ToList(); // GetCablesPreAssign 查询时已经处理过io是否匹配了
+            //       if (cablesNotMatchIO != null && cablesNotMatchIO.Count > 0)
+            //       {
+            //           if (!AcceptUnmatchedPanel)//允许进行
+            //           {
+            //               //？？？
+            //           }
+            //           else
+            //           {
+            //               //不继续自动分配，中断进程，等添加完正确的模块后再继续自动分配
+            //               return Fail("等电缆的预分配IO类型和其预分配的采集箱的IO类型无法匹配。等添加完正确的模块后再继续自动分配。");
+
+            //           }
+            //       }
+            //       #endregion
+
+            //       #region 1.2
+            //       #region 先分组 1.2.2
+            //       cablesNeedAssigned = cablesNeedAssigned.OrderBy(x => new { x.PreAssignIOType, x.System, x.PanelID }).ToList();
+            //       var curPanel = new ec_PanelEntity();
+            //       curPanel = panelsNeed.FirstOrDefault(x => x.PanelID == cablesNeedAssigned[0].PanelID);//先定位到第一个电缆所在的箱子
+            //       curPanel.strips = stripsNeed.Where(x => x.PanelID == curPanel.PanelID).ToList();
+            //       var curStrip = new ec_PanelStripEntity();
+            //       #endregion
+            //       for (var i = 0; i < cablesNeedAssigned.Count; i++)
+            //       {
+
+            //           #region 是否有端子排 1.2.1
+            //           if (curPanel.PanelID != cablesNeedAssigned[i].PanelID)
+            //           {
+            //               curPanel = panelsNeed.FirstOrDefault(x => x.PanelID == cablesNeedAssigned[0].PanelID);//切换箱子
+            //               curPanel.strips = stripsNeed.Where(x => x.PanelID == curPanel.PanelID).ToList();
+            //           }
+            //           foreach (var set in cablesNeedAssigned[i].Sets)
+            //           {
+            //               var availableStrips = curPanel.strips.Where(x => x.IO_TYPE.ToUpper() == set.IOType.ToString().ToUpper()).ToList();
+
+            //               if (availableStrips != null && availableStrips.Count > 0)
+            //               {
+            //                   //已经存在端子排
+            //               }
+            //               else
+            //               {
+            //                   //没有端子排，根据信号数里自动新建端子排，通道数里根据端子io模板的默认值获得
+            //                   //？？？？？？？？？？？？？？？？？？？？？？？？？？？？？？？？？
+            //               }
+            //           }
+            //           //可能要换一下循环主体，评估下是按照cable循环好，还是按strip循环好
+            //           #endregion
+
+            //       }
+            //       #endregion
+            return Success("自动关联完成");
+
+
         }
         /// <summary>
         /// 把电缆分配到空余的模块的通道上。
@@ -256,48 +434,10 @@ namespace Learun.Application.Web.AppApi
         [HttpGet]
         public IHttpActionResult GetCablePreAssignPreview(string projId)
         {
-            var table = ProjectSugar.TableName<ec_CableEntity>(projId);
+            var bll = new ec_CableBLL();
-            var tagTable = ProjectSugar.TableName<ec_enginedataEntity>(projId);
+            var res = bll.GetCablesPreAssign(projId);
-            var panelTable = ProjectSugar.TableName<ec_PanelEntity>(projId);
-            var setServ = new ec_CableSetService();
-            var wireServ = new ec_CableSetWireService();
-            var preAssignedCables = SqlSugarHelper.Db.Queryable<ec_CableEntity>().AS(table).Where(x => !string.IsNullOrEmpty(x.PanelID)).ToList();
-            var tags = SqlSugarHelper.Db.Queryable<ec_enginedataEntity>().AS(tagTable).
-                Where(x => preAssignedCables.Select(xx => xx.EngineerDataID).Contains(x.EngineDataID)).ToList();
 
-            var panels = SqlSugarHelper.Db.Queryable<ec_PanelEntity>().AS(panelTable).
+            return Success(res);
-                 Where(x => preAssignedCables.Select(xx => xx.PanelID).Contains(x.PanelID)).ToList();
-            var panelTags = SqlSugarHelper.Db.Queryable<ec_enginedataEntity>().AS(tagTable).
-                         Where(x => panels.Select(xx => xx.EngineerDataID).Contains(x.EngineDataID)).ToList();
-            foreach (var cable in preAssignedCables)
-            {
-                var sets = setServ.GetList(projId, cable.CableID);
-                var Wires = wireServ.GetList(projId, cable.CableID, "");
-
-
-                //剩下的感觉都可以是set上的参数？
-                foreach (var set in sets)
-                {
-                    var wires = Wires.Where(x => x.CableSetID == set.CableSetID);
-                    set.Wires = wires.ToList();
-                }
-                cable.Sets = sets;
-
-
-                cable.TagNumber = tags.FirstOrDefault(x => x.EngineDataID == cable.EngineerDataID)?.TagNumber;
-
-                var panelObj = panels.FirstOrDefault(x => x.PanelID == cable.PanelID);
-                if (panelObj != null)
-                {
-                    panelObj.TagNumber = panelTags.FirstOrDefault(x => x.EngineDataID == panelObj.EngineerDataID)?.TagNumber;
-                }
-
-                cable.ToPanel = panelObj;
-            }
-
-            //分组
-            preAssignedCables = preAssignedCables.OrderBy(x => x.PreAssignIOType).ToList();
-            return Success(preAssignedCables);
 
 
         }

Learun.Application.Web/AppApi/PlotLayoutApiController.cs

@@ -1,4 +1,5 @@
 using Learun.Application.TwoDevelopment.ZZDT_EC;
+using Learun.Application.TwoDevelopment.ZZDT_EC.Frame;
 using Learun.Util;
 using Learun.Util.SqlSugar;
 using NPOI.SS.Formula.Functions;
@@ -54,36 +55,11 @@ namespace Learun.Application.Web.AppApi
                 return Fail("找不到基点这个对象类型。");
             }
             #region frame 
-            List<FrameList> frameLists = new List<FrameList>();
+            var frameBll = new FrameBll();
-            frameLists.Add(new FrameList()
+            var frameLists = frameBll.GetFrameList(ProjectId);
-            { Num = "", Value = 0 });
+            if (frameLists == null)
-            var settings = new ec_projectSettingsBLL();
-            var ec_dataitemBLL = new ec_dataitemBLL();
-
-            var FrameListFlg = settings.GetEntity(GlobalObject.projSetting_enumlist_Frame, ProjectId);
-
-            if (FrameListFlg != null)
             {
-
+                return Fail("项目数据字典中，没有找到【肋位号】的下拉项中。");// 或者 无法从数据字典中找到对应的那个下拉
-                var FrameDetail = ec_dataitemBLL.GetDetailList(FrameListFlg.SettingValue, "", ProjectId, false);
-                if (FrameDetail == null)
-                {
-                    return Fail("项目数据字典中，没有找到【肋位号】的下拉项中。");// 或者 无法从数据字典中找到对应的那个下拉
-                }
-                foreach (var item in FrameDetail)
-                {
-                    double value;
-                    if (double.TryParse(item.DataItemCode, out value))
-                    {
-                        frameLists.Add(new FrameList() { Num = item.DataItemName, Value = value });
-                    }
-                }
-
-                frameLists = frameLists.OrderBy(t => t.Value).ToList();
-            }
-            else
-            {
-                return Fail("项目设置中（projectSettings表），没有找到【肋位号】的设置项。");// 或者 无法从数据字典中找到对应的那个下拉
             }
             #endregion
 
@@ -361,40 +337,21 @@ namespace Learun.Application.Web.AppApi
         [HttpGet]
         public IHttpActionResult GetFrameList(string ProjectId)
         {
-            var ec_dataitemBLL = new ec_dataitemBLL();
+            var bll = new FrameBll();
-            var settings = new ec_projectSettingsBLL();
+            var res = bll.GetFrameList(ProjectId);
-
+            if (res == null)
-            var FrameListFlg = settings.GetEntity(GlobalObject.projSetting_enumlist_Frame, ProjectId);
-
-            if (FrameListFlg != null)
             {
-                List<FrameList> frameLists = new List<FrameList>();
+                return Fail("项目设置中（projectSettings表），没有找到【肋位号】的设置项中，对应的那个下拉。");// 或者 无法从数据字典中找到对应的那个下拉
 
-
-                var res = ec_dataitemBLL.GetDetailList(FrameListFlg.SettingValue, "", ProjectId, false);
-                if (res == null)
-                {
-                    return Fail("项目设置中（projectSettings表），没有找到【肋位号】的设置项中，对应的那个下拉。");// 或者 无法从数据字典中找到对应的那个下拉
-                }
-                foreach (var item in res)
-                {
-                    double value;
-                    if (double.TryParse(item.DataItemCode, out value))
-                    {
-                        frameLists.Add(new FrameList() { Num = item.DataItemName, Value = value });
-                    }
-                }
-
-                frameLists = frameLists.OrderBy(t => t.Value).ToList();
-                return Success(frameLists);
             }
             else
             {
-                return Fail("项目设置中（projectSettings表），没有找到【肋位号】的设置项。");// 或者 无法从数据字典中找到对应的那个下拉
+                return Success(res);
             }
 
         }
 
+
         /// <summary>
         /// 根据ObjectTypeID，查绘制布置图时的图例
         /// </summary>
@@ -467,20 +424,6 @@ namespace Learun.Application.Web.AppApi
     }
 
 
-    /// <summary>
-    /// 肋位号
-    /// </summary>
-    public class FrameList
-    {
-        /// <summary>
-        /// 号
-        /// </summary>
-        public string Num { get; set; }
 
-        /// <summary>
-        /// 值。单位是m
-        /// </summary>
-        public double Value { get; set; }
-    }
 
 }

Learun.Application.Web/Areas/ZZDT_EC/Controllers/ec_report_fileController.cs

@@ -28,6 +28,7 @@ using System.Text.RegularExpressions;
 using System.Web.Helpers;
 using System.Web.Mvc;
 using static Learun.Application.TwoDevelopment.ZZDT_EC.ec_enginedata_pixelService;
+using static Learun.Application.TwoDevelopment.ZZDT_EC.GlobalEnum;
 using SystemIO = System.IO;
 
 namespace Learun.Application.Web.Areas.ZZDT_EC.Controllers

Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -274,6 +274,7 @@
     <Compile Include="ZZDT_EC\ec_operate_log\ec_operate_logIBLL.cs" />
     <Compile Include="ZZDT_EC\ec_operate_log\ec_operate_logBLL.cs" />
     <Compile Include="ZZDT_EC\ec_Wire_Group\signalGroup.cs" />
+    <Compile Include="ZZDT_EC\Frame\FrameBll.cs" />
     <Compile Include="ZZDT_EC\GlobalEnum.cs" />
     <Compile Include="ZZDT_EC\GlobalObject.cs" />
     <Compile Include="ZZDT_EC\ec_template_catalogue\ec_template_catalogueEntity.cs" />

Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
 </Project>

Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/Frame/FrameBll.cs

@@ -0,0 +1,64 @@
+using DocumentFormat.OpenXml.Bibliography;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Learun.Application.TwoDevelopment.ZZDT_EC.Frame
+{
+    public class FrameBll
+    {
+        /// <summary>
+        /// 肋位号
+        /// </summary>
+        public class FrameList
+        {
+            /// <summary>
+            /// 号
+            /// </summary>
+            public string Num { get; set; }
+
+            /// <summary>
+            /// 值。单位是m
+            /// </summary>
+            public double Value { get; set; }
+        }
+        public List<FrameList> GetFrameList(string ProjectId)
+        {
+            var ec_dataitemBLL = new ec_dataitemBLL();
+            var settings = new ec_projectSettingsBLL();
+
+            var FrameListFlg = settings.GetEntity(GlobalObject.projSetting_enumlist_Frame, ProjectId);
+
+            if (FrameListFlg != null)
+            {
+                List<FrameList> frameLists = new List<FrameList>();
+
+
+                var res = ec_dataitemBLL.GetDetailList(FrameListFlg.SettingValue, "", ProjectId, false);
+                if (res == null)
+                {
+                    return null;// 或者 无法从数据字典中找到对应的那个下拉
+                }
+                foreach (var item in res)
+                {
+                    double value;
+                    if (double.TryParse(item.DataItemCode, out value))
+                    {
+                        frameLists.Add(new FrameList() { Num = item.DataItemName, Value = value });
+                    }
+                }
+
+                frameLists = frameLists.OrderBy(t => t.Value).ToList();
+                return frameLists;
+            }
+            else
+            {
+                return null;// 或者 无法从数据字典中找到对应的那个下拉
+            }
+
+        }
+
+    }
+}

Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/GlobalEnum.cs

@@ -8,12 +8,95 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
 {
     public class GlobalEnum
     {
+        #region 自动分配、预分配、io模块模板有关
+        public enum inOrOut
+        {
+            输入 = 0,
+            输出 = 1
+        }
+        /// <summary>
+        /// 电缆预分配时，会选择的信号类型。通讯和非通讯（digital等几个）
+        /// </summary>
+        public enum signalType
+        {
+            /// <summary>
+            /// 数字量
+            /// </summary>
+            Digital = 1,
+            /// <summary>
+            /// 模拟量 4-20mA等
+            /// </summary>
+            Analog = 2,
+            /// <summary>
+            ///  
+            /// </summary>
+            TenVolt = 3,
+            /// <summary>
+            ///  
+            /// </summary>
+            PT100 = 4,
+            PULSE
+        }
+        /// <summary>
+        /// 端子排上的IO类型
+        /// </summary>
+        public enum IOType
+        {
+            DI = 0,
+            DO,
+            AI,
+            AO,
+            PT100,
+            PULSE,
+            TenVolt,
+            LAN,
+            /// <summary>
+            /// 485 422
+            /// </summary>
+            RS485,
+
+        }
+        #endregion
+
+        /// <summary>
+        /// 对象类型上特殊的一些分类。对应<see cref="ec_objecttypeEntity.specialType"/>
+        /// </summary>
+        public enum specialType
+        {
+            未定义 = 0,
+            电力一次 = 1,
+            电力二次 = 2,
+            系统柜 = 3,
+        }
+
+
+        /// <summary>
+        /// 用于<see cref="ec_enginedataEntity.DataStatus"/>
+        /// </summary>
         public enum TagDataStatus
         {
-            外部 =  00001,
+            外部 = 00001,
             待验证 = 00002,
             有效 = 00003,
             导入 = 00004
         }
+        /// <summary>
+        /// 用于 信号组别的状态<see cref="signalGroup.status"/>
+        /// </summary>
+        public enum signalGroupStatusEnum
+        {
+            /// <summary>
+            /// 待删除
+            /// </summary> 
+            未核对 = 01,
+            /// <summary>
+            /// 新增的
+            /// </summary> 
+            沟通中 = 02,
+            /// <summary>
+            /// 已关联
+            /// </summary> 
+            已落实 = 03
+        }
     }
 }

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

@@ -3,6 +3,7 @@ using Learun.Util;
 using Learun.Util.SqlSugar;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Data;
 using System.Linq;
 
@@ -166,12 +167,14 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
                 }
             }
         }
+
         /// <summary>
-        /// 预览所有有信号预分配的电缆信息
+        /// 预分配情况下的电缆set wire数据
         /// </summary>
         /// <param name="ProjID"></param>
+        /// <param name="EngineerDataID"></param>
         /// <returns></returns>
-        public ec_CableEntity CablePreAssignPreview(string ProjID)
+        public ec_CableEntity GetCablePreAssign(string ProjID, string EngineerDataID)
         {
             var engineerDataServ = new ec_enginedataService();
             var panelServ = new ec_PanelService();
@@ -187,14 +190,12 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
                 return null;
             }
 
-            var res = ec_CableService.GetList("{ProjectId:\"" + ProjID + "\"}").FirstOrDefault(); //电缆
+            var res = ec_CableService.GetList("{ProjectId:\"" + ProjID + "\",EngineerDataID:\"" + EngineerDataID + "\"}").FirstOrDefault(); //电缆
             if (res != null)
             {
                 var sets = ec_CableSetService.GetList(ProjID, res.CableID);
                 var Wires = ec_CableSetWireService.GetList(ProjID, res.CableID, "");
 
-                Console.WriteLine(res.CableClass);//是否通讯信号
-                Console.WriteLine(res.PreAssignIOType);//通讯类型
 
                 //剩下的感觉都可以是set上的参数？
                 foreach (var set in sets)
@@ -219,53 +220,134 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
             #region 还没有预配置
             #endregion
         }
-        public ec_CableEntity GetCablePreAssign(string ProjID, string EngineerDataID)
+
+        public List<ec_CableEntity> GetCablesPreAssign(string projId, bool needProp = false)
         {
-            var engineerDataServ = new ec_enginedataService();
+            var table = ProjectSugar.TableName<ec_CableEntity>(projId);
-            var panelServ = new ec_PanelService();
+            var tagTable = ProjectSugar.TableName<ec_enginedataEntity>(projId);
-            var panelStripBll = new ec_PanelStripBLL();
+            var panelTable = ProjectSugar.TableName<ec_PanelEntity>(projId);
-            var panelStripServ = new ec_PanelStripService();
+            var propTable = ProjectSugar.TableName<ec_enginedata_propertyEntity>(projId);
-            var termServ = new ec_PanelStripTermBLL();
+            var relTable = ProjectSugar.TableName<ec_enginedata_relEntity>(projId);
-            var channelServ = new ec_PanelChannelService();
 
-            var ProjectEntity = new ec_projectEntity();
+            var setServ = new ec_CableSetService();
-            ProjectEntity = new ec_projectBLL().GetEntity(ProjID);
+            var wireServ = new ec_CableSetWireService();
-            if (ProjectEntity == null)
+            //先查出所有已经预分配的电缆
+            var preAssignedCables = SqlSugarHelper.Db.Queryable<ec_CableEntity>().AS(table).
+                Where(x => !string.IsNullOrEmpty(x.PanelID)).ToList();
+            var tags = SqlSugarHelper.Db.Queryable<ec_enginedataEntity>().AS(tagTable).
+                Where(x => preAssignedCables.Select(xx => xx.EngineerDataID).Contains(x.EngineDataID)).ToList();
+            var allpropOnFrom = new List<ec_enginedata_propertyEntity>();
+
+            var panels = SqlSugarHelper.Db.Queryable<ec_PanelEntity>().AS(panelTable).
+                 Where(x => preAssignedCables.Select(xx => xx.PanelID).Contains(x.PanelID)).ToList();
+            var panelTags = SqlSugarHelper.Db.Queryable<ec_enginedataEntity>().AS(tagTable).
+                         Where(x => panels.Select(xx => xx.EngineerDataID).Contains(x.EngineDataID)).ToList();
+            if (needProp)
             {
-                return null;
+                var FromRels = SqlSugarHelper.Db.Queryable<ec_enginedata_relEntity>().AS(relTable).
+                    Where(x => preAssignedCables.Select(y => y.EngineerDataID).Contains(x.RelEngineData2ID)
+                    && x.RelTypeID == ((int)enum_RelType.设备_电缆).ToString()).ToList();
+                allpropOnFrom = SqlSugarHelper.Db.Queryable<ec_enginedata_propertyEntity>().AS(propTable).
+      Where(x => FromRels.Select(xx => xx.RelEngineData2ID).Distinct().Contains(x.EngineDataID)).ToList();
             }
-
+            foreach (var cable in preAssignedCables)
-            var res = ec_CableService.GetList("{ProjectId:\"" + ProjID + "\",EngineerDataID:\"" + EngineerDataID + "\"}").FirstOrDefault(); //电缆
-            if (res != null)
             {
-                var sets = ec_CableSetService.GetList(ProjID, res.CableID);
+                var sets = setServ.GetList(projId, cable.CableID);
-                var Wires = ec_CableSetWireService.GetList(ProjID, res.CableID, "");
+                var Wires = wireServ.GetList(projId, cable.CableID, "");
 
-                Console.WriteLine(res.CableClass);//是否通讯信号
-                Console.WriteLine(res.PreAssignIOType);//通讯类型
 
+
+
+                cable.TagNumber = tags.FirstOrDefault(x => x.EngineDataID == cable.EngineerDataID)?.TagNumber;
+                var panelObj = panels.FirstOrDefault(x => x.PanelID == cable.PanelID);
+                if (panelObj == null)
+                {
+                    continue;//分配就已经不合理了
+                }
+                else if (panelObj != null)
+                {
+                    panelObj.TagNumber = panelTags.FirstOrDefault(x => x.EngineDataID == panelObj.EngineerDataID)?.TagNumber;
+
+                    //1.2.1 系统属性从电缆的from端上的设备中取设备的系统
+                    cable.System = allpropOnFrom.FirstOrDefault(x => x.EngineDataID == cable.PanelID && x.PropertyName == GlobalObject.propName_System)?.PropertyValue;
+
+
+                }
+
+                cable.ToPanel = panelObj;
+                var IOsOnPanel = panelObj.allowedIOTypes.Split(',').ToList();
                 //剩下的感觉都可以是set上的参数？
                 foreach (var set in sets)
                 {
+                    #region 判断下io匹配程度
+                    if (set.PreAssignInOrOut == GlobalEnum.inOrOut.输入.ToString() && cable.PreAssignIOType.ToLower() == "digital")
+                    {
+                        set.IOType = GlobalEnum.IOType.DI;
+                    }
+                    else if (set.PreAssignInOrOut == GlobalEnum.inOrOut.输出.ToString() && cable.PreAssignIOType.ToLower() == "digital")
+                    {
+                        set.IOType = GlobalEnum.IOType.DO;
+                    }
+                    else if (set.PreAssignInOrOut == GlobalEnum.inOrOut.输入.ToString() && cable.PreAssignIOType == "4~20mA")
+                    {
+                        set.IOType = GlobalEnum.IOType.AI;
+                    }
+                    else if (set.PreAssignInOrOut == GlobalEnum.inOrOut.输出.ToString() && cable.PreAssignIOType == "4~20mA")
+                    {
+                        set.IOType = GlobalEnum.IOType.AO;
+                    }
+                    else if (cable.PreAssignIOType == "10v")
+                    {
+                        set.IOType = GlobalEnum.IOType.TenVolt;
+                    }
+                    else if (cable.PreAssignIOType == GlobalEnum.IOType.PT100.ToString())
+                    {
+                        set.IOType = GlobalEnum.IOType.PT100;
+                    }
+                    else if (cable.PreAssignIOType.ToUpper() == GlobalEnum.IOType.PULSE.ToString())
+                    {
+                        set.IOType = GlobalEnum.IOType.PULSE;
+                    }
+                    else if (cable.PreAssignIOType == GlobalEnum.IOType.PT100.ToString())
+                    {
+                        set.IOType = GlobalEnum.IOType.PT100;
+                    }
+                    //下面是通讯的
+                    else
+                    {
+
+                    }
+
+                    if (IOsOnPanel.Contains(set.IOType.ToString()))
+                    {
+                        set.IOTypeMatch = true;
+
+                    }
+                    else
+                    {
+                        set.IOTypeMatch = false;
+                        cable.IOTypesNotMatchedList.Add(set.IOType.ToString());//从电缆上就能知道哪些io是匹配补上的
+                    }
+                    #endregion
                     var wires = Wires.Where(x => x.CableSetID == set.CableSetID);
                     set.Wires = wires.ToList();
                 }
-                res.Sets = sets;
+                cable.Sets = sets;
-                //除了端子号
+                //if (cable.Sets.Any(x => !x.IOTypeMatch))
-
+                //{
-                return res;
+                //    cable.IOTypeMatch = true;
-            }
+                //}
-            else
+                //else
-            {
+                //{
-                //还没有电缆规格的实体，自然肯定也没有预配置
+                //    cable.IOTypeMatch = false;
-                return null;//由客户端根据当前电缆规格来渲染布局，然后保存时进行新建set wire和其他的预分配的内容
+                //}
             }
 
-            #region 已经有了预配置
+            //分组
-            #endregion
+            preAssignedCables = preAssignedCables.OrderBy(x => x.PreAssignIOType).ToList();
 
-            #region 还没有预配置
+
-            #endregion
+            return preAssignedCables;
         }
         #endregion
 

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

@@ -47,8 +47,9 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
         /// Digital 4-20mA Pulse Pt100(如果是非母线，IO类型是什么。)
         /// </summary>
         public string PreAssignIOType { get; set; } = "";
+
         /// <summary>
-        /// 电缆预分配时，必须指定它应该在哪个IO柜子
+        /// 电缆预分配时，必须指定它应该在哪个IO柜子。所以这个不为空，就说明是预分配的电缆。
         /// </summary>
         public string PanelID { get; set; }
         /// <summary>
@@ -101,6 +102,10 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
 
         #region 扩展字段
         /// <summary>
+        /// <see cref="PreAssignIOType"/> 是否和 <see cref="ec_PanelEntity.allowedIOTypes"/> 里的匹配。
+        /// </summary> 
+        public List<string> IOTypesNotMatchedList = new List<string>();
+        /// <summary>
         /// 
         /// </summary>
         [SugarColumn(IsIgnore = true)]
@@ -129,7 +134,11 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
         /// </summary>
         [SugarColumn(IsIgnore = true)]
         public string TagNumber { set; get; }
-
+        /// <summary>
+        /// 电缆所在的From端设备的所在的system
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public string System { set; get; }
         /// <summary>
         /// From连接处的工程位号信息
         /// </summary>
@@ -138,7 +147,7 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
 
 
         /// <summary>
-        /// From连接处的工程位号信息(
+        /// From连接处的工程位号信息。同时，也表达下预分配电缆panelid对应的柜子信息。
         /// </summary>
         [SugarColumn(IsIgnore = true)]
         public ec_PanelEntity ToPanel { set; get; }

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

@@ -129,6 +129,16 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
 
         #region 扩展字段
         /// <summary>
+        /// 根据<see cref="PreAssignInOrOut"/> 和 <see cref="ec_CableEntity.PreAssignIOType"/> 算出来的（比如4-20mA + 输入）得到AI
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public GlobalEnum.IOType IOType { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public bool IOTypeMatch { get; set; }
+        /// <summary>
         /// 
         /// </summary>
         [SugarColumn(IsIgnore = true)]

SWSDBSchemeUpgradeTool/obj/Debug/App.g.cs

@@ -1,70 +0,0 @@
-#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C59FD92DD7F882290C4D1E00897269832FF33C044AE5C3AC38691771009953DB"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using SWSDBSchemeUpgradeTool;
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace SWSDBSchemeUpgradeTool {
-    
-    
-    /// <summary>
-    /// App
-    /// </summary>
-    public partial class App : System.Windows.Application {
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            
-            #line 6 "..\..\App.xaml"
-            this.StartupUri = new System.Uri("MainWindow.xaml", System.UriKind.Relative);
-            
-            #line default
-            #line hidden
-        }
-        
-        /// <summary>
-        /// Application Entry Point.
-        /// </summary>
-        [System.STAThreadAttribute()]
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public static void Main() {
-            SWSDBSchemeUpgradeTool.App app = new SWSDBSchemeUpgradeTool.App();
-            app.InitializeComponent();
-            app.Run();
-        }
-    }
-}
-

SWSDBSchemeUpgradeTool/obj/Debug/App.g.i.cs

@@ -1,70 +0,0 @@
-#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C59FD92DD7F882290C4D1E00897269832FF33C044AE5C3AC38691771009953DB"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using SWSDBSchemeUpgradeTool;
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace SWSDBSchemeUpgradeTool {
-    
-    
-    /// <summary>
-    /// App
-    /// </summary>
-    public partial class App : System.Windows.Application {
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            
-            #line 6 "..\..\App.xaml"
-            this.StartupUri = new System.Uri("MainWindow.xaml", System.UriKind.Relative);
-            
-            #line default
-            #line hidden
-        }
-        
-        /// <summary>
-        /// Application Entry Point.
-        /// </summary>
-        [System.STAThreadAttribute()]
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public static void Main() {
-            SWSDBSchemeUpgradeTool.App app = new SWSDBSchemeUpgradeTool.App();
-            app.InitializeComponent();
-            app.Run();
-        }
-    }
-}
-

SWSDBSchemeUpgradeTool/obj/Debug/MainWindow.g.cs

@@ -1,146 +0,0 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A0C489F14831BC98743B3A71A943EBA949B115892D4776AC738A96131DA29AA4"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using SWSDBSchemeUpgradeTool;
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace SWSDBSchemeUpgradeTool {
-    
-    
-    /// <summary>
-    /// MainWindow
-    /// </summary>
-    public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 12 "..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid ContentGrid;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 64 "..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ProgressBar ProgressBar;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 70 "..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Label StatusText;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 75 "..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock StatusText2;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/SWSDBSchemeUpgradeTool;component/mainwindow.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\MainWindow.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.ContentGrid = ((System.Windows.Controls.Grid)(target));
-            return;
-            case 2:
-            this.ProgressBar = ((System.Windows.Controls.ProgressBar)(target));
-            return;
-            case 3:
-            this.StatusText = ((System.Windows.Controls.Label)(target));
-            return;
-            case 4:
-            this.StatusText2 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 5:
-            
-            #line 86 "..\..\MainWindow.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 6:
-            
-            #line 91 "..\..\MainWindow.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click_1);
-            
-            #line default
-            #line hidden
-            return;
-            case 7:
-            
-            #line 97 "..\..\MainWindow.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click_2);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-

SWSDBSchemeUpgradeTool/obj/Debug/MainWindow.g.i.cs

@@ -1,146 +0,0 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A0C489F14831BC98743B3A71A943EBA949B115892D4776AC738A96131DA29AA4"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using SWSDBSchemeUpgradeTool;
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace SWSDBSchemeUpgradeTool {
-    
-    
-    /// <summary>
-    /// MainWindow
-    /// </summary>
-    public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 12 "..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid ContentGrid;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 64 "..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ProgressBar ProgressBar;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 70 "..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Label StatusText;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 75 "..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock StatusText2;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/SWSDBSchemeUpgradeTool;component/mainwindow.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\MainWindow.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.ContentGrid = ((System.Windows.Controls.Grid)(target));
-            return;
-            case 2:
-            this.ProgressBar = ((System.Windows.Controls.ProgressBar)(target));
-            return;
-            case 3:
-            this.StatusText = ((System.Windows.Controls.Label)(target));
-            return;
-            case 4:
-            this.StatusText2 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 5:
-            
-            #line 86 "..\..\MainWindow.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 6:
-            
-            #line 91 "..\..\MainWindow.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click_1);
-            
-            #line default
-            #line hidden
-            return;
-            case 7:
-            
-            #line 97 "..\..\MainWindow.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click_2);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-

SWSDBSchemeUpgradeTool/obj/Debug/SQLPreview.g.cs

@@ -1,89 +0,0 @@
-#pragma checksum "..\..\SQLPreview.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "68D1F76124B5320845E5CAEA226A6F687D21C37205B359F167F55D30D3DE8FA5"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using SWSDBSchemeUpgradeTool;
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace SWSDBSchemeUpgradeTool {
-    
-    
-    /// <summary>
-    /// SQLPreview
-    /// </summary>
-    public partial class SQLPreview : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 12 "..\..\SQLPreview.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid xxx;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/SWSDBSchemeUpgradeTool;component/sqlpreview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\SQLPreview.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.xxx = ((System.Windows.Controls.Grid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-

SWSDBSchemeUpgradeTool/obj/Debug/SQLPreview.g.i.cs

@@ -1,89 +0,0 @@
-#pragma checksum "..\..\SQLPreview.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "68D1F76124B5320845E5CAEA226A6F687D21C37205B359F167F55D30D3DE8FA5"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using SWSDBSchemeUpgradeTool;
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace SWSDBSchemeUpgradeTool {
-    
-    
-    /// <summary>
-    /// SQLPreview
-    /// </summary>
-    public partial class SQLPreview : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 12 "..\..\SQLPreview.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid xxx;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/SWSDBSchemeUpgradeTool;component/sqlpreview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\SQLPreview.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.xxx = ((System.Windows.Controls.Grid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-

SWSDBSchemeUpgradeTool/obj/Debug/SWSDBSchemeUpgradeTool_MarkupCompile.lref

@@ -1,5 +0,0 @@
-
-
-FC:\old computer\Dielectrical\Dielectrical code from git\009_DI-Elec\SWSDBSchemeUpgradeTool\MainWindow.xaml;;
-FC:\old computer\Dielectrical\Dielectrical code from git\009_DI-Elec\SWSDBSchemeUpgradeTool\SQLPreview.xaml;;
-