修改进度模块
This commit is contained in:
@@ -972,7 +972,26 @@ namespace FineUIPro.Web.CQMS.Check
|
||||
if (!string.IsNullOrEmpty(c.HGForms) || !string.IsNullOrEmpty(c.SHForms))
|
||||
{
|
||||
isExitForms = true;
|
||||
break;
|
||||
}
|
||||
//处理工作包实际完成时间
|
||||
if (c.CheckNum != null && c.CheckNum != 0) //检查次数为0表示一直检查
|
||||
{
|
||||
if (c.CheckNum == 1) //检查一次
|
||||
{
|
||||
c.RealEndDate = DateTime.Now;
|
||||
BLL.ControlItemAndCycleService.UpdateControlItemAndCycle(c);
|
||||
BLL.WorkPackageService.UpdateWorkPackageRealEndDate(c.WorkPackageId);
|
||||
}
|
||||
else //检查多次
|
||||
{
|
||||
List<Model.Check_SpotCheckDetail> details = BLL.SpotCheckDetailService.GetSpotCheckDetailsByControlItemAndCycleId(c.ControlItemAndCycleId);
|
||||
if (details.Count == c.CheckNum) //检查次数已达到最大值
|
||||
{
|
||||
c.RealEndDate = DateTime.Now;
|
||||
BLL.ControlItemAndCycleService.UpdateControlItemAndCycle(c);
|
||||
BLL.WorkPackageService.UpdateWorkPackageRealEndDate(c.WorkPackageId);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -567,6 +567,7 @@ namespace FineUIPro.Web.CQMS.WBS
|
||||
}
|
||||
else
|
||||
{
|
||||
oldWorkPackage.WorkPackageCode = workPackageProject.WorkPackageCode;
|
||||
oldWorkPackage.PackageContent = workPackageProject.PackageContent + name;
|
||||
oldWorkPackage.SubItemType = GetSubItemTypeId(values.Value<string>("SubItemType"));
|
||||
BLL.WorkPackageService.UpdateWorkPackage(oldWorkPackage);
|
||||
@@ -670,6 +671,7 @@ namespace FineUIPro.Web.CQMS.WBS
|
||||
}
|
||||
else
|
||||
{
|
||||
oldWorkPackage.WorkPackageCode = workPackageProject.WorkPackageCode;
|
||||
oldWorkPackage.PackageContent = workPackageProject.PackageContent + name;
|
||||
oldWorkPackage.IsApprove = true;
|
||||
oldWorkPackage.SubItemType = GetSubItemTypeId(values.Value<string>("SubItemType"));
|
||||
|
||||
@@ -599,6 +599,7 @@ namespace FineUIPro.Web.CQMS.WBS
|
||||
}
|
||||
else
|
||||
{
|
||||
oldWorkPackage.WorkPackageCode = workPackageProject.WorkPackageCode;
|
||||
oldWorkPackage.PackageContent = workPackageProject.PackageContent + name;
|
||||
oldWorkPackage.SubItemType = GetSubItemTypeId(values.Value<string>("SubItemType"));
|
||||
BLL.WorkPackageService.UpdateWorkPackage(oldWorkPackage);
|
||||
@@ -699,6 +700,7 @@ namespace FineUIPro.Web.CQMS.WBS
|
||||
}
|
||||
else
|
||||
{
|
||||
oldWorkPackage.WorkPackageCode = workPackageProject.WorkPackageCode;
|
||||
oldWorkPackage.PackageContent = workPackageProject.PackageContent + name;
|
||||
oldWorkPackage.IsApprove = true;
|
||||
oldWorkPackage.SubItemType = GetSubItemTypeId(values.Value<string>("SubItemType"));
|
||||
|
||||
Reference in New Issue
Block a user