From 147ec6bf25160d2e08dcb9fe33fd573254749af3 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Mon, 3 Apr 2023 13:38:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?20230403=E9=BB=98=E8=AE=A4=E5=AF=86?= =?UTF-8?q?=E7=A0=81=20=E6=9C=89=E8=B4=A6=E5=8F=B7=E7=9A=84123=20=E6=B2=A1?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=9A=84=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=90=8E?= =?UTF-8?q?=E5=9B=9B=E4=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/Person/Person_PersonsService.cs | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/SGGL/BLL/Person/Person_PersonsService.cs b/SGGL/BLL/Person/Person_PersonsService.cs index 9b42a026..7b437e32 100644 --- a/SGGL/BLL/Person/Person_PersonsService.cs +++ b/SGGL/BLL/Person/Person_PersonsService.cs @@ -666,7 +666,7 @@ namespace BLL JobNum = person.JobNum, PersonName = person.PersonName, Account = person.Account, - Password = GetPersonPassWord(person.IdentityCard), + Password = GetPersonPassWord(person.IdentityCard, person.Account), IsOffice = person.IsOffice, RoleIds = person.RoleIds, IdentityCard = person.IdentityCard, @@ -1102,19 +1102,22 @@ namespace BLL /// /// /// - public static string GetPersonPassWord(string idCard) + public static string GetPersonPassWord(string idCard,string Account) { string passWord = Funs.EncryptionPassword(Const.Password); - ////现场人员密码 - if (!string.IsNullOrEmpty(idCard)) + if (string.IsNullOrEmpty(Account)) { - if (idCard.Length > 3) + ////现场人员密码 + if (!string.IsNullOrEmpty(idCard)) { - passWord = Funs.EncryptionPassword(idCard.Substring(idCard.Length - 4)); - } - else - { - passWord = Funs.EncryptionPassword(idCard); + if (idCard.Length > 3) + { + passWord = Funs.EncryptionPassword(idCard.Substring(idCard.Length - 4)); + } + else + { + passWord = Funs.EncryptionPassword(idCard); + } } } return passWord; From 31a0baf6fee0d954b94d79317f352ca6a9d84eaf Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Tue, 4 Apr 2023 16:30:24 +0800 Subject: [PATCH 2/2] 2023-04-04 001 --- .vs/SGGL_SeDin/v17/.wsuo | Bin 28672 -> 28672 bytes DataBase/版本日志/SGGLDB_V2023-04-04_lpf.sql | 45 ++++++++++++++++++ .../File/Fastreport/组件打印.frx | 9 ++-- .../HJGL/PreDesign/PrePipeline.aspx.cs | 2 +- .../HJGL/WeldingManage/JotTwoDesign.aspx.cs | 29 ++++++++++- .../WeldingManage/SelectTaskWeldJoint.aspx | 8 +++- SGGL/Model/Model.cs | 18 +++++++ 7 files changed, 102 insertions(+), 9 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2023-04-04_lpf.sql diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 24678d80cde0b61033224c15d9dc442abfada4cf..d752fa047c333c154764936a95d12eea55dae050 100644 GIT binary patch delta 912 zcmb7?&ubGw6vyXHhGb2$nxrvm#k8p_HkfTMGl7Rat>hbL;OexnL(zI@e;u! zxm=q?O&!xUjIR-*lld_*ig9c#*D+o|;z$PRmV!za=d;M?k_HxSs=vNpImVgmx=%Vg zgGd(&f`|Dt#xf4JwpelGJwarW&eK<7qE=<&~v{9R>6e7^Spoq z{@1e!>vr3F&T*W&10uw%Knu2bJ8%d!-k#d&O&45z_o>sp_~+}E*7&JLUh+~T!3&X2 zZ>|6nmaJr-_tm^efe2EeF)OyLNLzC7Qdr}y*oyZe-s|$vuN0wb57HhG3#>Ogv9d@q zYY~eZ8R`dn-*AFhq9Q@9&>fY?-Wv6RtZ27F4?qRkZnCXLUx!QfAn##38!g(!yI(+r zskrA9D^%QPqD;jq6^~f&Nrx5vK#2TZS~6WTQWewGjm)~CrwucuS88TOPntP1msq=% zttQq8!QBAlgJa{(V{M~A2qXNrX+Vi3Uc()#R fU^g)?c6(d(cDUJl(|=dJtUR$NT1cGqdk|;~#>52=DvS@V;~& zzw3U6Ng;$EK9jou&+#Z#xRzyM6n#4L@kDGepJ!ZT97j1b%ug{246J3%7qd*_1``oK z!~2DVewukH5ic+=C*lh8S|X17S*+C=OAI?YcX%I*IOlz6&%sdk4Y78T!OViG4CWZh zSe~H_y}D}}Nh8N-Whej1$tA9iov3H|UneH_h}AFU)q#Ke}(=;pTwni0 +then RIGHT(jot.WeldJointCode,CHARINDEX('/',REVERSE(jot.WeldJointCode))-1) +else jot.WeldJointCode end) as WeldJointNum, +jot.PipelineId, +jot.WeldingDailyId, +jot.JointAttribute, +jot.Dia, +jot.DNDia, +jot.Size, +jot.Thickness, +jot.Remark, +WeldType.WeldTypeCode, +method.WeldingMethodCode, +rod.ConsumablesCode AS WeldingRodCode, +wire.ConsumablesCode AS WeldingWireCode, +mat1.MaterialCode AS Material1Code , +mat2.MaterialCode AS Material2Code +FROM dbo.HJGL_WeldJoint jot +LEFT JOIN dbo.HJGL_PreWeldingDaily pre ON pre.WeldJointId = jot.WeldJointId +LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=jot.WeldTypeId +LEFT JOIN Base_WeldingMethod AS method ON method.WeldingMethodId=jot.WeldingMethodId +LEFT JOIN Base_Material AS mat1 ON mat1.MaterialId = jot.Material1Id +LEFT JOIN Base_Material AS mat2 ON mat2.MaterialId = jot.Material2Id +LEFT JOIN Base_Consumables AS wire ON wire.ConsumablesId=jot.WeldingWire +LEFT JOIN Base_Consumables AS rod ON rod.ConsumablesId=jot.WeldingRod +WHERE pre.PreWeldingDailyId IS NULL +and jot.WeldJointId not in (select WeldJointId from HJGL_WeldJoint where IsTwoJoint = 1 and (AuditDate is null or AuditDate='')) +GO + + diff --git a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx index 23c293d3..3915cddf 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -99,7 +99,7 @@ namespace FastReport } - + @@ -122,6 +122,7 @@ namespace FastReport + @@ -193,8 +194,8 @@ namespace FastReport - - + + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs index 2218b7e4..451c0bb0 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs @@ -363,7 +363,7 @@ namespace FineUIPro.Web.HJGL.PreDesign string strSql = @" SELECT com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,unitwork.UnitWorkName, com.PipelineId, punit.UnitName AS PreUnit,aunit.UnitName AS AssembleUnit,mat.PrefabricatedComponents, - com.QRCode,com.State,CONVERT(varchar(100), pipe.PlanStartDate, 23) as PlanStartDate,pipe.PipelineCode, + com.QRCode,com.State,CONVERT(varchar(100), pipe.PlanStartDate, 23) as PlanStartDate,pipe.PipelineCode,pipe.FlowingSection, ('PrePipeline$'+com.PipelineComponentId )as QRCode2,mater.* FROM HJGL_Pipeline_Component com LEFT JOIN HJGL_PipeLineMat mat ON mat.PipeLineMatId=com.PipeLineMatId diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs index ae19cf21..71eaeb5d 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs @@ -353,7 +353,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { - BindGrid(); + 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; + this.BindGrid(); + } + else + { + this.hdUnitWorkId.Text = this.tvControlItem.SelectedNodeID; + NoAuditBindGrid(); + } + + } #endregion @@ -944,7 +957,19 @@ namespace FineUIPro.Web.HJGL.WeldingManage protected void ckIsAudit_CheckedChanged(object sender, CheckedEventArgs e) { - BindGrid(); + 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; + this.BindGrid(); + } + else + { + this.hdUnitWorkId.Text = this.tvControlItem.SelectedNodeID; + NoAuditBindGrid(); + } + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx index 5cd0c3d7..67fcbfb0 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx @@ -123,6 +123,10 @@ + + @@ -136,8 +140,8 @@ - + HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true" Hidden="true"> +