焊工问题处理
This commit is contained in:
@@ -578,20 +578,40 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
|
||||
if (tempData.Value6.Trim() == "焊工")
|
||||
{
|
||||
Model.BS_Welder welder = new Model.BS_Welder();
|
||||
welder.WED_Unit = Ins.UnitId;
|
||||
welder.WED_Name = Ins.PersonName;
|
||||
welder.WED_Code = tempData.Value2.Trim();
|
||||
welder.LimitDate = Ins.ValidityDate;
|
||||
welder.LeaveDate = Ins.DepartureTime; // Convert.ToDateTime(this.txtDepartureTime.Text.ToString());
|
||||
welder.PostDate = Ins.ApprovalTime;// Convert.ToDateTime(this.txtApprovalTime.Text.ToString());
|
||||
welder.WED_WorkCode = Ins.CertificateNumber;// this.txtCertificateNumber.Text.Trim();
|
||||
welder.WED_Class = Ins.QualifiedProjectCode;// this.txtQualifiedProjectCode.Text.Trim();
|
||||
welder.WED_IfOnGuard = Ins.IsOnSite;
|
||||
welder.WED_Remark = Ins.Remark;
|
||||
welder.ProjectId = this.CurrUser.LoginProjectId;
|
||||
// 焊工部分
|
||||
BLL.PersonManageService.AddBSWelder(welder);
|
||||
var welder = PersonManageService.GetBSWelderByProjectIdUnitIdAndWED_Code(this.CurrUser.LoginProjectId, Ins.UnitId, tempData.Value2.Trim());
|
||||
if (welder == null)
|
||||
{
|
||||
welder = new Model.BS_Welder();
|
||||
welder.WED_Unit = Ins.UnitId;
|
||||
welder.WED_Name = Ins.PersonName;
|
||||
welder.WED_Code = tempData.Value2.Trim();
|
||||
welder.LimitDate = Ins.ValidityDate;
|
||||
welder.LeaveDate = Ins.DepartureTime; // Convert.ToDateTime(this.txtDepartureTime.Text.ToString());
|
||||
welder.PostDate = Ins.ApprovalTime;// Convert.ToDateTime(this.txtApprovalTime.Text.ToString());
|
||||
welder.WED_WorkCode = Ins.CertificateNumber;// this.txtCertificateNumber.Text.Trim();
|
||||
welder.WED_Class = Ins.QualifiedProjectCode;// this.txtQualifiedProjectCode.Text.Trim();
|
||||
welder.WED_IfOnGuard = Ins.IsOnSite;
|
||||
welder.WED_Remark = Ins.Remark;
|
||||
welder.ProjectId = this.CurrUser.LoginProjectId;
|
||||
// 焊工部分
|
||||
BLL.PersonManageService.AddBSWelder(welder);
|
||||
}
|
||||
else
|
||||
{
|
||||
welder.WED_Unit = Ins.UnitId;
|
||||
welder.WED_Name = Ins.PersonName;
|
||||
welder.WED_Code = tempData.Value2.Trim();
|
||||
welder.LimitDate = Ins.ValidityDate;
|
||||
welder.LeaveDate = Ins.DepartureTime; // Convert.ToDateTime(this.txtDepartureTime.Text.ToString());
|
||||
welder.PostDate = Ins.ApprovalTime;// Convert.ToDateTime(this.txtApprovalTime.Text.ToString());
|
||||
welder.WED_WorkCode = Ins.CertificateNumber;// this.txtCertificateNumber.Text.Trim();
|
||||
welder.WED_Class = Ins.QualifiedProjectCode;// this.txtQualifiedProjectCode.Text.Trim();
|
||||
welder.WED_IfOnGuard = Ins.IsOnSite;
|
||||
welder.WED_Remark = Ins.Remark;
|
||||
welder.ProjectId = this.CurrUser.LoginProjectId;
|
||||
// 焊工部分
|
||||
BLL.PersonManageService.UpdateBSWelder(welder);
|
||||
}
|
||||
}
|
||||
}
|
||||
BLL.Sys_CQMS_DataInTempService.DeleteDataInTempByDataInTempID(tempData.TempId);
|
||||
|
||||
@@ -547,14 +547,20 @@ namespace FineUIPro.Web.common
|
||||
{
|
||||
int result = (from x in Funs.DB.BS_Welder
|
||||
where x.WED_IfOnGuard == true
|
||||
select x).Count();
|
||||
select x)
|
||||
.GroupBy(p => p.WED_WorkCode)
|
||||
.Select(g => g.First())
|
||||
.Count();
|
||||
return result;
|
||||
}
|
||||
else
|
||||
{
|
||||
int result = (from x in Funs.DB.BS_Welder
|
||||
where x.WED_IfOnGuard == true && pids.Contains(x.ProjectId)
|
||||
select x).Count();
|
||||
select x)
|
||||
.GroupBy(p => p.WED_WorkCode)
|
||||
.Select(g => g.First())
|
||||
.Count();
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user