gaofei/HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: gaofei/HJGL_DS:715e22707db887febf22aa715d30915be5a3abb4
Branches Tags
gaofei/HJGL_DS:master
...
compare: gaofei/HJGL_DS:c0a22da597a8ba6773e1445c21e93b449c991151
Branches Tags
gaofei/HJGL_DS:master

3 Commits
715e22707d ... c0a22da597

Author SHA1 Message Date
lichao c0a22da597 11 2026-07-01 20:23:43 +08:00
lichao 07fcd838e8 Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS 2026-07-01 15:43:26 +08:00
lichao b86b76efe9 11 2026-07-01 15:43:00 +08:00
2 changed files with 9 additions and 5 deletions
Expand all files Collapse all files
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
+4 -4
View File
@@ -7010,7 +7010,7 @@
</Compile>
<Compile Include="JGZL\Cover.aspx.cs">
<DependentUpon>Cover.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
<SubType>Component</SubType>
</Compile>
<Compile Include="JGZL\Cover.aspx.designer.cs">
<DependentUpon>Cover.aspx</DependentUpon>
@@ -7080,7 +7080,7 @@
</Compile>
<Compile Include="JGZL\PressureTestOfPipelineSystemRecord.aspx.cs">
<DependentUpon>PressureTestOfPipelineSystemRecord.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
<SubType>Component</SubType>
</Compile>
<Compile Include="JGZL\PressureTestOfPipelineSystemRecord.aspx.designer.cs">
<DependentUpon>PressureTestOfPipelineSystemRecord.aspx</DependentUpon>
@@ -7149,14 +7149,14 @@
<DependentUpon>CommencementReportEdit.aspx</DependentUpon>
</Compile>
<Compile Include="JGZL\ConcealedWorksInspectionRecord.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
<SubType>Component</SubType>
<DependentUpon>ConcealedWorksInspectionRecord.aspx</DependentUpon>
</Compile>
<Compile Include="JGZL\ConcealedWorksInspectionRecord.aspx.designer.cs">
<DependentUpon>ConcealedWorksInspectionRecord.aspx</DependentUpon>
</Compile>
<Compile Include="JGZL\ConcealedWorksInspectionRecordEdit.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
<SubType>Component</SubType>
<DependentUpon>ConcealedWorksInspectionRecordEdit.aspx</DependentUpon>
</Compile>
<Compile Include="JGZL\ConcealedWorksInspectionRecordEdit.aspx.designer.cs">
HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs
+5 -1
View File
@@ -346,7 +346,11 @@ namespace FineUIPro.Web.HJGL.DataIn
isoInfo.MaterialStandardId = materialStandards.Where(x => x.MaterialStandardName == row[dataColumn.ColumnName].ToString()||x.MaterialStandardCode == row[dataColumn.ColumnName].ToString()).Select(x => x.MaterialStandardId).FirstOrDefault();
break;
case "介质":
isoInfo.SER_ID = services.Where(x => x.SER_Name == row[dataColumn.ColumnName].ToString() || x.SER_Code == row[dataColumn.ColumnName].ToString()).Select(x => x.SER_ID).FirstOrDefault();
var SER_ID = services.Where(x => x.SER_Name == row[dataColumn.ColumnName].ToString() || x.SER_Code == row[dataColumn.ColumnName].ToString()).Select(x => x.SER_ID).FirstOrDefault();
if (!string.IsNullOrEmpty(SER_ID))
{
isoInfo.SER_ID = SER_ID;
}
break;
case "管道类别":
isoInfo.PipeLineClass = row[dataColumn.ColumnName].ToString();