diff --git a/DataBase/版本日志/HJGLDB_DS_2026-02-23_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-02-23_bwj.sql
new file mode 100644
index 0000000..f173a3d
--- /dev/null
+++ b/DataBase/版本日志/HJGLDB_DS_2026-02-23_bwj.sql
@@ -0,0 +1,12 @@
+ALTER TABLE [dbo].[JGZL_BlowingCleaningItem] DROP CONSTRAINT [FK_JGZL_BlowingCleaningItem_HJGL_PW_IsoInfo]
+GO
+ALTER TABLE [dbo].[JGZL_BlowingCleaningItem] DROP CONSTRAINT [FK_JGZL_BlowingCleaningItem_HJGL_BS_Steel]
+GO
+
+alter table JGZL_BlowingCleaning add CheckReulst1 nvarchar(10)
+alter table JGZL_BlowingCleaning add CheckReulst2 nvarchar(10)
+alter table JGZL_BlowingCleaning add CheckReulst3 nvarchar(10)
+alter table JGZL_BlowingCleaning add CheckReulst4 nvarchar(10)
+go
+
+
diff --git a/HJGLPackFile.zip b/HJGLPackFile.zip
deleted file mode 100644
index 469679e..0000000
Binary files a/HJGLPackFile.zip and /dev/null differ
diff --git a/HJGLPackFile/PackFile/JGZL/TeamWeldingInspection.aspx b/HJGLPackFile/PackFile/JGZL/TeamWeldingInspection.aspx
deleted file mode 100644
index dcdbd56..0000000
--- a/HJGLPackFile/PackFile/JGZL/TeamWeldingInspection.aspx
+++ /dev/null
@@ -1,233 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TeamWeldingInspection.aspx.cs" Inherits="FineUIPro.Web.JGZL.TeamWeldingInspection" %>
-
-
-
-
-
-
- 支管连接焊接接头、角焊接头组对焊接检查记录
-
-
-
- <%----%>
-
-
diff --git a/HJGL_DS/BLL/JGZL/BlowingCleaningItemService.cs b/HJGL_DS/BLL/JGZL/BlowingCleaningItemService.cs
index 3cb1b20..e29c1a4 100644
--- a/HJGL_DS/BLL/JGZL/BlowingCleaningItemService.cs
+++ b/HJGL_DS/BLL/JGZL/BlowingCleaningItemService.cs
@@ -129,5 +129,13 @@ namespace BLL
}
return returnViewMatch;
}
+
+ public static Model.JGZL_BlowingCleaningItem GetItemByIsoNo(string projectId, string isoNo)
+ {
+ return (from x in Funs.DB.JGZL_BlowingCleaningItem
+ join y in Funs.DB.JGZL_BlowingCleaning on x.BlowingCleaningId equals y.BlowingCleaningId
+ where y.ProjectId == projectId && x.ISO_Id == isoNo
+ select x).FirstOrDefault();
+ }
}
}
diff --git a/HJGL_DS/BLL/JGZL/BlowingCleaningService.cs b/HJGL_DS/BLL/JGZL/BlowingCleaningService.cs
index 0559e4e..87ccae5 100644
--- a/HJGL_DS/BLL/JGZL/BlowingCleaningService.cs
+++ b/HJGL_DS/BLL/JGZL/BlowingCleaningService.cs
@@ -19,6 +19,17 @@ namespace BLL
return Funs.DB.JGZL_BlowingCleaning.FirstOrDefault(e => e.BlowingCleaningId == blowingCleaningId);
}
+ ///
+ /// 根据项目Id获取吹扫/清洗检验记录
+ ///
+ ///
+ ///
+ public static Model.JGZL_BlowingCleaning GetBlowingCleaningByProjectId(string projectId)
+ {
+ return Funs.DB.JGZL_BlowingCleaning.FirstOrDefault(e => e.ProjectId == projectId);
+ }
+
+
///
/// 添加吹扫/清洗检验记录
///
@@ -35,6 +46,10 @@ namespace BLL
newBlowingCleaning.Results = blowingCleaning.Results;
newBlowingCleaning.CompileMan = blowingCleaning.CompileMan;
newBlowingCleaning.CompileDate = blowingCleaning.CompileDate;
+ newBlowingCleaning.CheckReulst1 = blowingCleaning.CheckReulst1;
+ newBlowingCleaning.CheckReulst2 = blowingCleaning.CheckReulst2;
+ newBlowingCleaning.CheckReulst3 = blowingCleaning.CheckReulst3;
+ newBlowingCleaning.CheckReulst4 = blowingCleaning.CheckReulst4;
db.JGZL_BlowingCleaning.InsertOnSubmit(newBlowingCleaning);
db.SubmitChanges();
}
@@ -53,6 +68,10 @@ namespace BLL
newBlowingCleaning.SystemName = blowingCleaning.SystemName;
newBlowingCleaning.SystemCode = blowingCleaning.SystemCode;
newBlowingCleaning.Results = blowingCleaning.Results;
+ newBlowingCleaning.CheckReulst1 = blowingCleaning.CheckReulst1;
+ newBlowingCleaning.CheckReulst2 = blowingCleaning.CheckReulst2;
+ newBlowingCleaning.CheckReulst3 = blowingCleaning.CheckReulst3;
+ newBlowingCleaning.CheckReulst4 = blowingCleaning.CheckReulst4;
db.SubmitChanges();
}
}
diff --git a/HJGL_DS/BLL/JGZL/PressureTestOfPipelineSystemConfirmationRecordService.cs b/HJGL_DS/BLL/JGZL/PressureTestOfPipelineSystemConfirmationRecordService.cs
index 01e71e3..e2d9a39 100644
--- a/HJGL_DS/BLL/JGZL/PressureTestOfPipelineSystemConfirmationRecordService.cs
+++ b/HJGL_DS/BLL/JGZL/PressureTestOfPipelineSystemConfirmationRecordService.cs
@@ -16,6 +16,16 @@ namespace BLL
return Funs.DB.JGZL_PressureTestOfPipelineSystemConfirmationRecord.FirstOrDefault(e => e.RecordId == recordId);
}
+ ///
+ /// 根据项目Id获取管道系统压力试验条件确认记录
+ ///
+ ///
+ ///
+ public static Model.JGZL_PressureTestOfPipelineSystemConfirmationRecord GetPressureTestOfPipelineSystemConfirmationRecordByProjectId(string projectId)
+ {
+ return Funs.DB.JGZL_PressureTestOfPipelineSystemConfirmationRecord.FirstOrDefault(e => e.ProjectId == projectId);
+ }
+
///
/// 添加管道系统压力试验条件确认记录
///
@@ -90,5 +100,20 @@ namespace BLL
db.SubmitChanges();
}
}
+
+ ///
+ /// 根据项目Id删除管道系统压力试验条件确认记录
+ ///
+ ///
+ public static void DeletePressureTestOfPipelineSystemConfirmationRecordByProjectId(string projectId)
+ {
+ SGGLDB db = Funs.DB;
+ var q = (from x in db.JGZL_PressureTestOfPipelineSystemConfirmationRecord where x.ProjectId==projectId select x).ToList();
+ if (q != null)
+ {
+ db.JGZL_PressureTestOfPipelineSystemConfirmationRecord.DeleteAllOnSubmit(q);
+ db.SubmitChanges();
+ }
+ }
}
}
\ No newline at end of file
diff --git a/HJGL_DS/BLL/JGZL/PressureTestOfPipelineSystemRecordItemService.cs b/HJGL_DS/BLL/JGZL/PressureTestOfPipelineSystemRecordItemService.cs
index 89ebc69..d34383e 100644
--- a/HJGL_DS/BLL/JGZL/PressureTestOfPipelineSystemRecordItemService.cs
+++ b/HJGL_DS/BLL/JGZL/PressureTestOfPipelineSystemRecordItemService.cs
@@ -17,6 +17,14 @@ namespace BLL
return Funs.DB.JGZL_PressureTestOfPipelineSystemRecordItem.FirstOrDefault(e => e.Id == Id);
}
+ public static Model.JGZL_PressureTestOfPipelineSystemRecordItem GetItemByIsoNo(string projectId,string isoNo)
+ {
+ return (from x in Funs.DB.JGZL_PressureTestOfPipelineSystemRecordItem
+ join y in Funs.DB.JGZL_PressureTestOfPipelineSystemRecord on x.RecordId equals y.RecordId
+ where y.ProjectId == projectId && x.PipelineNo == isoNo
+ select x).FirstOrDefault();
+ }
+
///
/// 根据主键获取管道系统压力试验记录子表
diff --git a/HJGL_DS/BLL/JGZL/PressureTestOfPipelineSystemRecordService.cs b/HJGL_DS/BLL/JGZL/PressureTestOfPipelineSystemRecordService.cs
index 54fcbbc..be6df3f 100644
--- a/HJGL_DS/BLL/JGZL/PressureTestOfPipelineSystemRecordService.cs
+++ b/HJGL_DS/BLL/JGZL/PressureTestOfPipelineSystemRecordService.cs
@@ -16,6 +16,16 @@ namespace BLL
return Funs.DB.JGZL_PressureTestOfPipelineSystemRecord.FirstOrDefault(e => e.RecordId == recordId);
}
+ ///
+ /// 根据项目Id获取管道系统压力试验记录
+ ///
+ ///
+ ///
+ public static Model.JGZL_PressureTestOfPipelineSystemRecord GetPressureTestOfPipelineSystemRecordByProjectId(string projectId)
+ {
+ return Funs.DB.JGZL_PressureTestOfPipelineSystemRecord.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 58ae040..7ea17c4 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,13 +42,17 @@ namespace FastReport
}
-
+
+
+
+
+
@@ -59,17 +63,17 @@ namespace FastReport
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
@@ -84,14 +88,14 @@ namespace FastReport
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -116,8 +120,8 @@ namespace FastReport
-
-
+
+
@@ -125,8 +129,8 @@ namespace FastReport
-
-
+
+
@@ -134,8 +138,8 @@ namespace FastReport
-
-
+
+
@@ -143,8 +147,8 @@ namespace FastReport
-
-
+
+
@@ -157,15 +161,15 @@ namespace FastReport
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -177,16 +181,16 @@ namespace FastReport
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -199,11 +203,11 @@ namespace FastReport
-
-
-
-
-
+
+
+
+
+
@@ -214,7 +218,7 @@ namespace FastReport
-
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊口射线检测报告.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊口射线检测报告.frx
index 2c32a5c..2b404a0 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;
@@ -63,7 +63,7 @@ namespace FastReport
}
-
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验条件确认记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验条件确认记录.frx
index 5800084..ee993ba 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验条件确认记录.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验条件确认记录.frx
@@ -1,5 +1,5 @@
-
+
@@ -18,7 +18,7 @@
-
+
@@ -55,11 +55,11 @@
-
-
+
+
-
-
+
+
@@ -130,14 +130,14 @@
-
+
-
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验记录.frx
index 3732b49..db48ad6 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
}
-
+
@@ -60,20 +60,20 @@ namespace FastReport
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -96,16 +96,16 @@ namespace FastReport
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -129,16 +129,16 @@ namespace FastReport
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -151,17 +151,17 @@ namespace FastReport
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -175,17 +175,17 @@ namespace FastReport
-
-
-
-
-
+
+
+
+
+
-
+
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx b/HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx
index 19ddd59..6f68b80 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx
+++ b/HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx
@@ -37,37 +37,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ EnableTextSelection="True" AutoScroll="true" OnPreDataBound="Grid1_PreDataBound">
-
-
+
+
+
+
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
@@ -86,30 +142,10 @@
-
-
-
-