diff --git a/DataBase/版本日志/HJGLDB_DS_2026-03-18_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-03-18_bwj.sql new file mode 100644 index 0000000..3ce578f --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2026-03-18_bwj.sql @@ -0,0 +1,4 @@ + +update Sys_Menu set Url='JGZL/WeldingWireRecovery.aspx' where MenuId='87D52498-9FCC-4D47-B717-4CB2CA355E31' +update Sys_Menu set Url='JGZL/ElectrodeRecovery.aspx' where MenuId='E7681A08-F21C-441B-B6BC-DF41BF2651CD' +go \ No newline at end of file diff --git a/HJGL_DS/BLL/JGZL/MaterialQualityCertificateDocService.cs b/HJGL_DS/BLL/JGZL/MaterialQualityCertificateDocService.cs index dd38a0c..48389f3 100644 --- a/HJGL_DS/BLL/JGZL/MaterialQualityCertificateDocService.cs +++ b/HJGL_DS/BLL/JGZL/MaterialQualityCertificateDocService.cs @@ -88,5 +88,16 @@ namespace BLL db.SubmitChanges(); } } + + public static void DeleteListByProjectId(string projectId) + { + SGGLDB db = Funs.DB; + var q = (from x in db.JGZL_MaterialQualityCertificateDoc where x.ProjectId == projectId select x).ToList(); + if (q.Count>0) + { + db.JGZL_MaterialQualityCertificateDoc.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } } } diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件目录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件目录.frx index 59cc317..4bfd99d 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; @@ -51,7 +51,7 @@ namespace FastReport } - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表.frx index eb0bd35..c853e1b 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 } - + @@ -75,8 +75,8 @@ namespace FastReport - - + + @@ -182,7 +182,7 @@ namespace FastReport - + @@ -234,8 +234,8 @@ namespace FastReport - - + + @@ -288,12 +288,12 @@ namespace FastReport - + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx index db5be7a..cc4073e 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx @@ -1,7 +1,7 @@  - + - + @@ -26,75 +26,75 @@ - + - - + + - - + + - + - + - + - + - + - + - + - + - + @@ -106,7 +106,7 @@ - + @@ -117,35 +117,35 @@ - + - + - + - + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/合格焊工登记表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/合格焊工登记表.frx index ae182da..3f4bae5 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 b457fda..f674bb6 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 } - + @@ -57,8 +57,8 @@ namespace FastReport - - + + @@ -99,7 +99,7 @@ namespace FastReport - + @@ -123,8 +123,8 @@ namespace FastReport - - + + @@ -149,7 +149,7 @@ namespace FastReport - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工序交接记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工序交接记录.frx index c593803..03f281b 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工序交接记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工序交接记录.frx @@ -1,7 +1,7 @@  - + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/支管连接焊接接头、角焊接头组对焊接检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/支管连接焊接接头、角焊接头组对焊接检查记录.frx index 15e6993..2a7aec9 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 } - + @@ -68,8 +68,8 @@ namespace FastReport - - + + @@ -223,7 +223,7 @@ namespace FastReport - + @@ -263,8 +263,8 @@ namespace FastReport - - + + @@ -305,7 +305,7 @@ namespace FastReport - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/无损检测人员登记表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/无损检测人员登记表.frx index e0dfd7b..ba9d4f3 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 } - + @@ -129,7 +129,7 @@ namespace FastReport - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/材料质量证明文件一览表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/材料质量证明文件一览表.frx index 504cc79..0fe9491 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 } - + @@ -81,21 +81,21 @@ namespace FastReport - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -128,20 +128,20 @@ namespace FastReport - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -158,21 +158,21 @@ namespace FastReport - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -190,12 +190,12 @@ namespace FastReport - - - - - - + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/档案移交表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/档案移交表.frx index 8e14a1f..fa58594 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/档案移交表.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/档案移交表.frx @@ -1,25 +1,19 @@  - + - - - - - - - - - - - - - + + + + + + + @@ -32,7 +26,7 @@ - + @@ -46,8 +40,8 @@ - - + + @@ -62,29 +56,29 @@ - - + + - + - + - + - + - + - + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊丝发放记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊丝发放记录.frx new file mode 100644 index 0000000..a7632b0 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊丝发放记录.frx @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条发放回收记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条发放回收记录.frx new file mode 100644 index 0000000..65ecf59 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条发放回收记录.frx @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条烘烤记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条烘烤记录.frx index 77e25a8..b752d19 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; @@ -39,7 +39,7 @@ namespace FastReport } - + @@ -65,30 +65,30 @@ namespace FastReport - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -184,32 +184,32 @@ namespace FastReport - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -235,30 +235,30 @@ namespace FastReport - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -285,30 +285,30 @@ namespace FastReport - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/特种设备安装改造维修告知书.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/特种设备安装改造维修告知书.frx index 2526692..54b94d5 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/特种设备安装改造维修告知书.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/特种设备安装改造维修告知书.frx @@ -1,7 +1,7 @@  - + - + @@ -31,14 +31,14 @@ - - + + - + @@ -54,15 +54,15 @@ - - + + - + @@ -70,7 +70,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -102,7 +102,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -153,8 +153,8 @@ - - + + @@ -165,9 +165,9 @@ - + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管件宏观检查记录表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管件宏观检查记录表.frx index 8376793..c30b90d 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 } - + @@ -62,24 +62,24 @@ namespace FastReport - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -152,23 +152,23 @@ namespace FastReport - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -188,24 +188,24 @@ namespace FastReport - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -226,11 +226,11 @@ namespace FastReport - - - - - + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道吹扫、清洗检验记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道吹扫、清洗检验记录.frx index e14fb86..a548ec9 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 45d61e8..5895a74 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 } - + @@ -67,17 +67,17 @@ namespace FastReport - - - - - - - - + + + + + + + + - + @@ -89,33 +89,33 @@ namespace FastReport - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -189,30 +189,30 @@ namespace FastReport - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -239,31 +239,31 @@ namespace FastReport - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -291,32 +291,32 @@ namespace FastReport - - - - - - + + + + + + - + - + - + - + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道无损检测结果汇总表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道无损检测结果汇总表.frx index ffbc14f..00ff5e3 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; @@ -67,7 +67,7 @@ namespace FastReport } } - + @@ -113,38 +113,38 @@ namespace FastReport - - - - - - - - + + + + + + + + - - - + + + - + - - - - - - - - - - + + + + + + + + + + @@ -156,16 +156,16 @@ namespace FastReport - - - - - - - - - - + + + + + + + + + + @@ -177,17 +177,17 @@ namespace FastReport - - - - - - - - - - - + + + + + + + + + + + @@ -255,20 +255,20 @@ namespace FastReport - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -287,19 +287,19 @@ namespace FastReport - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -315,20 +315,20 @@ namespace FastReport - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -345,17 +345,17 @@ namespace FastReport - - - - - - + + + + + + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道材料材质标识检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道材料材质标识检查记录.frx index 7cddf5f..871b0b9 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 2d5e8c9..cca674f 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 } - + @@ -281,15 +281,15 @@ namespace FastReport - + - + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接工作记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接工作记录.frx index 7cc2fa3..f8b8314 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; @@ -50,7 +50,7 @@ namespace FastReport } - + @@ -66,8 +66,8 @@ namespace FastReport - - + + @@ -127,7 +127,7 @@ namespace FastReport - + @@ -157,8 +157,8 @@ namespace FastReport - - + + @@ -189,15 +189,15 @@ namespace FastReport - - + + - - + + @@ -220,9 +220,6 @@ namespace FastReport - - - diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接接头报检检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接接头报检检查记录.frx index 3035ca6..196e921 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 } - + @@ -64,8 +64,8 @@ namespace FastReport - - + + @@ -188,7 +188,7 @@ namespace FastReport - + @@ -224,8 +224,8 @@ namespace FastReport - - + + @@ -262,7 +262,7 @@ namespace FastReport - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验记录.frx index f30956e..6687783 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 286f9f6..2a2cb0c 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 11d2d80..79c41c0 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 c1dc819..2282a34 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道预制施工检查记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道预制施工检查记录.frx @@ -1,7 +1,7 @@  - + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/钢管检查验收记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/钢管检查验收记录.frx index fb76dd6..fee24eb 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 } - + @@ -118,7 +118,7 @@ namespace FastReport - + @@ -258,7 +258,7 @@ namespace FastReport - + @@ -277,23 +277,23 @@ namespace FastReport - - + + - + - + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/阀门检验试验记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/阀门检验试验记录.frx index 79aa0b7..213ad8b 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 } - + @@ -64,8 +64,8 @@ namespace FastReport - - + + @@ -141,7 +141,7 @@ namespace FastReport - + @@ -179,8 +179,8 @@ namespace FastReport - - + + @@ -219,7 +219,7 @@ namespace FastReport - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/阀门试验确认表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/阀门试验确认表.frx index b039257..3927c6e 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 } - + @@ -59,8 +59,8 @@ namespace FastReport - - + + @@ -116,7 +116,7 @@ namespace FastReport - + @@ -144,8 +144,8 @@ namespace FastReport - - + + @@ -174,7 +174,7 @@ namespace FastReport - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/防腐工程质量验收记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/防腐工程质量验收记录.frx index 60d2ff6..c284038 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 } - + @@ -66,7 +66,7 @@ namespace FastReport - + @@ -247,12 +247,12 @@ namespace FastReport - - + + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/隔热工程质量验收记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/隔热工程质量验收记录.frx index 5cd76eb..cb301c2 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/隔热工程质量验收记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/隔热工程质量验收记录.frx @@ -1,7 +1,7 @@  - + - + diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj index 37d6f36..3d4dea5 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj @@ -1249,6 +1249,7 @@ + @@ -1318,6 +1319,7 @@ + @@ -6633,6 +6635,13 @@ DocumentDescription.aspx + + ElectrodeRecovery.aspx + ASPXCodeBehind + + + ElectrodeRecovery.aspx + EWeldRHRecord.aspx ASPXCodeBehind @@ -7116,6 +7125,13 @@ WeldingRodBaking.aspx + + WeldingWireRecovery.aspx + ASPXCodeBehind + + + WeldingWireRecovery.aspx + WeldInspectionCheckRecord.aspx ASPXCodeBehind diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx b/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx index 3b368e1..35121d1 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx @@ -63,7 +63,7 @@ - + <%-- @@ -80,7 +80,7 @@ - + --%> diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx.cs index cc6bdef..3db840a 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx.cs @@ -123,12 +123,12 @@ namespace FineUIPro.Web.JGZL txtTransferringDepart.Text = string.Empty; txtFileName.Text = string.Empty; txtQuantity.Text = string.Empty; - txtTransferringMan.Text = string.Empty; - txtTransferringDate.Text = string.Empty; - txtReviewer.Text = string.Empty; - txtReviewDate.Text = string.Empty; - txtRecipient.Text = string.Empty; - txtReceivingDate.Text = string.Empty; + //txtTransferringMan.Text = string.Empty; + //txtTransferringDate.Text = string.Empty; + //txtReviewer.Text = string.Empty; + //txtReviewDate.Text = string.Empty; + //txtRecipient.Text = string.Empty; + //txtReceivingDate.Text = string.Empty; } private void PageData() @@ -152,12 +152,12 @@ namespace FineUIPro.Web.JGZL this.txtFileName.Text = BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName + "交工技术文件"; } this.txtQuantity.Text = report.Quantity.HasValue ? report.Quantity.ToString() : "1"; - this.txtTransferringMan.Text = report.TransferringMan; - this.txtTransferringDate.Text = report.TransferringDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.TransferringDate) : ""; - this.txtReviewer.Text = report.Reviewer; - this.txtReviewDate.Text = report.ReviewDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.ReviewDate) : ""; - this.txtRecipient.Text = report.Recipient; - this.txtReceivingDate.Text = report.ReceivingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.ReceivingDate) : ""; + //this.txtTransferringMan.Text = report.TransferringMan; + //this.txtTransferringDate.Text = report.TransferringDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.TransferringDate) : ""; + //this.txtReviewer.Text = report.Reviewer; + //this.txtReviewDate.Text = report.ReviewDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.ReviewDate) : ""; + //this.txtRecipient.Text = report.Recipient; + //this.txtReceivingDate.Text = report.ReceivingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.ReceivingDate) : ""; } else { @@ -165,6 +165,14 @@ namespace FineUIPro.Web.JGZL this.txtProjectCode.Text = BLL.Base_ProjectService.GetProjectCode(projectId); this.txtFileName.Text = BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName + "交工技术文件"; this.txtQuantity.Text = "1"; + var user = BLL.Sys_UserService.GetUsersByUserId(this.CurrUser.UserId); + if (user != null) + { + if (!string.IsNullOrEmpty(user.DepartId)) + { + txtTransferringDepart.Text = BLL.Base_DepartService.GetDepart(user.DepartId).DepartName; + } + } } } } @@ -183,12 +191,12 @@ namespace FineUIPro.Web.JGZL newArchivalTransfer.TransferringDepart = this.txtTransferringDepart.Text; newArchivalTransfer.FileName = this.txtFileName.Text; newArchivalTransfer.Quantity = Funs.GetNewInt(this.txtQuantity.Text); - newArchivalTransfer.TransferringMan = this.txtTransferringMan.Text; - newArchivalTransfer.TransferringDate = Funs.GetNewDateTime(this.txtTransferringDate.Text); - newArchivalTransfer.Reviewer = this.txtReviewer.Text; - newArchivalTransfer.ReviewDate = Funs.GetNewDateTime(this.txtReviewDate.Text); - newArchivalTransfer.Recipient = this.txtRecipient.Text; - newArchivalTransfer.ReceivingDate = Funs.GetNewDateTime(this.txtReceivingDate.Text); + //newArchivalTransfer.TransferringMan = this.txtTransferringMan.Text; + //newArchivalTransfer.TransferringDate = Funs.GetNewDateTime(this.txtTransferringDate.Text); + //newArchivalTransfer.Reviewer = this.txtReviewer.Text; + //newArchivalTransfer.ReviewDate = Funs.GetNewDateTime(this.txtReviewDate.Text); + //newArchivalTransfer.Recipient = this.txtRecipient.Text; + //newArchivalTransfer.ReceivingDate = Funs.GetNewDateTime(this.txtReceivingDate.Text); if (!string.IsNullOrEmpty(this.ArchivalTransferId)) { newArchivalTransfer.ArchivalTransferId = this.ArchivalTransferId; @@ -232,12 +240,12 @@ namespace FineUIPro.Web.JGZL keyValuePairs.Add("TransferringDepart", this.txtTransferringDepart.Text); keyValuePairs.Add("FileName", this.txtFileName.Text); keyValuePairs.Add("Quantity", this.txtQuantity.Text); - keyValuePairs.Add("TransferringMan", this.txtTransferringMan.Text); - keyValuePairs.Add("TransferringDate", this.txtTransferringDate.Text); - keyValuePairs.Add("Reviewer", this.txtReviewer.Text); - keyValuePairs.Add("ReviewDate", this.txtReviewDate.Text); - keyValuePairs.Add("Recipient", this.txtRecipient.Text); - keyValuePairs.Add("ReceivingDate", this.txtReceivingDate.Text); + //keyValuePairs.Add("TransferringMan", this.txtTransferringMan.Text); + //keyValuePairs.Add("TransferringDate", this.txtTransferringDate.Text); + //keyValuePairs.Add("Reviewer", this.txtReviewer.Text); + //keyValuePairs.Add("ReviewDate", this.txtReviewDate.Text); + //keyValuePairs.Add("Recipient", this.txtRecipient.Text); + //keyValuePairs.Add("ReceivingDate", this.txtReceivingDate.Text); BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); initTemplatePath = "File\\Fastreport\\JGZL\\档案移交表.frx"; diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx.designer.cs index 522d431..83f1f7e 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx.designer.cs @@ -167,60 +167,6 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.NumberBox txtQuantity; - /// - /// txtTransferringMan 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtTransferringMan; - - /// - /// txtTransferringDate 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DatePicker txtTransferringDate; - - /// - /// txtReviewer 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtReviewer; - - /// - /// txtReviewDate 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DatePicker txtReviewDate; - - /// - /// txtRecipient 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtRecipient; - - /// - /// txtReceivingDate 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DatePicker txtReceivingDate; - /// /// WindowPrint 控件。 /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx b/HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx new file mode 100644 index 0000000..f44decc --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx @@ -0,0 +1,106 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ElectrodeRecovery.aspx.cs" Inherits="FineUIPro.Web.JGZL.ElectrodeRecovery" %> + + + + + + + 焊条发放回收记录 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx.cs new file mode 100644 index 0000000..2860f63 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx.cs @@ -0,0 +1,205 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.IO; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.JGZL +{ + public partial class ElectrodeRecovery : PageBase + { + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + // 绑定表格 + this.drpProjectId.DataTextField = "ProjectCode"; + this.drpProjectId.DataValueField = "ProjectId"; + this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectList("1"); + this.drpProjectId.DataBind(); + Funs.FineUIPleaseSelect(this.drpProjectId); + if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId; + } + this.BindGrid(); + } + else if (GetRequestEventArgument() == "reloadGrid") + { + this.BindGrid(); + } + } + #endregion + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"SELECT m.UsingMatId, m.ProjectId,case when project.ProjectCode is not null then project.ProjectCode else usingPlan.ProjectId end as ProjectCode, m.UsePosition, m.WeldId, m.UsingPlanId, + m.Amount,m.TwoAmount, m.UsingMan, m.UsingDate,m.StoreMan,m.Warrantybook,m.Number,m.StockInId,Weld.WeldName,StockIn.HeartNo,StockIn.Warrantybook,Weld.WeldSpec,Welder.WED_Code, + usingPlan.STE_Name,CONVERT(FLOAT,(ISNULL(m.Amount,0)+ISNULL(m.TwoAmount,0))) as TotalAmount,CONVERT(FLOAT,ISNULL(r.RecycleAmount,0)) as RecycleAmount,storeman.StoreName + FROM dbo.Weld_UsingMat m + LEFT JOIN Base_Project AS project ON project.ProjectId = m.ProjectId + LEFT JOIN dbo.Weld_UsingPlan usingPlan ON usingPlan.UsingPlanId = m.UsingPlanId + LEFT JOIN dbo.Weld_WeldInfo AS Weld ON Weld.WeldId=UsingPlan.WeldId + LEFT JOIN dbo.Weld_StockIn AS StockIn ON StockIn.StockInId=m.StockInId + LEFT JOIN dbo.HJGL_BS_Welder AS Welder ON Welder.WED_ID = UsingPlan.UsingManOne + LEFT JOIN dbo.Weld_RecycleMat AS r ON r.UsingMatId = m.UsingMatId + LEFT JOIN dbo.Weld_Storeman storeman ON storeman.StoremanId = m.StoreMan + LEFT JOIN dbo.Weld_WeldType weldType ON weldType.WeldTypeId = Weld.WeldTypeId + WHERE m.IsWelderConfirm=1 and m.IsStoreManConfirm=1 and weldType.WeldTypeName like '%焊条%'"; + List listStr = new List(); + if (this.drpProjectId.SelectedValue != BLL.Const._Null) + { + strSql += " AND m.ProjectId = @projectId"; + listStr.Add(new SqlParameter("@projectId", this.drpProjectId.SelectedValue)); + } + + if (!string.IsNullOrEmpty(this.txtStartTime.Text)) + { + strSql += " AND m.UsingDate >= @StartDate"; + listStr.Add(new SqlParameter("@StartDate", Funs.GetNewDateTime(this.txtStartTime.Text.Trim()))); + } + + if (!string.IsNullOrEmpty(this.txtEndTime.Text)) + { + strSql += " AND m.UsingDate <= @EndDate"; + listStr.Add(new SqlParameter("@EndDate", Funs.GetNewDateTime(this.txtEndTime.Text.Trim()))); + } + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + // 2.获取当前分页数据 + //var table = this.GetPagedDataTable(Grid1, tb1); + Grid1.RecordCount = tb.Rows.Count; + tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 分页 排序 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + this.BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + this.BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 打印 + /// + /// 打印 + /// + /// + /// + protected void btnPrint_Click(object sender, EventArgs e) + { + Dictionary keyValuePairs = new Dictionary(); + if (this.drpProjectId.SelectedValue != BLL.Const._Null) + { + var project = BLL.Base_ProjectService.GetProjectByProjectId(this.drpProjectId.SelectedValue); + if (project != null) + { + keyValuePairs.Add("ProjectName", project.ProjectName); + } + } + + String strSql = @"SELECT * FROM View_Report_UsingMat WHERE 1=1 "; + List listStr = new List + { + + }; + + if (this.drpProjectId.SelectedValue != BLL.Const._Null) + { + strSql += " AND ProjectId = @projectId"; + listStr.Add(new SqlParameter("@projectId", this.drpProjectId.SelectedValue)); + } + if (!string.IsNullOrEmpty(this.txtStartTime.Text)) + { + strSql += " AND UsingDate >= @StartDate"; + listStr.Add(new SqlParameter("@StartDate", Funs.GetNewDateTime(this.txtStartTime.Text.Trim()))); + } + if (!string.IsNullOrEmpty(this.txtEndTime.Text)) + { + strSql += " AND UsingDate <= @EndDate"; + listStr.Add(new SqlParameter("@EndDate", Funs.GetNewDateTime(this.txtEndTime.Text.Trim()))); + } + strSql += " order by UsingDateMonth,UsingDateDay "; + SqlParameter[] parameter1 = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter1); + + BLL.Common.FastReportService.ResetData(); + BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); + + tb.TableName = "View_Report_UsingMat"; + BLL.Common.FastReportService.AddFastreportTable(tb); + + string initTemplatePath = ""; + string rootPath = Server.MapPath("~/"); + + initTemplatePath = "File\\Fastreport\\JGZL\\焊条发放回收记录.frx"; + + if (File.Exists(rootPath + initTemplatePath)) + { + PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); + + } + } + #endregion + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx.designer.cs new file mode 100644 index 0000000..34e9664 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx.designer.cs @@ -0,0 +1,134 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JGZL +{ + + + public partial class ElectrodeRecovery + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// drpProjectId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProjectId; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// btnPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnPrint; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// WindowPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowPrint; + } +} diff --git a/HJGL_DS/FineUIPro.Web/JGZL/MaterialQualityCertificateDoc.aspx b/HJGL_DS/FineUIPro.Web/JGZL/MaterialQualityCertificateDoc.aspx index b5aca16..ea723da 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/MaterialQualityCertificateDoc.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/MaterialQualityCertificateDoc.aspx @@ -40,6 +40,7 @@ + @@ -49,52 +50,84 @@ + EnableTextSelection="True" AutoScroll="true" OnPreDataBound="Grid1_PreDataBound"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - - @@ -113,30 +146,10 @@ - - - - - - - - diff --git a/HJGL_DS/FineUIPro.Web/JGZL/MaterialQualityCertificateDoc.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/MaterialQualityCertificateDoc.aspx.cs index 5583563..1aad690 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/MaterialQualityCertificateDoc.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/MaterialQualityCertificateDoc.aspx.cs @@ -1,18 +1,52 @@ using BLL; +using Model; +using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; -using System.Data.SqlClient; using System.Data; +using System.Data.SqlClient; +using System.IO; using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -using System.IO; namespace FineUIPro.Web.JGZL { public partial class MaterialQualityCertificateDoc : PageBase { + #region 定义项 + /// + /// 主键 + /// + private string MaterialId + { + get + { + return (string)ViewState["MaterialId"]; + } + set + { + ViewState["MaterialId"] = value; + } + } + + /// + /// 项目Id + /// + private string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + #endregion + #region 加载页面 /// /// 加载页面 @@ -35,6 +69,7 @@ namespace FineUIPro.Web.JGZL this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId; this.InitTreeMenu();//加载树 this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; + this.ProjectId = this.tvControlItem.SelectedNodeID; this.BindGrid(); } } @@ -83,6 +118,7 @@ namespace FineUIPro.Web.JGZL { if (this.tvControlItem.SelectedNodeID != "0") { + this.ProjectId = this.tvControlItem.SelectedNodeID; this.BindGrid(); } } @@ -94,19 +130,9 @@ namespace FineUIPro.Web.JGZL /// private void BindGrid() { - //string projectIds = BLL.Base_ProjectService.GetStrOnProjectIds(this.CurrUser.UserId, "1"); - string strSql = @"SELECT * from JGZL_MaterialQualityCertificateDoc where 1=1"; + string strSql = @"SELECT * from JGZL_MaterialQualityCertificateDoc where ProjectId = @ProjectId order by CompileDate asc"; List listStr = new List(); - if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) - { - strSql += " AND ProjectId = @ProjectId"; - listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID)); - } - //else - //{ - // strSql += " AND CHARINDEX(ProjectId,@ProjectId)>0 "; - // listStr.Add(new SqlParameter("@ProjectId", projectIds)); - //} + listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID)); SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); // 2.获取当前分页数据 @@ -165,7 +191,9 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.ProjectId = this.drpProjectId.SelectedValue; this.InitTreeMenu(); + this.tvControlItem.SelectedNodeID = this.ProjectId; this.BindGrid(); } @@ -196,7 +224,7 @@ namespace FineUIPro.Web.JGZL string rootPath = Server.MapPath("~/"); BLL.Common.FastReportService.ResetData(); - string strSql = @"SELECT * from JGZL_MaterialQualityCertificateDoc where ProjectId = @ProjectId order by MaterialCode desc"; + string strSql = @"SELECT * from JGZL_MaterialQualityCertificateDoc where ProjectId = @ProjectId order by CompileDate asc"; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", projectId)); SqlParameter[] parameter = listStr.ToArray(); @@ -267,7 +295,36 @@ namespace FineUIPro.Web.JGZL { if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MaterialQualityCertificateDocEdit.aspx?projectId={0}", this.tvControlItem.SelectedNodeID, "新增 - "))); + JArray teamGroupData = Grid1.GetMergedData(); + List list = new List(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + list.Add(values); + } + JObject defaultObj = new JObject + { + { "MaterialId", Guid.NewGuid() }, + { "MaterialName", ""}, + { "MaterialCode", "" }, + { "SerialCode", "" }, + { "Material", "" }, + { "Specification", "" }, + { "Manufacturer", "" }, + { "Unit", "" }, + { "TotalNum", "" }, + { "ReInspectionReportCode", "" }, + { "ReceivingUnit", "" }, + { "DrawNum", "" }, + { + "Delete3", + String.Format("", + GetDeleteScriptGrid1(), IconHelper.GetResolvedIconUrl(Icon.Delete)) + } + }; + list.Add(defaultObj); + Grid1.DataSource = list; + Grid1.DataBind(); } else { @@ -276,139 +333,83 @@ namespace FineUIPro.Web.JGZL } } - /// - /// 双击编辑 - /// - /// - /// - protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + protected void Grid1_PreDataBound(object sender, EventArgs e) { - if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_MaterialQualityCertificateDocMenuId, BLL.Const.BtnModify)) - { - if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) - { - if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) - { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MaterialQualityCertificateDocEdit.aspx?materialId={0}", this.Grid1.SelectedRowID, "编辑 - "))); - } - else - { - Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); - return; - } - } - else - { - Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); - return; - } - } - else - { - ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); - } + // 设置LinkButtonField的点击客户端事件 + LinkButtonField deleteField = Grid1.FindColumn("Delete3") as LinkButtonField; + deleteField.OnClientClick = GetDeleteScriptGrid1(); } /// - /// 右键编辑 - /// - /// - /// - protected void btnMenuEdit_Click(object sender, EventArgs e) - { - if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_MaterialQualityCertificateDocMenuId, BLL.Const.BtnModify)) - { - if (Grid1.SelectedRowIndexArray.Length == 0) - { - Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); - return; - } - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MaterialQualityCertificateDocEdit.aspx?materialId={0}", Grid1.SelectedRowID, "维护 - "))); - } - else - { - Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); - } - } - - /// - /// 右键删除 - /// - /// - /// - protected void btnMenuDelete_Click(object sender, EventArgs e) - { - if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.JGZL_MaterialQualityCertificateDocMenuId, Const.BtnDelete)) - { - if (Grid1.SelectedRowIndexArray.Length == 0) - { - Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); - return; - } - - bool isShow = true; - if (Grid1.SelectedRowIndexArray.Length > 1) - { - isShow = false; - } - bool isDelete = false; - foreach (int rowIndex in Grid1.SelectedRowIndexArray) - { - string rowID = Grid1.DataKeys[rowIndex][0].ToString(); - if (judgementDelete(rowID, isShow)) - { - isDelete = true; - BLL.MaterialQualityCertificateDocService.DeleteMaterialQualityCertificateDocById(rowID); - BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除材料质量证明文件一览表"); - } - } - if (isDelete) - { - ShowNotify("删除成功！", MessageBoxIcon.Success); - } - this.BindGrid(); - } - else - { - Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); - } - } - - #region 判断是否可删除 - /// - /// 判断是否可以删除 + /// 删除提示 /// /// - private bool judgementDelete(string id, bool isShow) + private string GetDeleteScriptGrid1() { - string content = string.Empty; - - if (string.IsNullOrEmpty(content)) - { - return true; - } - else - { - if (isShow) - { - Alert.ShowInTop(content, MessageBoxIcon.Error); - } - return false; - } + return Confirm.GetShowReference("删除选中行？", String.Empty, MessageBoxIcon.Question, + Grid1.GetDeleteSelectedRowsReference(), String.Empty); } - #endregion - #endregion + #endregion - #region 关闭弹出窗口及刷新页面 + #region 保存 /// - /// 关闭弹出窗口 + /// 保存按钮 /// /// /// - protected void Window1_Close(object sender, WindowCloseEventArgs e) + protected void btnSave_Click(object sender, EventArgs e) { - this.InitTreeMenu();//加载树 - this.BindGrid(); + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, + Const.JGZL_MaterialQualityCertificateDocMenuId, Const.BtnSave)) + { + BLL.MaterialQualityCertificateDocService.DeleteListByProjectId(this.ProjectId); + List lists = new List(); + JArray teamGroupData = Grid1.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.JGZL_MaterialQualityCertificateDoc newDetail = new Model.JGZL_MaterialQualityCertificateDoc + { + MaterialId = values.Value("MaterialId"), + ProjectId = this.ProjectId, + MaterialName = values.Value("MaterialName"), + MaterialCode = values.Value("MaterialCode"), + SerialCode = values.Value("SerialCode"), + Material = values.Value("Material"), + Specification = values.Value("Specification"), + Manufacturer = values.Value("Manufacturer"), + Unit = values.Value("Unit"), + TotalNum = Funs.GetNewInt(values.Value("TotalNum")), + ReInspectionReportCode = values.Value("ReInspectionReportCode"), + ReceivingUnit = values.Value("ReceivingUnit"), + DrawNum = Funs.GetNewInt(values.Value("DrawNum")), + CompileMan = this.CurrUser.UserId, + CompileDate = DateTime.Now, + Reviewer = this.CurrUser.UserId, + RevieweDate = DateTime.Now + }; + lists.Add(newDetail); + } + try + { + if (lists.Count > 0) + { + Funs.DB.JGZL_MaterialQualityCertificateDoc.InsertAllOnSubmit(lists); + ShowNotify("保存成功！", MessageBoxIcon.Success); + } + Funs.DB.SubmitChanges(); + } + catch (Exception) + { + return; + } + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + return; + } } #endregion } diff --git a/HJGL_DS/FineUIPro.Web/JGZL/MaterialQualityCertificateDoc.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/MaterialQualityCertificateDoc.aspx.designer.cs index bda3843..674daf6 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/MaterialQualityCertificateDoc.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/MaterialQualityCertificateDoc.aspx.designer.cs @@ -113,6 +113,15 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.Button btnAdd; + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + /// /// btnPrint 控件。 /// @@ -131,6 +140,105 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.Grid Grid1; + /// + /// txtMaterialName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMaterialName; + + /// + /// txtMaterialCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMaterialCode; + + /// + /// txtSerialCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSerialCode; + + /// + /// txtMaterial 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMaterial; + + /// + /// txtSpecification 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSpecification; + + /// + /// txtManufacturer 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtManufacturer; + + /// + /// txtUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtUnit; + + /// + /// txtTotalNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTotalNum; + + /// + /// txtReInspectionReportCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtReInspectionReportCode; + + /// + /// txtReceivingUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtReceivingUnit; + + /// + /// txtDrawNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtDrawNum; + /// /// ToolbarSeparator1 控件。 /// @@ -158,15 +266,6 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.DropDownList ddlPageSize; - /// - /// Window1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Window Window1; - /// /// WindowPrint 控件。 /// @@ -175,32 +274,5 @@ namespace FineUIPro.Web.JGZL /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window WindowPrint; - - /// - /// Menu1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Menu Menu1; - - /// - /// btnMenuEdit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.MenuButton btnMenuEdit; - - /// - /// btnMenuDelete 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.MenuButton btnMenuDelete; } } diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx b/HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx index 518e266..31ec204 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx @@ -50,7 +50,7 @@ @@ -180,12 +180,12 @@ Height="600px"> - + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx.cs index 003d84b..18376d4 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx.cs @@ -1,15 +1,12 @@ using BLL; using Model; using Newtonsoft.Json.Linq; -using NPOI.SS.UserModel; using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.IO; using System.Linq; -using System.Web; -using System.Web.UI; using System.Web.UI.WebControls; namespace FineUIPro.Web.JGZL @@ -46,6 +43,11 @@ namespace FineUIPro.Web.JGZL ViewState["ProjectId"] = value; } } + + /// + /// 定义集合 + /// + private static List list = new List(); #endregion #region 加载页面 @@ -130,7 +132,7 @@ namespace FineUIPro.Web.JGZL /// private void BindGrid() { - string strSql = @"SELECT * from JGZL_PipeFittingInspectionRecord where ProjectId=@projectId"; + string strSql = @"SELECT * from JGZL_PipeFittingInspectionRecord where ProjectId=@projectId order by CompileDate "; List listStr = new List(); listStr.Add(new SqlParameter("@projectId", this.ProjectId)); SqlParameter[] parameter = listStr.ToArray(); @@ -139,7 +141,7 @@ namespace FineUIPro.Web.JGZL Grid1.RecordCount = tb.Rows.Count; var table = this.GetPagedDataTable(Grid1, tb); Grid1.DataSource = table; - Grid1.DataBind(); + Grid1.DataBind(); } #endregion @@ -301,30 +303,29 @@ namespace FineUIPro.Web.JGZL JObject values = teamGroupRow.Value("values"); list.Add(values); } - JObject defaultObj = new JObject - { - { "RecordId", Guid.NewGuid() }, - { "Name", ""}, - { "ContractNo", "" }, - { "ArrivalUnit", "" }, - { "ArrivalNum", "" }, - { "MaterialCertificateNumber", "" }, - { "Material", "" }, - { "Specifications", "" }, - { "InspectionNum", "" }, - { "ODVariation", "" }, - { "IDVariation", "" }, - { "WallVariation", "" }, - { "OtherVariation", "" }, - { "AppearanceQuality", "" }, - { "Result", "" }, { - "Delete3", - String.Format("", - GetDeleteScriptGrid1(), IconHelper.GetResolvedIconUrl(Icon.Delete)) - } - }; + { "RecordId", Guid.NewGuid() }, + { "Name", ""}, + { "ContractNo", "" }, + { "ArrivalUnit", "" }, + { "ArrivalNum", "" }, + { "MaterialCertificateNumber", "" }, + { "Material", "" }, + { "Specifications", "" }, + { "InspectionNum", "" }, + { "ODVariation", "" }, + { "IDVariation", "" }, + { "WallVariation", "" }, + { "OtherVariation", "" }, + { "AppearanceQuality", "" }, + { "Result", "" }, + { + "Delete3", + String.Format("", + GetDeleteScriptGrid1(), IconHelper.GetResolvedIconUrl(Icon.Delete)) + } + }; list.Add(defaultObj); Grid1.DataSource = list; Grid1.DataBind(); @@ -399,6 +400,8 @@ namespace FineUIPro.Web.JGZL { Funs.DB.JGZL_PipeFittingInspectionRecord.InsertAllOnSubmit(lists); ShowNotify("保存成功！", MessageBoxIcon.Success); + this.Grid1.DataSource = lists; + this.Grid1.DataBind(); } Funs.DB.SubmitChanges(); } @@ -415,6 +418,12 @@ namespace FineUIPro.Web.JGZL } #endregion + #region 复制 + /// + /// 复制 + /// + /// + /// protected void btnCopy_Click(object sender, EventArgs e) { if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) @@ -426,30 +435,55 @@ namespace FineUIPro.Web.JGZL JObject values = teamGroupRow.Value("values"); list.Add(values); } + // 1. 获取选中行索引并校验 int index = Grid1.SelectedRowIndex; - JObject defaultObj = new JObject - { - { "RecordId", Guid.NewGuid() }, - { "Name", Grid1.Rows[index].Values[1].ToString()}, - { "ContractNo", Grid1.Rows[index].Values[2].ToString()}, - { "ArrivalUnit", Grid1.Rows[index].Values[4].ToString() }, - { "ArrivalNum", Grid1.Rows[index].Values[5].ToString() }, - { "MaterialCertificateNumber", Grid1.Rows[index].Values[6].ToString() }, - { "Material", Grid1.Rows[index].Values[7].ToString() }, - { "Specifications", Grid1.Rows[index].Values[8].ToString() }, - { "InspectionNum", Grid1.Rows[index].Values[9].ToString()}, - { "ODVariation", Grid1.Rows[index].Values[11].ToString() }, - { "IDVariation", Grid1.Rows[index].Values[12].ToString() }, - { "WallVariation", Grid1.Rows[index].Values[13].ToString() }, - { "OtherVariation", Grid1.Rows[index].Values[14].ToString() }, - { "AppearanceQuality", Grid1.Rows[index].Values[15].ToString() }, - { "Result", Grid1.Rows[index].Values[16].ToString()}, + if (index < 0 || index >= Grid1.Rows.Count) { - "Delete3", - String.Format("", - GetDeleteScriptGrid1(), IconHelper.GetResolvedIconUrl(Icon.Delete)) + Alert.ShowInTop("请选中要复制的数据行！", MessageBoxIcon.Warning); + return; } - }; + string name = Grid1.Rows[index].Values[1].ToString() ?? ""; + string contractNo = Grid1.Rows[index].Values[2].ToString() ?? ""; + string arrivalUnit = Grid1.Rows[index].Values[4].ToString() ?? ""; + string arrivalNum = Grid1.Rows[index].Values[5].ToString() ?? ""; + string materialCertificateNumber = Grid1.Rows[index].Values[6].ToString() ?? ""; + string material = Grid1.Rows[index].Values[7].ToString() ?? ""; + string specifications = Grid1.Rows[index].Values[8].ToString() ?? ""; + string inspectionNum = Grid1.Rows[index].Values[9].ToString() ?? ""; + string oDVariation = Grid1.Rows[index].Values[11].ToString() ?? ""; + string iDVariation = Grid1.Rows[index].Values[12].ToString() ?? ""; + string wallVariation = Grid1.Rows[index].Values[13].ToString() ?? ""; + string otherVariation = Grid1.Rows[index].Values[14].ToString() ?? ""; + string appearanceQuality = Grid1.Rows[index].Values[15].ToString() ?? ""; + string result = Grid1.Rows[index].Values[16].ToString() ?? ""; + if (string.IsNullOrEmpty(name) && string.IsNullOrEmpty(contractNo) && string.IsNullOrEmpty(arrivalUnit) && string.IsNullOrEmpty(arrivalNum) && string.IsNullOrEmpty(materialCertificateNumber) && string.IsNullOrEmpty(material) && string.IsNullOrEmpty(specifications) && string.IsNullOrEmpty(inspectionNum) && string.IsNullOrEmpty(oDVariation) && string.IsNullOrEmpty(iDVariation) && string.IsNullOrEmpty(wallVariation) && string.IsNullOrEmpty(otherVariation) && string.IsNullOrEmpty(appearanceQuality) && string.IsNullOrEmpty(result)) + { + Alert.ShowInTop("请先保存数据！", MessageBoxIcon.Warning); + return; + } + JObject defaultObj = new JObject + { + { "RecordId", Guid.NewGuid() }, + { "Name",name}, + { "ContractNo",contractNo}, + { "ArrivalUnit",arrivalUnit }, + { "ArrivalNum",arrivalNum }, + { "MaterialCertificateNumber", materialCertificateNumber}, + { "Material",material }, + { "Specifications", specifications }, + { "InspectionNum",inspectionNum }, + { "ODVariation",oDVariation}, + { "IDVariation",iDVariation }, + { "WallVariation",wallVariation }, + { "OtherVariation", otherVariation}, + { "AppearanceQuality", appearanceQuality }, + { "Result",result }, + { + "Delete3", + String.Format("", + GetDeleteScriptGrid1(), IconHelper.GetResolvedIconUrl(Icon.Delete)) + } + }; list.Add(defaultObj); Grid1.DataSource = list; Grid1.DataBind(); @@ -460,8 +494,6 @@ namespace FineUIPro.Web.JGZL return; } } - - - + #endregion } } \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/JGZL/SteelPipeCheckRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/SteelPipeCheckRecord.aspx.cs index 3694115..2de6b97 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/SteelPipeCheckRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/SteelPipeCheckRecord.aspx.cs @@ -445,11 +445,17 @@ namespace FineUIPro.Web.JGZL i++; } BLL.Common.FastReportService.AddFastreportTable(dt2); + + initTemplatePath = "File\\Fastreport\\JGZL\\钢管检查验收记录.frx"; + if (File.Exists(rootPath + initTemplatePath)) + { + PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); + } } - initTemplatePath = "File\\Fastreport\\JGZL\\钢管检查验收记录.frx"; - if (File.Exists(rootPath + initTemplatePath)) + else { - PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); + Alert.ShowInTop("请先保存数据！", MessageBoxIcon.Warning); + return; } } else diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx b/HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx new file mode 100644 index 0000000..816f708 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx @@ -0,0 +1,105 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldingWireRecovery.aspx.cs" Inherits="FineUIPro.Web.JGZL.WeldingWireRecovery" %> + + + + + + + 焊丝发放记录 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx.cs new file mode 100644 index 0000000..18ce311 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx.cs @@ -0,0 +1,203 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.IO; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.JGZL +{ + public partial class WeldingWireRecovery : PageBase + { + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + // 绑定表格 + this.drpProjectId.DataTextField = "ProjectCode"; + this.drpProjectId.DataValueField = "ProjectId"; + this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectList("1"); + this.drpProjectId.DataBind(); + Funs.FineUIPleaseSelect(this.drpProjectId); + this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId; + this.BindGrid(); + } + else if (GetRequestEventArgument() == "reloadGrid") + { + this.BindGrid(); + } + } + #endregion + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"SELECT m.UsingMatId, m.ProjectId,case when project.ProjectCode is not null then project.ProjectCode else usingPlan.ProjectId end as ProjectCode, m.UsePosition, m.WeldId, m.UsingPlanId, + m.Amount,m.TwoAmount, m.UsingMan, m.UsingDate,m.StoreMan,m.Warrantybook,m.Number,m.StockInId,Weld.WeldName,StockIn.HeartNo,StockIn.Warrantybook,Weld.WeldSpec,Welder.WED_Code, + usingPlan.STE_Name,CONVERT(FLOAT,(ISNULL(m.Amount,0)+ISNULL(m.TwoAmount,0))) as TotalAmount,CONVERT(FLOAT,ISNULL(r.RecycleAmount,0)) as RecycleAmount,storeman.StoreName, + CONVERT(FLOAT,(ISNULL(m.Amount,0)+ISNULL(m.TwoAmount,0))*Weld.ConvertValue) as Weights + FROM dbo.Weld_UsingMat m + LEFT JOIN Base_Project AS project ON project.ProjectId = m.ProjectId + LEFT JOIN dbo.Weld_UsingPlan usingPlan ON usingPlan.UsingPlanId = m.UsingPlanId + LEFT JOIN dbo.Weld_WeldInfo AS Weld ON Weld.WeldId=UsingPlan.WeldId + LEFT JOIN dbo.Weld_StockIn AS StockIn ON StockIn.StockInId=m.StockInId + LEFT JOIN dbo.HJGL_BS_Welder AS Welder ON Welder.WED_ID = UsingPlan.UsingManOne + LEFT JOIN dbo.Weld_RecycleMat AS r ON r.UsingMatId = m.UsingMatId + LEFT JOIN dbo.Weld_Storeman storeman ON storeman.StoremanId = m.StoreMan + LEFT JOIN dbo.Weld_WeldType weldType ON weldType.WeldTypeId = Weld.WeldTypeId + WHERE m.IsWelderConfirm=1 and m.IsStoreManConfirm=1 and weldType.WeldTypeName like '%焊丝%'"; + List listStr = new List(); + if (this.drpProjectId.SelectedValue != BLL.Const._Null) + { + strSql += " AND m.ProjectId = @projectId"; + listStr.Add(new SqlParameter("@projectId", this.drpProjectId.SelectedValue)); + } + + if (!string.IsNullOrEmpty(this.txtStartTime.Text)) + { + strSql += " AND m.UsingDate >= @StartDate"; + listStr.Add(new SqlParameter("@StartDate", Funs.GetNewDateTime(this.txtStartTime.Text.Trim()))); + } + + if (!string.IsNullOrEmpty(this.txtEndTime.Text)) + { + strSql += " AND m.UsingDate <= @EndDate"; + listStr.Add(new SqlParameter("@EndDate", Funs.GetNewDateTime(this.txtEndTime.Text.Trim()))); + } + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + // 2.获取当前分页数据 + //var table = this.GetPagedDataTable(Grid1, tb1); + Grid1.RecordCount = tb.Rows.Count; + tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 分页 排序 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + this.BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + this.BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 打印 + /// + /// 打印 + /// + /// + /// + protected void btnPrint_Click(object sender, EventArgs e) + { + Dictionary keyValuePairs = new Dictionary(); + if (this.drpProjectId.SelectedValue != BLL.Const._Null) + { + var project = BLL.Base_ProjectService.GetProjectByProjectId(this.drpProjectId.SelectedValue); + if (project != null) + { + keyValuePairs.Add("ProjectName", project.ProjectName); + } + } + + String strSql = @"SELECT * FROM View_Report_Weld_UsingMat where 1=1 "; + List listStr = new List + { + + }; + + if (this.drpProjectId.SelectedValue != BLL.Const._Null) + { + strSql += " AND ProjectId = @projectId"; + listStr.Add(new SqlParameter("@projectId", this.drpProjectId.SelectedValue)); + } + if (!string.IsNullOrEmpty(this.txtStartTime.Text)) + { + strSql += " AND UsingDate >= @StartDate"; + listStr.Add(new SqlParameter("@StartDate", Funs.GetNewDateTime(this.txtStartTime.Text.Trim()))); + } + if (!string.IsNullOrEmpty(this.txtEndTime.Text)) + { + strSql += " AND UsingDate <= @EndDate"; + listStr.Add(new SqlParameter("@EndDate", Funs.GetNewDateTime(this.txtEndTime.Text.Trim()))); + } + strSql += " order by UsingDateMonth,UsingDateDay "; + SqlParameter[] parameter1 = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter1); + + BLL.Common.FastReportService.ResetData(); + BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); + + tb.TableName = "View_Report_Weld_UsingMat"; + BLL.Common.FastReportService.AddFastreportTable(tb); + + string initTemplatePath = ""; + string rootPath = Server.MapPath("~/"); + + initTemplatePath = "File\\Fastreport\\JGZL\\焊丝发放记录.frx"; + + if (File.Exists(rootPath + initTemplatePath)) + { + PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); + + } + } + #endregion + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx.designer.cs new file mode 100644 index 0000000..d0d01bb --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx.designer.cs @@ -0,0 +1,134 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JGZL +{ + + + public partial class WeldingWireRecovery + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// drpProjectId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProjectId; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// btnPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnPrint; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// WindowPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowPrint; + } +}