From e9196b94ce9a9d97ce590b05f97cb45cbcef00dd Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Fri, 30 Dec 2022 15:36:30 +0800 Subject: [PATCH] =?UTF-8?q?2022-12-30=20=E7=84=8A=E6=8E=A5=E6=97=A5?= =?UTF-8?q?=E6=8A=A5=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/SGGL_SeDin/v17/.wsuo | Bin 26112 -> 27136 bytes .../BLL/HJGL/WeldingManage/PipelineService.cs | 2 +- .../DataImport/MaterialInformation.aspx.cs | 10 +-- .../HJGL/InfoQuery/JointQuery.aspx.cs | 14 ++-- .../HJGL/InfoQuery/PipelineQuery.aspx.cs | 4 +- .../HJGL/PreDesign/PipelingDivide.aspx.cs | 4 +- .../HJGL/PreDesign/PrePipeline.aspx.cs | 6 +- .../HJGL/WeldingManage/JotTwoDesign.aspx.cs | 15 ++-- .../HJGL/WeldingManage/PipelineMatIn.aspx.cs | 2 +- .../WeldingManage/SelectTaskWeldJoint.aspx.cs | 8 +-- .../HJGL/WeldingManage/WeldJointList.aspx.cs | 9 +-- .../HJGL/WeldingManage/WeldMatMatch.aspx.cs | 8 +-- .../HJGL/WeldingManage/WeldReportEdit.aspx | 5 +- .../HJGL/WeldingManage/WeldReportEdit.aspx.cs | 12 +++- .../WeldReportEdit.aspx.designer.cs | 67 ++++++++++-------- .../HJGL/WeldingManage/WeldingConDate.aspx.cs | 12 ++-- .../HJGL/WeldingManage/WeldingPlan.aspx.cs | 4 +- 17 files changed, 108 insertions(+), 74 deletions(-) diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 1e4add156610204b60ffb5af4db0cca6ac063c65..98c9e3cf5fa8753627d8db7a2a3204af2ea1854e 100644 GIT binary patch delta 2401 zcmcIlO;B4^6n^(5!2mB52qCGY{9`HPHGdD1jAMC)h(Le@l3EI=Brl*F$4(^<>VmlI z=*H%-abXwHg`1AFna*@)MylgDj*K&I+&S*L(;2dWMe8{)?`2-G9m|Z~nUj0&x#xcO z{CxK%{}apq%64aY_5$?qT}}Bv9$am6|Hhg*jw`$21AZFzOnx>D6+US-qwx_ASa9{j zrYX;^LB-S+sn^U6+WZ{OZj?ThCe8K`j|r%EX={Rccw@o-_Vb$Ils3Dxxe@11O(*Am z)O%3|4K}i$!?nj?6Hz~p;zbD>?Br{Qw7KKKby9GS}A&PUoQpK^a-U1(0wPWMN6#~4POcr6$up*b{i7l zY7|%$S{ggV7@BBnPMb+jpuS*Or%=Cy@+zKinpaVStBom(ih5%qR1l(q35^yMJgw4) zU4fi1uX1Y|Dw;N1%Gtc^|Bj|PDiFDJW>(4Ub;GC4K{cM2q0&5WW7HL$lvSUWIPD9k zaf7H#2G@LuyB0o2eZT z9LM0ab{yLOTfV9vE4)e_#VCJAW;}!jSe8T)2>eomo#Y&LBT7!|f?&$vO3a zmE=^J6_(}4Jif?}v*IOITxM|7cU(Mtc8%yB%DPsbXHWw}xOAI@?a&d+UdK2GE${FS(M zRm*Szw2NE>y(BJ-n!=@V&Y~rPdlEN-o(dx1mjl?G9pt%PimhLfLW<%K1jLcRNJNxI zeE~7!%Vx!JC@gJAX~pM{jDnab!>!ltFt%!e?=BqGCzkf3`mW8ynbT=Dg z@a`1{INYDZsqC95FTzd5179yq!jH9#~5cWR*;3m%yaDJSakRJ?$#0EPFi3wD3elYpBLmY6xNF;VrBGH5fKcMX) z?xB|!wcw9S)v7|!-im-&Ri#Q5u1KY-s>G#I)l*fqNWE~24~f*KGcWH&PpGK0hmN$~ z-PxJhnQvzHIrD?ad@t?~Ny36Usb=eSbAIN0`A=fIiKrTHNd0(J77$((q%pghcPak8lU$s(RwS5Ei`I0KAY0XuJOugzA@@LRHyBW zwRx{Lv;2N-?W5Ui;5Xnwk<;QJ&V$jQ$Vx-Ptj2Wiy@$__Nq0btDdG?k8L(((nOk;= zHXI|9E-ph@oPE60Bi2uJH1vpfkQPT=L4%Rdi6dr|o{hMkc#PbON9-hNHR7UAUe5LmGF)a5_rs6NddbtxwW8MH&^jSR4}z_`3K=R_>JWJmL_1qDP=g4CfTbLGge1SJI1R$uIh#9Eiv=dC3{t^fZjZfyXkJ zqMj&r&ss?g8LNi|940p{s|_kvuD2n)-ZtP6dg8q(&ZV^k3u=YOls*0 zs#I>$T?QG^n=4clOPnEA`?nc_;&>O%b4zHDw&pUPkjPdo%O1`CrXMR+QPsNMu^Z92 zqq3DGZ3b^_?AkjL)@u44Y6oy_>Sjb!P6>_(^i%|_Rm3Okoe{gug(sHcQsrTAfYGzGxj7QI^#@AR|oAV9{saLrncDWV{w! zt)g6&`SBb~s5G7h1uFq6jV8Y+hSIz!T2P?heNbA|wA#25EGDc422_k08T~>LQ#Hm& zgZhj8+-W#Px@0G=x1?;{ng#dTKUIshmqcS&-9M<_Rc5dzB2YROMHGd`$8sqh@I$3L zV(p=g9jk}m6bGR+j@kKT(+`E8bQXmbN>fDUr;QJoIBQn!0Mh*LU1sPMYN3rT!%7VS z%}=cU(NHU-2}r%PQI*j%7R9xA>z#a9`0kPfr`+RjZ}A`YAD;0|O(kc1tu3u>zA1mpj4##FDYQVviYZIc0*giFO^!kq4Rh-z;XOk}6 z^3@VlF~r8b^p!8g&2cXYY>437(cqo@u!OuXgnQ?IM0IjEVY?gKQb+J{@-$H74#?QhNm+dkKq<2HWQ!2UTH^m;w0s{5t)hp7sVuly9p;k@lvwm lQ(ua25^GpL+hry!=!%yKgfPCVZ_oYVH4CGMx$5Mv(q9;Pk|qEE diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs index 6ee295b8..9074166b 100644 --- a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs @@ -170,7 +170,7 @@ namespace BLL public static List GetView_HJGL_Pipelines(HJGL_Pipeline model) { var db = Funs.DB; - var pipelineList =( from x in hJGL_Pipelines + var pipelineList =( from x in Funs.DB.HJGL_Pipeline where (string.IsNullOrEmpty(model.ProjectId) || x.ProjectId.Contains(model.ProjectId)) && (string.IsNullOrEmpty(model.UnitWorkId) || x.UnitWorkId.Contains(model.UnitWorkId)) diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs index 56fdfc57..cbe9122f 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs @@ -1,4 +1,5 @@ using BLL; +using FastReport.Design; using FineUIPro.Web.HJGL.WeldingManage; using System; using System.Collections.Generic; @@ -88,7 +89,7 @@ namespace FineUIPro.Web.HJGL.DataImport { foreach (var q in unitWork1) { - int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; @@ -111,7 +112,7 @@ namespace FineUIPro.Web.HJGL.DataImport { foreach (var q in unitWork2) { - int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; @@ -177,14 +178,15 @@ namespace FineUIPro.Web.HJGL.DataImport e.Node.Nodes.Clear(); if (e.Node.CommandName == "单位工程") { - var pipeline = (from x in PipelineService.hJGL_Pipelines + var pipeline = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim()) orderby x.PipelineCode select x).ToList(); + var hJGL_WeldJoints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x ).ToList(); foreach (var item in pipeline) { - var jotCount = (from x in WeldJointService.hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == null select x).Count(); + var jotCount = (from x in hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == null select x).Count(); //var weldJotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == null && x.WeldingDailyId != null select x).Count(); TreeNode newNode = new TreeNode(); //if (jotCount > weldJotCount) diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs index 1058c8da..874ee2fa 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs @@ -147,7 +147,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery { if (q != null) { - int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; @@ -171,8 +171,8 @@ namespace FineUIPro.Web.HJGL.InfoQuery { foreach (var q in unitWork2) { - int a = (from x in PipelineService.hJGL_Pipelines - where x.UnitWorkId == q.UnitWorkId + int a = (from x in Funs.DB.HJGL_Pipeline + where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim()) select x).Count(); @@ -283,14 +283,16 @@ namespace FineUIPro.Web.HJGL.InfoQuery e.Node.Nodes.Clear(); if (e.Node.CommandName == "单位工程") { - var pipeline = (from x in PipelineService.hJGL_Pipelines - where x.UnitWorkId == e.Node.NodeID + var pipeline = (from x in Funs.DB.HJGL_Pipeline + where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim()) orderby x.PipelineCode select x).ToList(); + var hJGL_WeldJoints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); + foreach (var item in pipeline) { - var jotCount = (from x in WeldJointService.hJGL_WeldJoints where x.PipelineId == item.PipelineId /*&& x.IsTwoJoint == null*/ select x).Count(); + var jotCount = (from x in hJGL_WeldJoints where x.PipelineId == item.PipelineId /*&& x.IsTwoJoint == null*/ select x).Count(); TreeNode newNode = new TreeNode(); newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】"; newNode.NodeID = item.PipelineId; diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs index 65c84030..06c4cb2f 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs @@ -98,7 +98,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery { foreach (var q in unitWork1) { - int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; @@ -112,7 +112,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery { foreach (var q in unitWork2) { - int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs index 640bfefa..5e8c3031 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs @@ -118,7 +118,7 @@ namespace FineUIPro.Web.HJGL.PreDesign { foreach (var q in unitWork1) { - int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; @@ -132,7 +132,7 @@ namespace FineUIPro.Web.HJGL.PreDesign { foreach (var q in unitWork2) { - int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs index af3431ea..df7d065f 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs @@ -81,7 +81,7 @@ namespace FineUIPro.Web.HJGL.PreDesign { foreach (var q in unitWork1) { - int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; @@ -109,7 +109,7 @@ namespace FineUIPro.Web.HJGL.PreDesign { foreach (var q in unitWork2) { - int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; @@ -142,7 +142,7 @@ namespace FineUIPro.Web.HJGL.PreDesign private void BindNodes(TreeNode node) { List pipeline = new List(); - var pipelines = from x in PipelineService.hJGL_Pipelines where x.PipeArea == "1" select x; + var pipelines = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.PipeArea == "1" select x; pipeline = (from x in pipelines where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs index 1f405b6c..ee570cef 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs @@ -82,7 +82,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { foreach (var q in unitWork1) { - int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; @@ -106,7 +106,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { foreach (var q in unitWork2) { - int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; @@ -135,16 +135,19 @@ namespace FineUIPro.Web.HJGL.WeldingManage private void BindNodes(TreeNode node) { List pipeline = new List(); - pipeline = (from x in PipelineService.hJGL_Pipelines - where x.UnitWorkId == node.NodeID + pipeline = (from x in Funs.DB.HJGL_Pipeline + where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) orderby x.PipelineCode select x).ToList(); + var hJGL_WeldJoints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); + int pageindex = int.Parse(node.CommandName.Split('|')[0]); int pageCount = int.Parse(node.CommandName.Split('|')[1]); if (pageindex <= pageCount) { pipeline = pipeline.Skip(pageSize * (pageindex - 1)).Take(pageSize).ToList(); + foreach (var item in pipeline) { //var jotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == true select x).Count(); @@ -159,8 +162,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage // newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】"; //} - var jotCount = (from x in WeldJointService.hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == true select x).Count(); - var AuditCount = (from x in WeldJointService.hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == true && x.AuditDate != null select x).Count(); + var jotCount = (from x in hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == true select x).Count(); + var AuditCount = (from x in hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == true && x.AuditDate != null select x).Count(); TreeNode newNode = new TreeNode(); if (jotCount == AuditCount) //全部审核 diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs index 9c26b075..acfad345 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs @@ -171,7 +171,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (dv[i]["管线号"] != null && !string.IsNullOrEmpty(dv[i]["管线号"].ToString())) { - var pipeline = from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == unitworkId && x.PipelineCode == dv[i]["管线号"].ToString().Trim() select x; + var pipeline = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == unitworkId && x.PipelineCode == dv[i]["管线号"].ToString().Trim() select x; if (pipeline.Count() > 0) { item.PipelineId = pipeline.First().PipelineId; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs index 3d8aa67c..b35c0e59 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs @@ -177,7 +177,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage rootNode1.EnableExpandEvent = true; this.tvControlItem.Nodes.Add(rootNode1); - int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == this.UnitWorkId && x.UnitId == this.UnitId && x.PipeArea == PipelineService.PipeArea_SHOP select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId && x.UnitId == this.UnitId && x.PipeArea == PipelineService.PipeArea_SHOP select x).Count(); if (a > 0) { // BindNodes(tn1); @@ -194,7 +194,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage rootNode2.EnableClickEvent = true; rootNode2.EnableExpandEvent = true; this.tvControlItem.Nodes.Add(rootNode2); - int b = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == this.UnitWorkId && x.UnitId == this.UnitId && x.PipeArea == PipelineService.PipeArea_FIELD select x).Count(); + int b = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId && x.UnitId == this.UnitId && x.PipeArea == PipelineService.PipeArea_FIELD select x).Count(); if (b > 0) { // BindNodes(tn1); @@ -215,7 +215,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage void AddTreeNode(string PipeArea , TreeNode node ) { - var iso = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == this.UnitWorkId && x.UnitId == this.UnitId && x.PipeArea == PipeArea orderby x.PipelineCode select x).ToList(); + var iso = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId && x.UnitId == this.UnitId && x.PipeArea == PipeArea orderby x.PipelineCode select x).ToList(); if (!string.IsNullOrEmpty(this.txtPipelineCode.Text)) { iso = (from x in iso where x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) orderby x.PipelineCode select x).ToList(); @@ -235,7 +235,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (pagenum <= Funs.GetEndPageNumber(Count,pageSize)) { iso = iso.Skip(pageSize * (pagenum - 1)).Take(pageSize).ToList(); ; - var joints = from x in WeldJointService.hJGL_WeldJoints select x; + var joints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); foreach (var item in iso) { TreeNode newNode = new TreeNode(); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs index 2d9662f4..68f39730 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs @@ -187,17 +187,18 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (e.Node.CommandName == "单位工程") { - var pipeline = (from x in BLL.PipelineService.hJGL_Pipelines - where x.UnitWorkId == e.Node.NodeID && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim()) + var pipeline = (from x in Funs.DB.HJGL_Pipeline + where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim()) orderby x.PipelineCode select x).ToList(); - + var hJGL_WeldJoints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); + // var WeldJointlist = (from x in Funs.DB.View_HJGL_WeldJoint where x.UnitWorkId == e.Node.NodeID && x.IsTwoJoint == null select x).ToList(); foreach (var item in pipeline) { //var jotCount = WeldJointlist.Where(x => x.PipelineId == item.PipelineId).Count(); - var jotCount = WeldJointService.hJGL_WeldJoints.Where(x => x.PipelineId == item.PipelineId).Count(); + var jotCount = hJGL_WeldJoints.Where(x => x.PipelineId == item.PipelineId).Count(); TreeNode newNode = new TreeNode(); newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】"; newNode.NodeID = item.PipelineId; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs index f0b7359d..14b84f56 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs @@ -99,7 +99,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage foreach (var q in unitWork1) { - int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; @@ -122,7 +122,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { foreach (var q in unitWork2) { - int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; @@ -154,8 +154,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (e.Node.CommandName == "单位工程") { - var pipeline = (from x in PipelineService.hJGL_Pipelines - where x.UnitWorkId == e.Node.NodeID && x.PipeArea == PipeArea + var pipeline = (from x in Funs.DB.HJGL_Pipeline + where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID && x.PipeArea == PipeArea orderby x.PipelineCode select x).ToList(); if (!string .IsNullOrEmpty (txtPipelineCode.Text.Trim())) diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx index 54399005..8a1568ff 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx @@ -35,9 +35,12 @@ - + + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs index 5f867f08..e0ae892e 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs @@ -617,12 +617,14 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage if (string.IsNullOrEmpty(errlog)) { ShowNotify("保存成功！", MessageBoxIcon.Success); - PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); + drpJointAttribute_SelectedIndexChanged(null, null); + //PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); } else { // string okj = ActiveWindow.GetWriteBackValueReference(newWeldReportMain.WeldingDailyId) + ActiveWindow.GetHidePostBackReference(); Alert.ShowInTop("保存成功！" + "焊接明细中" + errlog, "提交结果", MessageBoxIcon.Warning); + drpJointAttribute_SelectedIndexChanged(null, null); // ShowAlert("焊接明细中" + errlog, MessageBoxIcon.Warning); } } @@ -637,7 +639,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); return; } + } + + protected void btnAccept_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); + + } + #endregion #region 焊工资质判断 diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs index 96d4ccd0..95f10054 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.WeldingProcess.WeldingManage { - - - public partial class WeldReportEdit { - +namespace FineUIPro.Web.WeldingProcess.WeldingManage +{ + + + public partial class WeldReportEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// panelCenterRegion 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelCenterRegion; - + /// /// Toolbar2 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// hdItemsString 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdItemsString; - + /// /// hdTablerId 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdTablerId; - + /// /// drpJointAttribute 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpJointAttribute; - + /// /// txtPipelineCode 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPipelineCode; - + /// /// ToolbarFill1 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnSave 控件。 /// @@ -110,7 +112,16 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + + /// + /// btnAccept 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAccept; + /// /// SimpleForm1 控件。 /// @@ -119,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// txtWeldingDailyCode 控件。 /// @@ -128,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWeldingDailyCode; - + /// /// drpUnit 控件。 /// @@ -137,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnit; - + /// /// drpUnitWork 控件。 /// @@ -146,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitWork; - + /// /// txtWeldingDate 控件。 /// @@ -155,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtWeldingDate; - + /// /// txtTabler 控件。 /// @@ -164,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtTabler; - + /// /// txtTableDate 控件。 /// @@ -173,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtTableDate; - + /// /// txtRemark 控件。 /// @@ -182,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtRemark; - + /// /// lbAmount 控件。 /// @@ -191,7 +202,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbAmount; - + /// /// Grid1 控件。 /// @@ -200,7 +211,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// lbPipeArea 控件。 /// @@ -209,7 +220,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lbPipeArea; - + /// /// drpCoverWelderId 控件。 /// @@ -218,7 +229,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCoverWelderId; - + /// /// drpBackingWelderId 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs index 9890cd19..e1e8731e 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs @@ -71,7 +71,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { foreach (var q in unitWork1) { - int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; @@ -94,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { foreach (var q in unitWork2) { - int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; @@ -124,14 +124,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage e.Node.Nodes.Clear(); if (e.Node.CommandName == "单位工程") { - var pipeline = (from x in PipelineService.hJGL_Pipelines - where x.UnitWorkId == e.Node.NodeID + var pipeline = (from x in Funs.DB.HJGL_Pipeline + where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID && x.PipelineCode.Contains(txtPipelineCode.Text.Trim()) orderby x.PipelineCode select x).ToList(); + var hJGL_WeldJoints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); + foreach (var item in pipeline) { - var jotCount = (from x in WeldJointService.hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == null select x).Count(); + var jotCount = (from x in hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == null select x).Count(); //var weldJotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == null && x.WeldingDailyId != null select x).Count(); //if (jotCount > weldJotCount) diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs index 46960c8f..b71c1534 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs @@ -83,7 +83,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { foreach (var q in unitWork1) { - int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; @@ -97,7 +97,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { foreach (var q in unitWork2) { - int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId;