修改质量报验
This commit is contained in:
@@ -351,7 +351,8 @@ namespace FineUIPro.Web.CQMS.Material
|
||||
test.CompileDate = DateTime.Now;
|
||||
BLL.CQMS_MaterialTestService.AddMaterialTest(test);
|
||||
}
|
||||
inspection.State = BLL.Const.Inspection_SpotCheck;
|
||||
//inspection.State = BLL.Const.Inspection_SpotCheck;
|
||||
inspection.State = BLL.Const.Inspection_Complete;
|
||||
}
|
||||
else if (inspection.IsSpotCheck == false && inspection.IsNoticeAndSupervision == true && (inspection.State == BLL.Const.Inspection_Compile || inspection.State == BLL.Const.Inspection_ReCompile)) //生成告知和监检记录
|
||||
{
|
||||
@@ -366,11 +367,13 @@ namespace FineUIPro.Web.CQMS.Material
|
||||
noticeAndSupervision.CompileDate = DateTime.Now;
|
||||
BLL.CQMS_NoticeAndSupervisionService.AddNoticeAndSupervision(noticeAndSupervision);
|
||||
}
|
||||
inspection.State = this.drpHandleType.SelectedValue;
|
||||
//inspection.State = this.drpHandleType.SelectedValue;
|
||||
inspection.State = BLL.Const.Inspection_Complete;
|
||||
}
|
||||
else
|
||||
{
|
||||
inspection.State = this.drpHandleType.SelectedValue;
|
||||
//inspection.State = this.drpHandleType.SelectedValue;
|
||||
inspection.State = BLL.Const.Inspection_Complete;
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -403,14 +406,14 @@ namespace FineUIPro.Web.CQMS.Material
|
||||
approve1.ApproveIdea = this.txtOpinions.Text.Trim();
|
||||
approve1.IsAgree = Convert.ToBoolean(this.RadioButtonList1.SelectedValue);
|
||||
BLL.CQMS_InspectionApproveService.UpdateInspectionApprove(approve1);
|
||||
Model.Material_InspectionApprove approve = new Model.Material_InspectionApprove();
|
||||
approve.InspectionId = inspection.InspectionId;
|
||||
if (this.drpHandleMan.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
approve.ApproveMan = this.drpHandleMan.SelectedValue;
|
||||
}
|
||||
approve.ApproveType = this.drpHandleType.SelectedValue;
|
||||
BLL.CQMS_InspectionApproveService.AddInspectionApprove(approve);
|
||||
//Model.Material_InspectionApprove approve = new Model.Material_InspectionApprove();
|
||||
//approve.InspectionId = inspection.InspectionId;
|
||||
//if (this.drpHandleMan.SelectedValue != BLL.Const._Null)
|
||||
//{
|
||||
// approve.ApproveMan = this.drpHandleMan.SelectedValue;
|
||||
//}
|
||||
//approve.ApproveType = this.drpHandleType.SelectedValue;
|
||||
//BLL.CQMS_InspectionApproveService.AddInspectionApprove(approve);
|
||||
}
|
||||
}
|
||||
LogService.AddSys_Log(CurrUser, inspection.InspectionCode, inspection.InspectionId, Const.InspectionMenuId, "修改报验管理");
|
||||
|
||||
Reference in New Issue
Block a user