From 879d835758dd9619f17528cb6e86bde5e9b3acf2 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 24 Mar 2026 14:38:07 +0800 Subject: [PATCH] 1 --- DataBase/版本日志/HJGLDB_DS_2026-03-18_gf.sql | 122 +++++++++++++ HJGL_DS/FineUIPro.Web/Login.aspx.cs | 166 +++++++++++------- HJGL_DS/FineUIPro.Web/Web.config | 2 +- 3 files changed, 224 insertions(+), 66 deletions(-) create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-03-18_gf.sql diff --git a/DataBase/版本日志/HJGLDB_DS_2026-03-18_gf.sql b/DataBase/版本日志/HJGLDB_DS_2026-03-18_gf.sql new file mode 100644 index 0000000..07ec970 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2026-03-18_gf.sql @@ -0,0 +1,122 @@ + +ALTER VIEW [dbo].[HJGL_View_CH_HotProessTrustItem] +/*ȴίϸѯб*/ +AS +SELECT TrustItem.HotProessTrustItemId, --ȴίϸid + TrustItem.HotProessTrustId, -- ȴίid + JointInfo.JOT_ID, --id + ROW_NUMBER() OVER(ORDER BY JointInfo.Sort1,JointInfo.Sort2,JointInfo.Sort3,JointInfo.Sort4,JointInfo.Sort5) as Number, + TrustItem.TrustDate, + '' as NewJotId, + IsoInfo.ISO_IsoNo, + JointInfo.ISO_ID, + (CASE WHEN record.RepairMark IS NOT NULL THEN (JointInfo.JOT_JointNo+record.RepairMark) + ELSE JointInfo.JOT_JointNo END )+ISNULL(TrustItem.HardRepairMark,'') AS JOT_JointNo, + JointInfo.DReportID, + report.JOT_WeldDate, + TrustItem.Remark, + TrustItem.TrustItemID, + TrustItem.HardTestResultId, + TrustItem.HardRepairMark, + TrustItem.IsComplete, + --CASE Result.IsOK WHEN 1 THEN '' + -- WHEN 0 THEN '' + -- ELSE '' END AS IsOKStr, + --CASE Result.IsOK WHEN 1 THEN '' + -- WHEN 0 THEN 'δ' + -- ELSE '' END AS IsOKStr2, + CASE (select top 1 IsOK from HJGL_CH_HotProessResult Result where Result.HotProessTrustId=TrustItem.HotProessTrustId AND Result.JOT_ID=TrustItem.JOT_ID AND TrustItem.ProessTypes=Result.ProessTypes) WHEN 1 THEN '' + WHEN 0 THEN '' + ELSE '' END AS IsOKStr, + CASE (select top 1 IsOK from HJGL_CH_HotProessResult Result where Result.HotProessTrustId=TrustItem.HotProessTrustId AND Result.JOT_ID=TrustItem.JOT_ID AND TrustItem.ProessTypes=Result.ProessTypes) WHEN 1 THEN '' + WHEN 0 THEN 'δ' + ELSE '' END AS IsOKStr2, + TrustItem.ProessTypes, --ȴ + JointInfo.JOT_JointDesc, -- + JointInfo.ProjectId, + JointInfo.Sort1, + JointInfo.Sort2, + JointInfo.Sort3, + JointInfo.Sort4, + JointInfo.Sort5, + WeldMethod.WME_Code, --ӷ + --(CASE WHEN Welder1.WED_Code!=Welder2.WED_Code THEN (Welder1.WED_Code+'/'+Welder2.WED_Code) ELSE Welder1.WED_Code END) AS WED_Code, -- + (CASE WHEN JointInfo.JOT_CellWelder!=JointInfo.JOT_FloorWelder THEN (Welder1.WED_Code+'/'+Welder2.WED_Code) ELSE Welder1.WED_Code END) AS WED_Code, -- + (CASE WHEN JointInfo.STE_ID<>JointInfo.STE_ID2 THEN Steel1.STE_Code+'/'+Steel2.STE_Code + ELSE Steel1.STE_Code END) AS STE_Code, -- + --Result.IsOK, --Ƿ + (select top 1 IsOK from HJGL_CH_HotProessResult Result where Result.HotProessTrustId=TrustItem.HotProessTrustId AND Result.JOT_ID=TrustItem.JOT_ID AND TrustItem.ProessTypes=Result.ProessTypes) as IsOK, + cast(cast(IsoInfo.ISO_DesignPress as decimal(18,2)) as nvarchar(10))+ 'Mpa' as ISO_DesignPress --ѹ +FROM dbo.HJGL_PW_JointInfo AS JointInfo +LEFT JOIN dbo.HJGL_BS_WeldMethod WeldMethod ON WeldMethod.WME_ID=JointInfo.WME_ID +LEFT JOIN HJGL_BS_Welder AS Welder1 ON Welder1.WED_ID = JointInfo.JOT_CellWelder +LEFT JOIN HJGL_BS_Welder AS Welder2 ON Welder2.WED_ID = JointInfo.JOT_FloorWelder +LEFT JOIN dbo.HJGL_BO_WeldReportMain report ON report.DReportID = JointInfo.DReportID +LEFT JOIN dbo.HJGL_CH_HotProessTrustItem AS TrustItem ON JointInfo.JOT_ID = TrustItem.JOT_ID +LEFT JOIN dbo.HJGL_CH_HotProessTrust AS Trust ON Trust.HotProessTrustId=TrustItem.HotProessTrustId +LEFT JOIN dbo.HJGL_CH_RepairItemRecord AS record ON record.RepairItemRecordId=TrustItem.TrustItemID +LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON JointInfo.ISO_ID = IsoInfo.ISO_ID +LEFT JOIN dbo.HJGL_BS_Steel AS Steel1 ON JointInfo.STE_ID = Steel1.STE_ID +LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON JointInfo.STE_ID2 = Steel2.STE_ID +--LEFT JOIN dbo.HJGL_CH_HotProessResult AS Result ON Result.HotProessTrustId=TrustItem.HotProessTrustId AND Result.JOT_ID=TrustItem.JOT_ID AND TrustItem.ProessTypes=Result.ProessTypes + + + + +GO + + + +ALTER VIEW [dbo].[HJGL_View_CH_HotProessResult] +/*ȴѯͼ*/ +AS +SELECT distinct + IsoInfo.ProjectId + ,(select top 1 HotProessTrustItemId from HJGL_CH_HotProessTrustItem a where HotProessResult.HotProessTrustId=a.HotProessTrustId and HotProessResult.JOT_ID=a.JOT_ID and HotProessResult.ProessTypes=a.ProessTypes) as HotProessTrustItemId + ,Project.ProjectCode + ,IsoInfo.BSU_ID + ,IsoInfo.ISO_IsoNo + ,IsoInfo.ISO_ID + ,JointInfo.JOT_ID + , (CASE WHEN Steel.STE_Code IS NOT NULL AND Steel2.STE_Code IS NOT NULL AND Steel.STE_Code!=Steel2.STE_Code + THEN Steel.STE_Code + '/' + Steel2.STE_Code + WHEN Steel.STE_Code IS NOT NULL THEN Steel.STE_Code + ELSE ISNULL(Steel2.STE_Code,'') END) AS STE_Code + ,JointInfo.JOT_Dia + ,JointInfo.JOT_Sch + ,JointInfo.JOT_JointNo+ + ISNULL((SELECT TOP 1 RepairMark FROM dbo.HJGL_CH_HotProessTrustItem TrustItem + LEFT JOIN dbo.HJGL_CH_RepairItemRecord AS record ON record.RepairItemRecordId=TrustItem.TrustItemID + WHERE TrustItem.JOT_ID=hti.JOT_ID AND TrustItem.HotProessTrustId=hti.HotProessTrustId),'')+ + ISNULL(hti.HardRepairMark,'') AS JOT_JointNo + ,(SELECT TOP 1 trustItem.TrustDate FROM dbo.HJGL_CH_HotProessTrustItem trustItem + WHERE trustItem.JOT_ID=hti.JOT_ID AND trustItem.HotProessTrustId=hti.HotProessTrustId) AS TrustDate + ,HotProessResult.HotProessResultId + ,hti.HotProessTrustId + ,hti.ProessTypes + ,HotProessResult.IsNeedHardTest + ,HotProessResult.Remark + ,(SELECT TOP 1 RecordChartNo FROM dbo.HJGL_HotProessItem HotProessItem WHERE HotProessItem.HotProessTrustId=hti.HotProessTrustId + AND HotProessItem.JOT_ID=hti.JOT_ID AND HotProessItem.ProessTypes=hti.ProessTypes and RecordChartNo is not null and RecordChartNo!='') AS RecordChartNo + ,(SELECT TOP 1 Remark FROM dbo.HJGL_HotProessItem HotProessItem WHERE HotProessItem.HotProessTrustId=hti.HotProessTrustId + AND HotProessItem.JOT_ID=hti.JOT_ID AND HotProessItem.ProessTypes=hti.ProessTypes) AS HotProessItemRemark + ,HotProessResult.IsOK + ,(SELECT TOP 1 report.TestDate FROM dbo.HJGL_CH_HardTestReport report + LEFT JOIN dbo.HJGL_CH_HardTestReportItem item ON item.HardTestReportId = report.HardTestReportId + WHERE item.JOT_ID=hti.JOT_ID AND item.HotProessTrustId=hti.HotProessTrustId AND hti.ProessTypes='4') AS HardTestDate +FROM HJGL_CH_HotProessResult HotProessResult +LEFT JOIN dbo.HJGL_CH_HotProessTrustItem AS hti ON HotProessResult.HotProessTrustId=hti.HotProessTrustId and HotProessResult.JOT_ID=hti.JOT_ID and HotProessResult.ProessTypes=hti.ProessTypes +LEFT JOIN dbo.HJGL_PW_JointInfo AS JointInfo ON JointInfo.JOT_ID = hti.JOT_ID +LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON JointInfo.ISO_ID = IsoInfo.ISO_ID +LEFT JOIN dbo.Base_Project AS Project ON JointInfo.ProjectId=Project.ProjectId +LEFT JOIN dbo.HJGL_BS_Steel AS Steel ON JointInfo.STE_ID = Steel.STE_ID +LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON JointInfo.STE_ID2 = Steel2.STE_ID + + + + + + +GO + + diff --git a/HJGL_DS/FineUIPro.Web/Login.aspx.cs b/HJGL_DS/FineUIPro.Web/Login.aspx.cs index 4d5123d..76c5ab7 100644 --- a/HJGL_DS/FineUIPro.Web/Login.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/Login.aspx.cs @@ -53,76 +53,112 @@ namespace FineUIPro.Web protected void btnLogin_Click(object sender, EventArgs e) { + //string userName = this.tbxUserName.Text; + //string password = this.tbxPassword.Text; + //bool rememberMe = this.savemessgae.Checked; + //bool isLogin = false; + //using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + //{ + // var sysUser = db.Sys_User.FirstOrDefault(x => x.Account == userName && x.IsPost == true); + // if (sysUser != null) + // { + // if (sysUser.LockTime.HasValue && sysUser.LockTime.Value > DateTime.Now) + // { + // Alert.Show("账号锁定30分钟！", MessageBoxIcon.Error); + // return; + // } + // else + // { + // if (sysUser.Password.ToUpper() != Sys_UserService.EncryptionPassword(password).ToUpper()) + // { + // if (sysUser.LockTime.HasValue && sysUser.LockTime.Value < DateTime.Now) + // { + // sysUser.ErrorTimes = null; + // sysUser.LockTime = null; + // Sys_UserService.UpdateUser(sysUser); + // } + // if (sysUser.ErrorTimes.HasValue && sysUser.ErrorTimes.Value >= 4) + // { + // sysUser.ErrorTimes = sysUser.ErrorTimes.Value + 1; + // sysUser.LockTime = DateTime.Now.AddMinutes(30); + // Sys_UserService.UpdateUser(sysUser); + // Alert.Show("账号锁定30分钟！", MessageBoxIcon.Error); + // return; + // } + // else if (sysUser.ErrorTimes.HasValue) + // { + // sysUser.ErrorTimes = sysUser.ErrorTimes.Value + 1; + // Sys_UserService.UpdateUser(sysUser); + // // error = "密码错误" + sysUser.ErrorTimes + "次，超过5次将锁定10分钟！"; + // Alert.Show("用户名或密码错误，超过5次将锁定30分钟，请重新输入！", MessageBoxIcon.Error); + // return; + // } + // else + // { + // sysUser.ErrorTimes = 1; + // Sys_UserService.UpdateUser(sysUser); + // Alert.Show("用户名或密码错误，超过5次将锁定30分钟，请重新输入！", MessageBoxIcon.Error); + // return; + // } + // } + // ///登陆信息是否正确 + // if (BLL.Sys_UserService.UserLogOn(userName, password, rememberMe, this.Page)) + // { + // isLogin = true; + // } + // if (isLogin) + // { + // BLL.Sys_LogService.AddLog(Const.System_1, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "登陆成功！"); + // Response.Redirect("~/default.aspx"); + // } + // else + // { + // Alert.Show("账户与密码不匹配！", MessageBoxIcon.Error); + // return; + // } + // } + // } + // else + // { + // Alert.Show("用户名或密码错误，请重新输入！", MessageBoxIcon.Error); + // return; + // } + //} string userName = this.tbxUserName.Text; string password = this.tbxPassword.Text; bool rememberMe = this.savemessgae.Checked; bool isLogin = false; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + ///登陆信息是否正确 + if (BLL.Sys_UserService.UserLogOn(userName, password, rememberMe, this.Page)) { - var sysUser = db.Sys_User.FirstOrDefault(x => x.Account == userName && x.IsPost == true); - if (sysUser != null) - { - if (sysUser.LockTime.HasValue && sysUser.LockTime.Value > DateTime.Now) - { - Alert.Show("账号锁定30分钟！", MessageBoxIcon.Error); - return; - } - else - { - if (sysUser.Password.ToUpper() != Sys_UserService.EncryptionPassword(password).ToUpper()) - { - if (sysUser.LockTime.HasValue && sysUser.LockTime.Value < DateTime.Now) - { - sysUser.ErrorTimes = null; - sysUser.LockTime = null; - Sys_UserService.UpdateUser(sysUser); - } - if (sysUser.ErrorTimes.HasValue && sysUser.ErrorTimes.Value >= 4) - { - sysUser.ErrorTimes = sysUser.ErrorTimes.Value + 1; - sysUser.LockTime = DateTime.Now.AddMinutes(30); - Sys_UserService.UpdateUser(sysUser); - Alert.Show("账号锁定30分钟！", MessageBoxIcon.Error); - return; - } - else if (sysUser.ErrorTimes.HasValue) - { - sysUser.ErrorTimes = sysUser.ErrorTimes.Value + 1; - Sys_UserService.UpdateUser(sysUser); - // error = "密码错误" + sysUser.ErrorTimes + "次，超过5次将锁定10分钟！"; - Alert.Show("用户名或密码错误，超过5次将锁定30分钟，请重新输入！", MessageBoxIcon.Error); - return; - } - else - { - sysUser.ErrorTimes = 1; - Sys_UserService.UpdateUser(sysUser); - Alert.Show("用户名或密码错误，超过5次将锁定30分钟，请重新输入！", MessageBoxIcon.Error); - return; - } - } - ///登陆信息是否正确 - if (BLL.Sys_UserService.UserLogOn(userName, password, rememberMe, this.Page)) - { - isLogin = true; - } - if (isLogin) - { - BLL.Sys_LogService.AddLog(Const.System_1, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "登陆成功！"); - Response.Redirect("~/default.aspx"); - } - else - { - Alert.Show("账户与密码不匹配！", MessageBoxIcon.Error); - return; - } - } - } - else - { - Alert.Show("用户名或密码错误，请重新输入！", MessageBoxIcon.Error); - return; - } + isLogin = true; + } + //else + //{ + // ////检查域名是否存在 + // var admoain = BLL.ADomainService.IsConnected(Funs.ADomainUrl, userName, BLL.CommonService.Base64Code(password)); + // if (admoain != null) + // { + // if (BLL.Sys_UserService.ADUserLogOn(userName, rememberMe, this.Page)) + // { + // isLogin = true; + // } + // else + // { + // Alert.Show("当前用户不在岗", MessageBoxIcon.Warning); + // return; + // } + // } + //} + if (isLogin) + { + BLL.Sys_LogService.AddLog(Const.System_1, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "登陆成功！"); + Response.Redirect("~/default.aspx"); + } + else + { + Alert.Show("账户与密码不匹配", MessageBoxIcon.Error); + return; } } diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 30834b7..3f81ed7 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -11,7 +11,7 @@ - +