提交代码

This commit is contained in:
2023-11-23 16:50:57 +08:00
parent aedd071d96
commit 1530dd850b
27 changed files with 974 additions and 250 deletions
@@ -170,7 +170,18 @@ namespace FineUIPro.Web.CQMS.PersonManage
//newWelder.Sex = this.rblSex.SelectedValue;
//newWelder.Birthday = Funs.GetNewDateTime(this.txtBirthday.Text.Trim());
newWelder.IdentityCard = this.txtIdentityCard.Text.Trim();
newWelder.CertificateCode = this.txtCertificateCode.Text.Trim();
if (!string.IsNullOrEmpty(this.txtCertificateCode.Text.Trim()))
{
newWelder.CertificateCode = this.txtCertificateCode.Text.Trim();
}
else
{
var welder = BLL.SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId, PersonId);
if (welder != null)
{
newWelder.CertificateCode = welder.IdentityCard;
}
}
//newWelder.CertificateLimitTime = Funs.GetNewDateTime(this.txtCertificateLimitTime.Text.Trim());
newWelder.WelderLevel = this.txtWelderLevel.Text.Trim();
//if (this.cbIsOnDuty.Checked)
@@ -184,10 +195,10 @@ namespace FineUIPro.Web.CQMS.PersonManage
newWelder.Remark = this.txtRemark.Text.Trim();
//newWelder.PhotoUrl = this.PhotoAttachUrl;
newWelder.Isprint = "0";
// newWelder.IsUsed = true;
// newWelder.IsUsed = true;
if (!string.IsNullOrEmpty(PersonId))
{
if (!BLL.WelderService.IsExisWelderCode(PersonId, this.txtWelderCode.Text))
if (!BLL.WelderService.IsExisWelderCode(PersonId, this.txtWelderCode.Text, this.CurrUser.LoginProjectId))
{
newWelder.PersonId = PersonId;
BLL.WelderService.UpdateWelder(newWelder);
@@ -201,7 +212,7 @@ namespace FineUIPro.Web.CQMS.PersonManage
else
{
PersonId = SQLHelper.GetNewID(typeof(Model.SitePerson_Person));
if (!BLL.WelderService.IsExisWelderCode(PersonId, this.txtWelderCode.Text))
if (!BLL.WelderService.IsExisWelderCode(PersonId, this.txtWelderCode.Text, this.CurrUser.LoginProjectId))
{
newWelder.PersonId = PersonId;
// BLL.WelderService.AddWelder(newWelder);