20240429 修改综合管理导入导出
This commit is contained in:
@@ -153,7 +153,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
this.rblIsOnFile.SelectedValue = "false";
|
||||
}
|
||||
}
|
||||
this.txtRemarkCode.Text = dataReceivingDoc.RemarkCode;
|
||||
this.txtRemarkCode.Text = dataReceivingDoc.RemarkCode.HasValue ? dataReceivingDoc.RemarkCode.ToString() : "";
|
||||
|
||||
//var currApprove = DataReceivingDocApproveService.GetCurrentApprove(dataReceivingDoc.DataReceivingDocId);
|
||||
//if (currApprove != null)
|
||||
@@ -212,7 +212,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
Alert.ShowInTop("请选择专业!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
var q = Funs.DB.Comprehensive_DataReceivingDoc.FirstOrDefault(x => x.RemarkCode == this.txtRemarkCode.Text.Trim() && (x.DataReceivingDocId != this.DataReceivingDocId || (this.DataReceivingDocId == null && x.DataReceivingDocId != null)));
|
||||
var q = Funs.DB.Comprehensive_DataReceivingDoc.FirstOrDefault(x => x.RemarkCode ==Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DataReceivingDocId != this.DataReceivingDocId || (this.DataReceivingDocId == null && x.DataReceivingDocId != null)));
|
||||
if (q != null)
|
||||
{
|
||||
Alert.ShowInTop("标志编号已存在!", MessageBoxIcon.Warning);
|
||||
@@ -274,7 +274,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
{
|
||||
dataReceivingDoc.IsOnFile = Convert.ToBoolean(this.rblIsOnFile.SelectedValue);
|
||||
}
|
||||
dataReceivingDoc.RemarkCode = this.txtRemarkCode.Text.Trim();
|
||||
dataReceivingDoc.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
|
||||
//if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
|
||||
//{
|
||||
// dataReceivingDoc.AuditMan = drpAudit.SelectedValue;
|
||||
|
||||
Reference in New Issue
Block a user