提交代码
This commit is contained in:
@@ -285,24 +285,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
newInspectionEquipment.CompileMan = this.CurrUser.UserId;
|
||||
newInspectionEquipment.CompileDate = DateTime.Now;
|
||||
newInspectionEquipment.Status = BLL.Const.Comprehensive_Compile;
|
||||
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == newInspectionEquipment.InspectionEquipmentId);
|
||||
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
|
||||
{
|
||||
Alert.ShowInTop("请上传附件!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
BLL.InspectionEquipmentService.AddInspectionEquipment(newInspectionEquipment);
|
||||
}
|
||||
else
|
||||
{
|
||||
newInspectionEquipment.InspectionEquipmentId = this.InspectionEquipmentId;
|
||||
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionEquipmentId);
|
||||
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
|
||||
{
|
||||
Alert.ShowInTop("请上传附件!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
var oldInspectionEquipment = Funs.DB.Comprehensive_InspectionEquipment.Where(u => u.InspectionEquipmentId == this.InspectionEquipmentId).FirstOrDefault();
|
||||
if (oldInspectionEquipment == null)
|
||||
{
|
||||
@@ -320,40 +308,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
|
||||
}
|
||||
}
|
||||
//else
|
||||
//{
|
||||
// newInspectionEquipment.InspectionEquipmentId = this.InspectionEquipmentId;
|
||||
// var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionEquipmentId);
|
||||
// if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
|
||||
// {
|
||||
// Alert.ShowInTop("请上传附件!", MessageBoxIcon.Warning);
|
||||
// return;
|
||||
// }
|
||||
// BLL.InspectionEquipmentService.UpdateInspectionEquipment(newInspectionEquipment);
|
||||
//}
|
||||
|
||||
|
||||
//#region 审核记录
|
||||
|
||||
//var approve = InspectionEquipmentApproveService.GetApproveByApproveMan(newInspectionEquipment.InspectionEquipmentId, CurrUser.UserId);
|
||||
//if (approve == null) //未添加审核信息时
|
||||
//{
|
||||
// approve = new Model.Comprehensive_InspectionEquipmentApprove();
|
||||
// approve.InspectionEquipmentId = newInspectionEquipment.InspectionEquipmentId;
|
||||
// approve.ApproveMan = this.CurrUser.UserId;
|
||||
// approve.ApproveType = Const.Comprehensive_Compile;
|
||||
// approve.ApproveDate = DateTime.Now;
|
||||
// InspectionEquipmentApproveService.EditApprove(approve); //新增编制记录
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// approve.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
|
||||
// approve.ApproveIdea = txtidea.Text.Trim();
|
||||
//}
|
||||
|
||||
//#endregion
|
||||
|
||||
|
||||
|
||||
|
||||
ShowNotify("保存成功!", MessageBoxIcon.Success);
|
||||
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
|
||||
@@ -413,23 +368,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
newInspectionEquipment.Status = BLL.Const.Comprehensive_Audit;
|
||||
newInspectionEquipment.InspectionEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson));
|
||||
|
||||
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == newInspectionEquipment.InspectionEquipmentId);
|
||||
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
|
||||
//{
|
||||
// Alert.ShowInTop("请上传附件!", MessageBoxIcon.Warning);
|
||||
// return;
|
||||
//}
|
||||
|
||||
BLL.InspectionEquipmentService.AddInspectionEquipment(newInspectionEquipment);
|
||||
}
|
||||
else
|
||||
{
|
||||
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionEquipmentId);
|
||||
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
|
||||
//{
|
||||
// Alert.ShowInTop("请上传附件!", MessageBoxIcon.Warning);
|
||||
// return;
|
||||
//}
|
||||
newInspectionEquipment.InspectionEquipmentId = this.InspectionEquipmentId;
|
||||
var oldInspectionEquipment = Funs.DB.Comprehensive_InspectionEquipment.Where(u => u.InspectionEquipmentId == this.InspectionEquipmentId).FirstOrDefault();
|
||||
if (oldInspectionEquipment == null) //数据库没有记录 直接点提交 当前状态为 审核状态
|
||||
|
||||
Reference in New Issue
Block a user