lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增管道颜色标识导入功能及API控制器

Browse Source 
更新了多个服务和页面，增加了导入管道颜色标识数据的功能，并实现了包装管理、车次管理、管道组件和焊口信息的API控制器。修正了文件路径错误，优化了分页和排序逻辑，删除了不再使用的API方法。
This commit is contained in:
李鹏飞
2025-10-24 10:04:03 +08:00
parent 55b798135c
commit c23d113eae
55 changed files with 1502 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/File/Excel/DataIn/管道颜色标识库导入模板.xlsx
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道压力试验技术要求.frx
+14 -14
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/10/2025 10:54:01" ReportInfo.Modified="07/10/2025 11:05:43" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/10/2025 10:54:01" ReportInfo.Modified="10/20/2025 18:54:19" ReportInfo.CreatorVersion="2017.1.16.0">
<Dictionary/>
<ReportPage Name="Page1" Landscape="true" PaperWidth="297" PaperHeight="210" LeftMargin="20" TopMargin="25" RightMargin="20" BottomMargin="20" FirstPageSource="4" OtherPagesSource="4" Guides="0,964.11,84.21,65.31,74.76,169.26,103.11,486.36,794.85,187.32,271.53,336.84,411.6,570.57,654.78,720.09">
<PageHeaderBand Name="PageHeader1" Width="971.46" Height="604.93" Guides="0,604.93,30.08,90.24,60.16,129.77,169.3,208.83,248.36,287.89,327.42,366.95,237.98">
@@ -56,15 +56,15 @@
</TableRow>
<TableRow Name="Row4" Height="39.53">
<TableCell Name="Cell16" Border.Lines="All" Text="液压试验" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell17" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell18" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell19" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell20" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell44" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell45" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell46" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell47" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell48" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell17" Border.Lines="All" Text="冷凝水, 苯酚, 双酚A" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell18" Border.Lines="All" Text="20 GB/8163" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell19" Border.Lines="All" Text="15.1" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell20" Border.Lines="All" Text="1.05" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell44" Border.Lines="All" Text="215/215" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell45" Border.Lines="All" Text="清洁水" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell46" Border.Lines="All" Text="1.73" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell47" Border.Lines="All" Text="25" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell48" Border.Lines="All" Text="10/30" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell49" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
</TableRow>
<TableRow Name="Row5" Height="39.53">
@@ -74,7 +74,7 @@
<TableCell Name="Cell24" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell25" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell50" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell51" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell51" Border.Lines="All" Text="空气" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell52" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell53" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell54" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
@@ -87,7 +87,7 @@
<TableCell Name="Cell59" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell60" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell61" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell62" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell62" Border.Lines="All" Text="水-空气" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell63" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell64" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell65" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
@@ -100,7 +100,7 @@
<TableCell Name="Cell70" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell71" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell72" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell73" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell73" Border.Lines="All" Text="空气" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell74" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell75" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell76" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
@@ -113,7 +113,7 @@
<TableCell Name="Cell81" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell82" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell83" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell84" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell84" Border.Lines="All" Text="空气" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell85" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell86" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell87" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道材料材质标识检查记录.frx
+8 -7
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/10/2025 23:00:23" ReportInfo.Modified="09/18/2025 09:57:11" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/10/2025 23:00:23" ReportInfo.Modified="10/24/2025 10:01:55" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@@ -42,11 +42,12 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRF9V3vp1e4jkmMexvV+/syL">
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREvkfDKV6KbUlDGWyOEseoj">
<TableDataSource Name="Data" DataType="System.Int32" PropName="Accident_AccidentHandle" Enabled="true" TableName="Data">
<Column Name="PipelineCode" DataType="System.String" PropName="AccidentHandleId"/>
<Column Name="ManterialCode" DataType="System.String" PropName="ProjectId"/>
<Column Name="Specification" DataType="System.String" PropName="AccidentHandleCode"/>
<Column Name="MaterialColor" DataType="System.Int32" PropName="Column" Calculated="true" Expression=""/>
</TableDataSource>
</MsSqlDataConnection>
<Parameter Name="ProjectName" DataType="System.String"/>
@@ -107,7 +108,7 @@ namespace FastReport
</TableRow>
</TableObject>
</PageHeaderBand>
<DataBand Name="Data1" Top="154.32" Width="623.7" Height="47.25" Guides="0,47.25">
<DataBand Name="Data1" Top="155.2" Width="623.7" Height="47.25" Guides="0,47.25">
<TableObject Name="Table2" Width="623.53" Height="47.25" Border.Lines="Left, Right, Bottom" ManualBuildEvent="Table2_ManualBuild">
<TableColumn Name="Column12" Width="122.85"/>
<TableColumn Name="Column13" Width="28.35"/>
@@ -125,7 +126,7 @@ namespace FastReport
<TableCell Name="Cell67" Border.Lines="All" Text="[Data.ManterialCode]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell68" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell69" Border.Lines="All" Text="[Data.Specification]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell70" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell70" Border.Lines="All" Text="[Data.MaterialColor]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell71" Border.Lines="All" Text="完整" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell72" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell73" Border.Lines="All" Text="弯头、三通、半管接头、大小头、法兰" HorzAlign="Center" VertAlign="Center" Font="楷体, 9pt"/>
@@ -135,8 +136,8 @@ namespace FastReport
</TableRow>
</TableObject>
</DataBand>
<ColumnFooterBand Name="ColumnFooter1" Top="255.07" Width="623.7">
<ChildBand Name="Child1" Top="204.7" Width="623.7" Height="47.25" Guides="0,47.25" FillUnusedSpace="true">
<ColumnFooterBand Name="ColumnFooter1" Top="257.7" Width="623.7">
<ChildBand Name="Child1" Top="206.45" Width="623.7" Height="47.25" Guides="0,47.25" FillUnusedSpace="true">
<TableObject Name="Table3" Width="623.53" Height="47.25" Border.Lines="Left, Right, Bottom">
<TableColumn Name="Column23" Width="122.85"/>
<TableColumn Name="Column24" Width="28.35"/>
@@ -165,7 +166,7 @@ namespace FastReport
</TableObject>
</ChildBand>
</ColumnFooterBand>
<PageFooterBand Name="PageFooter1" Top="258.2" Width="623.7" Height="111.01" Guides="0,111.01,38.56,79.51">
<PageFooterBand Name="PageFooter1" Top="261.7" Width="623.7" Height="111.01" Guides="0,111.01,38.56,79.51">
<TableObject Name="Table4" Width="623.7" Height="111.01" Border.Lines="Left, Top">
<TableColumn Name="Column34" Width="311.85"/>
<TableColumn Name="Column35" Width="311.85"/>
SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx
+2 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="03/13/2022 11:00:20" ReportInfo.Modified="09/29/2025 10:46:03" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="03/13/2022 11:00:20" ReportInfo.Modified="10/20/2025 10:51:41" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREGG2jpnNd1x+f84FNsJb9q"/>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFlf1WEwspad7DkFpDk3K8w"/>
<TableDataSource Name="Data" ReferenceName="Data" DataType="System.Int32" Enabled="true">
<Column Name="PipelineComponentId" DataType="System.String"/>
<Column Name="PipelineComponentCode" DataType="System.String"/>