gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
高飞 2026-03-24 14:38:07 +08:00
parent c73c1478bd
commit 879d835758
3 changed files with 224 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
DataBase/版本日志/HJGLDB_DS_2026-03-18_gf.sql Normal file
View File

@ -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

142
HJGL_DS/FineUIPro.Web/Login.aspx.cs
View File

@ -53,59 +53,103 @@ namespace FineUIPro.Web
protected void btnLogin_Click(object sender, EventArgs e) 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 userName = this.tbxUserName.Text;
string password = this.tbxPassword.Text; string password = this.tbxPassword.Text;
bool rememberMe = this.savemessgae.Checked; bool rememberMe = this.savemessgae.Checked;
bool isLogin = false; 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)) if (BLL.Sys_UserService.UserLogOn(userName, password, rememberMe, this.Page))
{ {
isLogin = true; 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) if (isLogin)
{ {
BLL.Sys_LogService.AddLog(Const.System_1, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "登陆成功！"); BLL.Sys_LogService.AddLog(Const.System_1, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "登陆成功！");
@ -113,18 +157,10 @@ namespace FineUIPro.Web
} }
else else
{ {
Alert.Show("账户与密码不匹配！", MessageBoxIcon.Error); Alert.Show("账户与密码不匹配", MessageBoxIcon.Error);
return; return;
} }
} }
}
else
{
Alert.Show("用户名或密码错误，请重新输入！", MessageBoxIcon.Error);
return;
}
}
}
/// <summary> /// <summary>
/// APP 下载 /// APP 下载

2
HJGL_DS/FineUIPro.Web/Web.config
View File

@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/> <FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings> <appSettings>
<!--连接字符串--> <!--连接字符串-->
<add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/> <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<!--系统名称--> <!--系统名称-->
<add key="SystemName" value="诺必达焊接管理系统"/> <add key="SystemName" value="诺必达焊接管理系统"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/> <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>