20240429 修改综合管理导入导出
This commit is contained in:
@@ -106,6 +106,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
this.drpUnitWorkIds.SelectedValueArray = inspectionPerson.UnitWorkId.Split(',');
|
||||
}
|
||||
this.txtRemark.Text = inspectionPerson.Remark;
|
||||
this.txtRemarkCode.Text = inspectionPerson.RemarkCode.HasValue ? inspectionPerson.RemarkCode.ToString() : "";
|
||||
|
||||
|
||||
var currApprove = InspectionPersonApproveService.GetCurrentApprove(inspectionPerson.InspectionPersonId);
|
||||
@@ -172,7 +173,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
this.txtValidityDate.Readonly = true;
|
||||
this.drpPostId.Readonly = true;
|
||||
this.drpAudit.Readonly = true;
|
||||
this.drpUnitWorkIds.Readonly = true;
|
||||
this.drpUnitWorkIds.Readonly = true;
|
||||
this.txtRemarkCode.Readonly = true;
|
||||
//this.btnAttach.Enabled = false;
|
||||
|
||||
}
|
||||
@@ -223,6 +225,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
return;
|
||||
}
|
||||
}
|
||||
var q = Funs.DB.Comprehensive_InspectionPerson.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.InspectionPersonId != this.InspectionPersonId || (this.InspectionPersonId == null && x.InspectionPersonId != null)));
|
||||
if (q != null)
|
||||
{
|
||||
Alert.ShowInTop("标志编号已存在!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
// 焊工部分
|
||||
Model.BS_Welder welder = new Model.BS_Welder();
|
||||
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
|
||||
@@ -307,6 +315,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
inspectionPerson.DepartureTime = Convert.ToDateTime(this.txtDepartureTime.Text.ToString());
|
||||
}
|
||||
inspectionPerson.Remark = this.txtRemark.Text.Trim();
|
||||
inspectionPerson.RemarkCode =Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
|
||||
string ids = string.Empty;
|
||||
var lists = this.drpUnitWorkIds.SelectedValueArray;
|
||||
foreach (var item in lists)
|
||||
@@ -401,6 +410,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
return;
|
||||
}
|
||||
}
|
||||
var q = Funs.DB.Comprehensive_InspectionPerson.FirstOrDefault(x => x.RemarkCode ==Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.InspectionPersonId != this.InspectionPersonId || (this.InspectionPersonId == null && x.InspectionPersonId != null)));
|
||||
if (q != null)
|
||||
{
|
||||
Alert.ShowInTop("标志编号已存在!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
// 焊工部分
|
||||
Model.BS_Welder welder = new Model.BS_Welder();
|
||||
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
|
||||
@@ -486,6 +501,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
inspectionPerson.DepartureTime = Convert.ToDateTime(this.txtDepartureTime.Text.ToString());
|
||||
}
|
||||
inspectionPerson.Remark = this.txtRemark.Text.Trim();
|
||||
inspectionPerson.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
|
||||
string ids = string.Empty;
|
||||
var lists = this.drpUnitWorkIds.SelectedValueArray;
|
||||
foreach (var item in lists)
|
||||
|
||||
Reference in New Issue
Block a user