diff --git a/HJGL_DS/BLL/JGZL/PipeFittingInspectionRecordService.cs b/HJGL_DS/BLL/JGZL/PipeFittingInspectionRecordService.cs
index 7c89fbc..f8c5152 100644
--- a/HJGL_DS/BLL/JGZL/PipeFittingInspectionRecordService.cs
+++ b/HJGL_DS/BLL/JGZL/PipeFittingInspectionRecordService.cs
@@ -94,5 +94,16 @@ namespace BLL
db.SubmitChanges();
}
}
+
+ public static void DeleteListsByProjectId(string projectId)
+ {
+ SGGLDB db = Funs.DB;
+ var q = (from x in db.JGZL_PipeFittingInspectionRecord where x.ProjectId == projectId select x).ToList();
+ if (q.Count > 0)
+ {
+ db.JGZL_PipeFittingInspectionRecord.DeleteAllOnSubmit(q);
+ db.SubmitChanges();
+ }
+ }
}
}
diff --git a/HJGL_DS/BLL/JGZL/SteelPipeCheckRecordService.cs b/HJGL_DS/BLL/JGZL/SteelPipeCheckRecordService.cs
index a7f0a97..60f3d52 100644
--- a/HJGL_DS/BLL/JGZL/SteelPipeCheckRecordService.cs
+++ b/HJGL_DS/BLL/JGZL/SteelPipeCheckRecordService.cs
@@ -17,6 +17,12 @@ namespace BLL
e.RecordId == recordId);
}
+ public static Model.JGZL_SteelPipeCheckRecord GetSteelPipeReportByProjectId(string projectId)
+ {
+ return Funs.DB.JGZL_SteelPipeCheckRecord.FirstOrDefault(e =>
+ e.ProjectId == projectId);
+ }
+
///
/// 添加钢管检查验收记录
///
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管件宏观检查记录表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管件宏观检查记录表.frx
index 70a5eca..d610e5e 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管件宏观检查记录表.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管件宏观检查记录表.frx
@@ -1,5 +1,5 @@
-
+
using System;
using System.Collections;
using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
}
-
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/钢管检查验收记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/钢管检查验收记录.frx
index 2dee118..a04804e 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/钢管检查验收记录.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/钢管检查验收记录.frx
@@ -1,5 +1,5 @@
-
+
using System;
using System.Collections;
using System.Collections.Generic;
@@ -72,7 +72,7 @@ namespace FastReport
}
-
+
@@ -95,8 +95,17 @@ namespace FastReport
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -110,7 +119,7 @@ namespace FastReport
-
+
@@ -125,11 +134,11 @@ namespace FastReport
-
+
-
+
@@ -145,12 +154,12 @@ namespace FastReport
-
+
-
+
-
+
@@ -242,15 +251,15 @@ namespace FastReport
-
-
-
-
-
+
+
+
+
+
-
+
@@ -278,7 +287,7 @@ namespace FastReport
-
+
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx b/HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx
index cf621a9..8d4087c 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx
+++ b/HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx
@@ -40,6 +40,7 @@
+
@@ -51,67 +52,108 @@
EnableColumnLines="true" ClicksToEdit="1" DataIDField="RecordId" AllowSorting="true"
SortField="ContractNo" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
- EnableTextSelection="True" AutoScroll="true" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
+ EnableTextSelection="True" AutoScroll="true" OnPreDataBound="Grid1_PreDataBound">
-
-
+ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
+
+
+
+
+
+
+
+
+ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="60px">
+
+
+
+ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="60px">
+
+
+
+ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
+
+
+
+ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+
+
+
+ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
+
+
+
+ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
+
+
+
+ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
+
+
+
+ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
+
+
+
+ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
+
+
+
+ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
+
+
+
+ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+
+
+
+ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+
+
+
+
+
+
- <%--
- --%>
-
-
-
@@ -130,30 +172,10 @@
-
-
-
-