From 6c9332b23d8b0d668199ea11b75c1e2721cef6ed Mon Sep 17 00:00:00 2001 From: supercjj2023 Date: Mon, 8 Sep 2025 13:29:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=9A=E5=87=BA=E6=9D=A5=E7=9A=84?= =?UTF-8?q?=E4=B8=9C=E8=A5=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SWSDBSchemeUpgradeTool/obj/Debug/App.g.cs | 8 ++++---- SWSDBSchemeUpgradeTool/obj/Debug/App.g.i.cs | 8 ++++---- ...gnTimeResolveAssemblyReferencesInput.cache | Bin 2660 -> 2976 bytes .../obj/Debug/MainWindow.g.cs | 8 ++++---- .../obj/Debug/MainWindow.g.i.cs | 8 ++++---- .../obj/Debug/SQLPreview.g.cs | 8 ++++---- .../obj/Debug/SQLPreview.g.i.cs | 8 ++++---- .../SWSDBSchemeUpgradeTool_MarkupCompile.lref | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/SWSDBSchemeUpgradeTool/obj/Debug/App.g.cs b/SWSDBSchemeUpgradeTool/obj/Debug/App.g.cs index a0691576..6994a24d 100644 --- a/SWSDBSchemeUpgradeTool/obj/Debug/App.g.cs +++ b/SWSDBSchemeUpgradeTool/obj/Debug/App.g.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C59FD92DD7F882290C4D1E00897269832FF33C044AE5C3AC38691771009953DB" //------------------------------------------------------------------------------ // -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 +// 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. // //------------------------------------------------------------------------------ diff --git a/SWSDBSchemeUpgradeTool/obj/Debug/App.g.i.cs b/SWSDBSchemeUpgradeTool/obj/Debug/App.g.i.cs index a0691576..6994a24d 100644 --- a/SWSDBSchemeUpgradeTool/obj/Debug/App.g.i.cs +++ b/SWSDBSchemeUpgradeTool/obj/Debug/App.g.i.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C59FD92DD7F882290C4D1E00897269832FF33C044AE5C3AC38691771009953DB" //------------------------------------------------------------------------------ // -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 +// 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. // //------------------------------------------------------------------------------ diff --git a/SWSDBSchemeUpgradeTool/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SWSDBSchemeUpgradeTool/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 28eef7d0345f6c92cf74aced1335a477fef4b344..aacc06925f466bebe16558103ace549fba6ad2e1 100644 GIT binary patch delta 462 zcmaDNvOs)-v_+P)RZMQpwe;p)&F2HL|Uqyob@jvXPNY%Qtf}DKlCWkgMC0Ihs{K1x@$l U=^XKvedM}mqK3+5bxvDG06e6tlmGw# delta 161 zcmZ1={zPPgG_Sq0RZLN8L4J(0zl-Z+doGoU<@~%p7=n*vc&*R{Cr2?}LsR;YNo;Z* tlNN6nvf9lLnUooMU6F+*0~Kx#VsT|<7I(Iqyqq(hHyK%avprWLBLH?BGg1Hm diff --git a/SWSDBSchemeUpgradeTool/obj/Debug/MainWindow.g.cs b/SWSDBSchemeUpgradeTool/obj/Debug/MainWindow.g.cs index 703e941f..f4fcae3a 100644 --- a/SWSDBSchemeUpgradeTool/obj/Debug/MainWindow.g.cs +++ b/SWSDBSchemeUpgradeTool/obj/Debug/MainWindow.g.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A0C489F14831BC98743B3A71A943EBA949B115892D4776AC738A96131DA29AA4" //------------------------------------------------------------------------------ // -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 +// 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. // //------------------------------------------------------------------------------ diff --git a/SWSDBSchemeUpgradeTool/obj/Debug/MainWindow.g.i.cs b/SWSDBSchemeUpgradeTool/obj/Debug/MainWindow.g.i.cs index 703e941f..f4fcae3a 100644 --- a/SWSDBSchemeUpgradeTool/obj/Debug/MainWindow.g.i.cs +++ b/SWSDBSchemeUpgradeTool/obj/Debug/MainWindow.g.i.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A0C489F14831BC98743B3A71A943EBA949B115892D4776AC738A96131DA29AA4" //------------------------------------------------------------------------------ // -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 +// 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. // //------------------------------------------------------------------------------ diff --git a/SWSDBSchemeUpgradeTool/obj/Debug/SQLPreview.g.cs b/SWSDBSchemeUpgradeTool/obj/Debug/SQLPreview.g.cs index aafc2d41..f853d65d 100644 --- a/SWSDBSchemeUpgradeTool/obj/Debug/SQLPreview.g.cs +++ b/SWSDBSchemeUpgradeTool/obj/Debug/SQLPreview.g.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\SQLPreview.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "68D1F76124B5320845E5CAEA226A6F687D21C37205B359F167F55D30D3DE8FA5" //------------------------------------------------------------------------------ // -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 +// 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. // //------------------------------------------------------------------------------ diff --git a/SWSDBSchemeUpgradeTool/obj/Debug/SQLPreview.g.i.cs b/SWSDBSchemeUpgradeTool/obj/Debug/SQLPreview.g.i.cs index aafc2d41..f853d65d 100644 --- a/SWSDBSchemeUpgradeTool/obj/Debug/SQLPreview.g.i.cs +++ b/SWSDBSchemeUpgradeTool/obj/Debug/SQLPreview.g.i.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\SQLPreview.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "68D1F76124B5320845E5CAEA226A6F687D21C37205B359F167F55D30D3DE8FA5" //------------------------------------------------------------------------------ // -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 +// 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. // //------------------------------------------------------------------------------ diff --git a/SWSDBSchemeUpgradeTool/obj/Debug/SWSDBSchemeUpgradeTool_MarkupCompile.lref b/SWSDBSchemeUpgradeTool/obj/Debug/SWSDBSchemeUpgradeTool_MarkupCompile.lref index 633d7ec8..11201172 100644 --- a/SWSDBSchemeUpgradeTool/obj/Debug/SWSDBSchemeUpgradeTool_MarkupCompile.lref +++ b/SWSDBSchemeUpgradeTool/obj/Debug/SWSDBSchemeUpgradeTool_MarkupCompile.lref @@ -1,5 +1,5 @@  -FC:\repo\CODE\009_DI-Elec\SWSDBSchemeUpgradeTool\MainWindow.xaml;; -FC:\repo\CODE\009_DI-Elec\SWSDBSchemeUpgradeTool\SQLPreview.xaml;; +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;; From b14bf8829f2657244bfafe3a405df381f0bc8108 Mon Sep 17 00:00:00 2001 From: supercjj2023 Date: Mon, 8 Sep 2025 14:18:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?SQL=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Learun.Application.Web/SQL/250829/NoProject/ec_project.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Learun.Application.Web/SQL/250829/NoProject/ec_project.sql b/Learun.Application.Web/SQL/250829/NoProject/ec_project.sql index 764159c9..7bb1f6ca 100644 --- a/Learun.Application.Web/SQL/250829/NoProject/ec_project.sql +++ b/Learun.Application.Web/SQL/250829/NoProject/ec_project.sql @@ -1,5 +1,5 @@ ALTER TABLE ec_project ADD `IO_predicted_issue` VARCHAR(50) NULL; -ALTER TABLE ec_project ADD `IO_predicted_issue` VARCHAR(50) NULL; -ALTER TABLE ec_project ADD `IO_predicted_issue` VARCHAR(50) NULL; -ALTER TABLE ec_project ADD `IO_predicted_issue` VARCHAR(50) NULL; +ALTER TABLE ec_project ADD `IO_predicted_construct` VARCHAR(50) NULL; +ALTER TABLE ec_project ADD `IO_real_issue` VARCHAR(50) NULL; +ALTER TABLE ec_project ADD `IO_real_construct` VARCHAR(50) NULL; \ No newline at end of file From 72d236d8ea93d375f2ae7ca9875421ac5672c055 Mon Sep 17 00:00:00 2001 From: supercjj2023 Date: Fri, 12 Sep 2025 15:48:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A3=80=E5=85=A5?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=BE=AA=E7=8E=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ec_enginedata_pixelBLL.cs | 52 +++++++++++++------ 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_enginedata_pixel/ec_enginedata_pixelBLL.cs b/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_enginedata_pixel/ec_enginedata_pixelBLL.cs index 64eed1dd..071f27c6 100644 --- a/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_enginedata_pixel/ec_enginedata_pixelBLL.cs +++ b/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_enginedata_pixel/ec_enginedata_pixelBLL.cs @@ -484,32 +484,52 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC } } } + + // 构建一个字典，key = (EngineDataID, PropertyID)，value = PropertyValue + var propDict = AllPropsOfEng + .GroupBy(x => (x.EngineDataID, x.PropertyID)) + .ToDictionary(g => g.Key, g => g.First().PropertyValue); + //检查必填属性 foreach (var checkproperty in NeedCheckProperties) { - //如果ec_enginedata_propety里面没有必填属性要求的这个属性，就代表没有保存，认为是没有填值，为空 - if (AllPropsOfEng.Where(x => x.EngineDataID == checkproperty.EngineDataID).Select(x => x.PropertyID).Contains(checkproperty.PropertyID)) + var key = (checkproperty.EngineDataID, checkproperty.PropertyID); + if (propDict.TryGetValue(key, out var propertyValue)) { - var PropertyValue = AllPropsOfEng - .FirstOrDefault(x => - x.EngineDataID == checkproperty.EngineDataID && - x.PropertyID == checkproperty.PropertyID) - ?.PropertyValue; - //foreach (var property in AllPropsOfEng) - //{ - //如果ec_enginedata_propety里面的EngineDataID等于需要检查对象的EngineDataID，且属性ID也能对上，且属性值为空或者NULL，则认为没有填写 - if (string.IsNullOrEmpty(PropertyValue) || PropertyValue == "0") - { - errText = $"图面有对象【{checkproperty.TagNumber}】在即时更新阶段的必填属性【{checkproperty.PropertyName}】值为空，不能检入，请执行“属性检查”功能对图纸进行属性检查。"; - return res = false; - } - //} + if (string.IsNullOrEmpty(propertyValue) || propertyValue == "0") + { + errText = $"图面有对象【{checkproperty.TagNumber}】在即时更新阶段的必填属性【{checkproperty.PropertyName}】值为空，不能检入，请执行“属性检查”功能对图纸进行属性检查。"; + return res = false; + } } else { errText = $"图面有对象【{checkproperty.TagNumber}】在即时更新阶段的必填属性【{checkproperty.PropertyName}】不存在，认为空，需要填写，不能检入，请执行“属性检查”功能对图纸进行属性检查。"; return res = false; } + //如果ec_enginedata_propety里面没有必填属性要求的这个属性，就代表没有保存，认为是没有填值，为空 + //if (AllPropsOfEng.Where(x => x.EngineDataID == checkproperty.EngineDataID).Select(x => x.PropertyID).Contains(checkproperty.PropertyID)) + //{ + // var PropertyValue = AllPropsOfEng + // .FirstOrDefault(x => + // x.EngineDataID == checkproperty.EngineDataID && + // x.PropertyID == checkproperty.PropertyID) + // ?.PropertyValue; + // //foreach (var property in AllPropsOfEng) + // //{ + // //如果ec_enginedata_propety里面的EngineDataID等于需要检查对象的EngineDataID，且属性ID也能对上，且属性值为空或者NULL，则认为没有填写 + // if (string.IsNullOrEmpty(PropertyValue) || PropertyValue == "0") + // { + // errText = $"图面有对象【{checkproperty.TagNumber}】在即时更新阶段的必填属性【{checkproperty.PropertyName}】值为空，不能检入，请执行“属性检查”功能对图纸进行属性检查。"; + // return res = false; + // } + // //} + //} + //else + //{ + // errText = $"图面有对象【{checkproperty.TagNumber}】在即时更新阶段的必填属性【{checkproperty.PropertyName}】不存在，认为空，需要填写，不能检入，请执行“属性检查”功能对图纸进行属性检查。"; + // return res = false; + //} } //需要去看依赖项的数据了，这里的条件为无需必填或者即时更新版必填又或者Isrequired=null,都要去检查，又由于会去这个List里面找上级关联对象，所以也不能针对dependency_type去做过滤，不然可能就找不到上级对象了 From e1f9939a413257f0367b987b778d0358b1f8a13b Mon Sep 17 00:00:00 2001 From: supercjj2023 Date: Tue, 16 Sep 2025 10:00:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E6=A3=80?= =?UTF-8?q?=E5=85=A5=E6=A3=80=E6=9F=A5=E7=9A=84=E5=BE=AA=E7=8E=AF=EF=BC=8C?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E5=9B=A0=E4=B8=BA=E6=B2=A1=E6=9C=89PUSH?= =?UTF-8?q?=EF=BC=8C=E5=86=B2=E7=AA=81=E4=BA=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ec_enginedata_pixelBLL.cs | 41 +++---------------- 1 file changed, 5 insertions(+), 36 deletions(-) diff --git a/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_enginedata_pixel/ec_enginedata_pixelBLL.cs b/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_enginedata_pixel/ec_enginedata_pixelBLL.cs index ec965032..ed2ffba1 100644 --- a/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_enginedata_pixel/ec_enginedata_pixelBLL.cs +++ b/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_enginedata_pixel/ec_enginedata_pixelBLL.cs @@ -496,49 +496,18 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC var key = (checkproperty.EngineDataID, checkproperty.PropertyID); if (propDict.TryGetValue(key, out var propertyValue)) { - var PropertyValue = AllPropsOfEng - .FirstOrDefault(x => - x.EngineDataID == checkproperty.EngineDataID && - x.PropertyID == checkproperty.PropertyID) - ?.PropertyValue; - //foreach (var property in AllPropsOfEng) - //{ //如果ec_enginedata_propety里面的EngineDataID等于需要检查对象的EngineDataID，且属性ID也能对上，且属性值为空或者NULL，则认为没有填写 - if (string.IsNullOrEmpty(PropertyValue) || PropertyValue == "0") - { - errText = $"图面有对象【{checkproperty.TagNumber}】在即时更新阶段的必填属性【{checkproperty.PropertyName}】值为空，不能检入，请执行“属性检查”功能对图纸进行属性检查。"; - return res = false; - } - //} + if (string.IsNullOrEmpty(propertyValue) || propertyValue == "0") + { + errText = $"图面有对象【{checkproperty.TagNumber}】在即时更新阶段的必填属性【{checkproperty.PropertyName}】值为空，不能检入，请执行“属性检查”功能对图纸进行属性检查。"; + return res = false; + } } else { errText = $"图面有对象【{checkproperty.TagNumber}】在即时更新阶段的必填属性【{checkproperty.PropertyName}】不存在，认为空，需要填写，不能检入，请执行“属性检查”功能对图纸进行属性检查。"; return res = false; } - //如果ec_enginedata_propety里面没有必填属性要求的这个属性，就代表没有保存，认为是没有填值，为空 - //if (AllPropsOfEng.Where(x => x.EngineDataID == checkproperty.EngineDataID).Select(x => x.PropertyID).Contains(checkproperty.PropertyID)) - //{ - // var PropertyValue = AllPropsOfEng - // .FirstOrDefault(x => - // x.EngineDataID == checkproperty.EngineDataID && - // x.PropertyID == checkproperty.PropertyID) - // ?.PropertyValue; - // //foreach (var property in AllPropsOfEng) - // //{ - // //如果ec_enginedata_propety里面的EngineDataID等于需要检查对象的EngineDataID，且属性ID也能对上，且属性值为空或者NULL，则认为没有填写 - // if (string.IsNullOrEmpty(PropertyValue) || PropertyValue == "0") - // { - // errText = $"图面有对象【{checkproperty.TagNumber}】在即时更新阶段的必填属性【{checkproperty.PropertyName}】值为空，不能检入，请执行“属性检查”功能对图纸进行属性检查。"; - // return res = false; - // } - // //} - //} - //else - //{ - // errText = $"图面有对象【{checkproperty.TagNumber}】在即时更新阶段的必填属性【{checkproperty.PropertyName}】不存在，认为空，需要填写，不能检入，请执行“属性检查”功能对图纸进行属性检查。"; - // return res = false; - //} } //需要去看依赖项的数据了，这里的条件为无需必填或者即时更新版必填又或者Isrequired=null,都要去检查，又由于会去这个List里面找上级关联对象，所以也不能针对dependency_type去做过滤，不然可能就找不到上级对象了