shecs/Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
佘春生
2024-05-24 07:49:29 +08:00
parent 9db2db1ad1
commit c8248ad5d5
8 changed files with 517 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+1 -1
View File
@@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
HJGL/FineUIPro.Web/Web.config
+1 -1
View File
@@ -51,7 +51,7 @@
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
<add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" validate="false"/>
</httpHandlers>
<compilation debug="true" targetFramework="4.8">
<compilation debug="false" targetFramework="4.8">
<assemblies>
<!--<add assembly="Microsoft.Build.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />-->
<add assembly="System.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.cs
+9 -4
View File
@@ -58,10 +58,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
private List<Pipeline_WeldJoint> GetDataJointGrid2(string PipelineID)
{
List<string> listData = new List<string>();
var tempData = Funs.DB.PTP_PipelineList.Where(t => t.PipelineId == PipelineID && t.IsAll == false)
.Select(t => t.WeldJonintCode).ToList();
var tempData = Funs.DB.PTP_PipelineList.Where(t => t.PipelineId == PipelineID && t.IsAll == false)
.AsQueryable();
foreach (var item in tempData)
if (!string.IsNullOrEmpty(this.ptpId))
{
tempData = tempData.Where(t => t.PTP_ID != this.ptpId);
}
var newData = tempData.Select(t => t.WeldJonintCode).ToList();
foreach (var item in newData)
{
if (!string.IsNullOrEmpty(item))
{
@@ -78,7 +83,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
}
var query = Funs.DB.Pipeline_WeldJoint.Where(t => t.PipelineId == PipelineID)
.OrderBy(t => t.WeldJointCode).AsQueryable();
if (listData.Count>0)
if (listData.Count>0 )
{
query = query.Where(t => !listData.Contains(t.WeldJointCode));
}