20250219 人员报验导入

This commit is contained in:
2025-02-19 14:12:01 +08:00
parent b3128201d1
commit ccc49dc1c1
10 changed files with 48 additions and 33 deletions
@@ -312,12 +312,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
protected void btnSaveMethod(string LoginProjectId, string UserId, string IsPDMS)
{
var oldViewInfos = from x in Funs.DB.Comprehensive_InspectionPerson
where x.ProjectId == this.CurrUser.LoginProjectId
where x.ProjectId == LoginProjectId
select x;
var units = from x in Funs.DB.Base_Unit
join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId
where y.ProjectId == this.CurrUser.LoginProjectId
where y.ProjectId == LoginProjectId
select x;
var cns = from x in Funs.DB.Base_CNProfessional select x;
@@ -437,7 +437,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
try
{
Ins.ValidityDate = Convert.ToDateTime(tempData.Value9.Trim());
Ins.ValidityDate = Funs.GetNewDateTime(tempData.Value9.Trim());
if (Ins.ValidityDate == null)
{
errInfo += "有效期[" + tempData.Value9.Trim() + "]错误;";
}
}
catch (Exception)
{
@@ -448,7 +452,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
try
{
Ins.ApprovalTime = Convert.ToDateTime(tempData.Value10.Trim());
Ins.ApprovalTime = Funs.GetNewDateTime(tempData.Value10.Trim());
if (Ins.ApprovalTime == null)
{
errInfo += "批准时间[" + tempData.Value10.Trim() + "]错误;";
}
}
catch (Exception)
{
@@ -481,7 +489,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
try
{
Ins.DepartureTime = Convert.ToDateTime(tempData.Value13.Trim());
Ins.DepartureTime = Funs.GetNewDateTime(tempData.Value13.Trim());
if (Ins.DepartureTime == null)
{
errInfo += "离场时间[" + tempData.Value13.Trim() + "]错误;";
}
}
catch (Exception)
{
@@ -514,7 +526,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
Ins.ProjectId = LoginProjectId;
var isExitISOValue = oldViewInfos.FirstOrDefault(x => x.UnitId == Ins.UnitId
&& x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value14));
&& x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value15));
if (isExitISOValue != null) ///已存在
{
Ins.InspectionPersonId = isExitISOValue.InspectionPersonId;
@@ -591,7 +603,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
tempData.ToopValue = errInfo;
BLL.Sys_CQMS_DataInTempService.UpdateDataInTemp(tempData);
erreMessage += errInfo + ";";
}
}
}