From 9df5ccc5a37e208bac127d375aca1508609fde84 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Thu, 5 Jan 2023 11:44:15 +0800 Subject: [PATCH] =?UTF-8?q?2023-01-05=20=E4=BA=8C=E6=AC=A1=E7=84=8A?= =?UTF-8?q?=E5=8F=A3=E8=AE=BE=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/SGGL_SeDin/v17/.wsuo | Bin 27136 -> 27648 bytes .../HJGL/WeldingManage/JotTwoDesign.aspx | 2 +- .../HJGL/WeldingManage/JotTwoDesign.aspx.cs | 65 ++++++++++++++++-- .../HJGL/WeldingManage/WeldJointEdit.aspx | 15 ++-- .../HJGL/WeldingManage/WeldJointEdit.aspx.cs | 8 ++- .../WeldJointEdit.aspx.designer.cs | 18 ++--- 6 files changed, 87 insertions(+), 21 deletions(-) diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 98c9e3cf5fa8753627d8db7a2a3204af2ea1854e..25628b52478ecc3b868e95483f4e6ba580196999 100644 GIT binary patch delta 1498 zcmb7E%}*0i5Pxrhvfvhqr4&K>K^LjeVvAV2D$$sR5Fw!i6Y(pOwp8#Su`UKr^lZ4$ zxf{}(i4p1I)tKPHg9#-e>Yw1ngGn!%D9-eYZ4o~vnSJm5X5LI^e)F2#<;hR{<+#8_ za0+%qc5~x#mje>Q2hqbA+e3lLb{W)~&E-x6T&PW`Kha>sRYJ9+lA~V8ZbiJg%GOqO zcHsGl4(loIPvF{%+P81>?)Brrw-1!_`4JmL9V*%^xNb~(cuE*AmbG^Akh1EZ^A>Q5 z=H=>wj$({fRKlrnO7^b>InkdQMR)#CkiH%#`Ie=+ATtJ|f-;Sv8j0FM?ICaCMpKR3 z0&H3Qpqj!G5kdr&tdK*H4kacES6Z_CKp;@fS;>HRON11dZ_P>##ek)td>R%l6H+6> zrixsautZbQq6gKsU9nvUXsUHvFmh^8sX6&XNlz^-`QGP$Y`xB(UxUTYDUouMknc$w z+MfvcK?$=2TVVItEQ>Ogg>Zey=Gk3#A9o4Z5nLt*6L>9p76KGP)Dp333j0#sJg-9oB0^xxd*DVJ_y%uF4AP*Nr=K)?b9em5`!*#jg>$M6=7770wvB)}~+ zX-PTBGsj1H1-+nJS1LSGgCU7tWCv=gQcWFP;hDe|H!`A9-x&iD!T2C(^boag$`!%Lh%Q-w1383IhX+d3=~{mX zby{xtMTeHY(aYudtUnrw#DiWX7K?d@0)f-sNN`s1#^Or+jNhjy%Grqa<+@qS+EYmEc|Hi2JZ|Wb+Z%WudiMEsO18pU%#rqTSfBd{T~Qa9WEV8Y&coB_ o19%j>i2ERXjoM(ryQ;0vO>+1#a|#_tv{$h)4kLFg;GXIK1*9)%F8}}l delta 1372 zcmb_bL2DC16wXZ3bgh$`n6%YclSb2+YGRTml(tqZHfW^9t|(YhN|Q8E3WCT6dULNz zFWu)a=uwJD)*n#Ng9o806!D@5ZzA6IARemkHM?Y` zfg|R8%$yJ795j8}96|pSTFizKK8)+Q4NIVZ9xaKMvEj7Wr*AuxY;Do0@maHm#pi8m z=-OaMAuRcxP$l-)li&B(!ESTiu9z^!tzw9k0~8ZzTaDMMrq-S7fVVuQEAB1sb`WzG z?F~IVGKInL$bw#KQB6Tz@z&X1RPohC7e)`E5m}8?e_cojcx)iM4b|Q`$a(O@URjW; zURxNHz8z`E2Ixxv7Kb-Ht<5`OB{1V=md4F%jDRf8U`n?wjm<;##7)U%gIvVnGp_#} zzRp^%0HuFbo6JkZZSznicuTTK-z&xl%7T=zS_r`ytb}IV4!@b#%r!zt*(5TWontT^ zOzTEiaClM4z|;GeAjW%iHKsDnpKDK_2cUFP+0c^Bu~VEa-7o z!!_!d*l8)O^D^#`V0+*yOf9IO#-?C%L4tQnKeT90P&-)t+0Zm93%a1CM~rBFpOWG@ zrjoogv_MXfZgyoGg1$eHbZHl_oy{}I2jisL`Y6{1bHp_$gY`xuhF5D7)7;JIbN^q8 z>c+*Ffomy8>o3t<|J!TLN}+P!=08V9v!mrqrZAEym5P-_wm6bW6vhk1M5>S~WtURL oa=J9Gf4}3C^v&`~2Fc|s@Tszac0nt|sgd;R@(f$Q$JZb5-`&ylqW}N^ diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx index 292d9b50..2455ccd5 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx @@ -58,7 +58,7 @@ - diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs index ee570cef..520a730f 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs @@ -217,10 +217,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID); this.hdUnitWorkId.Text = string.Empty; - if (pipeline != null) - { - this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID; - } + if (e.CommandName == "加载") { string CommandName = e.Node.ParentNode.CommandName; @@ -229,7 +226,22 @@ namespace FineUIPro.Web.HJGL.WeldingManage treeNode.Nodes.Remove(e.Node); BindNodes(e.Node.ParentNode); } - this.BindGrid(); + else + { + if (pipeline != null) + { + this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID; + this.BindGrid(); + } + else + { + this.hdUnitWorkId.Text = this.tvControlItem.SelectedNodeID; + ckIsAudit.Checked = true; + NoAuditBindGrid(); + } + + } + } protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e) { @@ -287,6 +299,49 @@ namespace FineUIPro.Web.HJGL.WeldingManage Grid1.DataSource = table; Grid1.DataBind(); } + + private void NoAuditBindGrid() + { + string strSql = @"SELECT WeldJointId,WeldJointCode,PipelineId,PipelineCode,JointAttribute,TwoJointType, + ComponentsCode1,ComponentsCode2,IsWelding,IsHotProessStr,Material1Code,Material2Code, + WeldTypeCode,Specification,HeartNo1,HeartNo2,Size,Dia,Thickness,GrooveTypeCode, + WeldingMethodCode,WeldingWireCode,WeldingRodCode,WeldingDate,WeldingDailyCode, + BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark, + (CASE WHEN AuditDate IS NOT NULL THEN '已审核' ELSE '未审核' END) AS IsAudit, + subMan.PersonName AS SubmitMan,auditMan.PersonName AS AuditMan,AuditDate + FROM View_HJGL_WeldJoint + LEFT JOIN dbo.Person_Persons auditMan ON auditMan.PersonId=View_HJGL_WeldJoint.AuditMan + LEFT JOIN dbo.Person_Persons subMan ON subMan.PersonId=View_HJGL_WeldJoint.SubmitMan + WHERE IsTwoJoint = 1"; + List listStr = new List { }; + + strSql += " AND UnitWorkId =@UnitWorkId"; + listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID)); + + if (!string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim())) + { + strSql += " AND WeldJointCode LIKE @WeldJointCode"; + listStr.Add(new SqlParameter("@WeldJointCode", "%" + this.txtWeldJointCode.Text.Trim() + "%")); + } + if (DropTwoJointType.SelectedValue != BLL.Const._Null) + { + strSql += " AND TwoJointType = @TwoJointType"; + listStr.Add(new SqlParameter("@TwoJointType", DropTwoJointType.SelectedValue)); + } + if (ckIsAudit.Checked == true) + { + strSql += " and AuditDate is null"; + } + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + // 2.获取当前分页数据 + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion #region 分页排序 diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx index ff527bb8..3f0e943d 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx @@ -50,9 +50,15 @@ - + + + + + + + @@ -63,6 +69,8 @@ LabelWidth="100px" DecimalPrecision="4" NoNegative="true" ShowRedStar="true" Required="true" EnableBlurEvent="true" OnBlur="txtText_TextChanged" LabelAlign="Right"> + + @@ -103,8 +111,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs index 8aececd9..9e45ef75 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs @@ -220,9 +220,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (!string.IsNullOrEmpty(isTwoJoint)) { - string perfix = txtPipelineCode.Text + "/Z-"; + //string perfix = txtPipelineCode.Text + "/Z-"; + string perfix = txtPipelineCode.Text + "/"; + this.txtWeldJointCode.Text = perfix; + + // txtWeldJointCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCode4ByProjectId", "dbo.HJGL_WeldJoint", "WeldJointCode", this.CurrUser.LoginProjectId, perfix); - txtWeldJointCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCode4ByProjectId", "dbo.HJGL_WeldJoint", "WeldJointCode", this.CurrUser.LoginProjectId, perfix); + // txtWeldJointCode.Text = txtWeldJointCode.Text.Replace(perfix, ""); } } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs index 6814317a..bd6aff10 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs @@ -167,6 +167,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected global::FineUIPro.NumberBox txtDia; + /// + /// txtDNDia 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtDNDia; + /// /// txtSize 控件。 /// @@ -239,15 +248,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected global::FineUIPro.DropDownList DropTwoJointType; - /// - /// txtDNDia 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtDNDia; - /// /// GroupPanel2 控件。 ///