diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 24678d80..d752fa04 100644 Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ diff --git a/DataBase/版本日志/SGGLDB_V2023-04-04_lpf.sql b/DataBase/版本日志/SGGLDB_V2023-04-04_lpf.sql new file mode 100644 index 00000000..4d90f432 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-04-04_lpf.sql @@ -0,0 +1,45 @@ +insert into Sys_ButtonToMenu values('83D0D6F5-402A-4F6F-9423-37DBB6693164','0CA58EC2-7934-49B3-A2C3-327FAD27C541','ίе','5') +/****** Object: View [dbo].[View_HJGL_NoWeldJointFind] Script Date: 2023/4/3 16:14:26 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + + + +ALTER VIEW [dbo].[View_HJGL_NoWeldJointFind] +AS +--δڲ +SELECT jot.WeldJointId, +jot.WeldJointCode, +(case when charindex('/',jot.WeldJointCode)>0 +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/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; 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"> +