shecs/Basf_EProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
佘春生
2024-06-21 17:46:05 +08:00
parent b4cb26f6f8
commit 8368dfde9b
18 changed files with 572 additions and 1244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx.cs
+14 -3
View File
@@ -173,6 +173,7 @@ namespace FineUIPro.Web.EditorManage
this.txtBC_CloseDate.Text = eproject.ProjectControl_BC_CloseDate == null ? "" : string.Format("{0:yyyy-MM-dd}", eproject.ProjectControl_BC_CloseDate);
this.txtCancelDate.Text = eproject.ProjectControl_PC_CancelDate == null ? "" : string.Format("{0:yyyy-MM-dd}", eproject.ProjectControl_PC_CancelDate);
this.txtHold.Text = eproject.Job_Hold == null ? "" : string.Format("{0:yyyy-MM-dd}", eproject.Job_Hold);
this.txtCAPEXPlanNo.Text = eproject.CAPEXPlanNo;
this.txtStudyWo.Text = eproject.StudyWo;
this.drpCTEInvolved.SelectedValue = eproject.CTEInvolved;
@@ -541,6 +542,7 @@ namespace FineUIPro.Web.EditorManage
eProject.ProjectControl_MS_Approval = Funs.GetNewDateTime(this.txtMS_Approval.Text.Trim());
eProject.ProjectControl_MS_MC = Funs.GetNewDateTime(this.txtMS_MC.Text.Trim());
eProject.ProjectControl_MS_Close = Funs.GetNewDateTime(this.txtMS_Close.Text.Trim());
eProject.Job_Hold = Funs.GetNewDateTime(this.txtHold.Text.Trim());
eProject.PM_SC_ApprovedQty = Funs.GetNewInt(txtPM_SC_ApprovedQty.Text.Trim());
eProject.PM_SC_ApprovedCost = Funs.GetNewDecimal(txtPM_SC_ApprovedCost.Text.Trim());
@@ -679,6 +681,10 @@ namespace FineUIPro.Web.EditorManage
{
operationLog += "Cancel Date 由" + (pro.ProjectControl_PC_CancelDate == null ? "" : string.Format("{0:yyyy-MM-dd}", pro.ProjectControl_PC_CancelDate)) + "修改为" + this.txtCancelDate.Text.Trim() + "，";
}
if (pro.Job_Hold != Funs.GetNewDateTime(this.txtHold.Text.Trim()))
{
operationLog += "Hold Date 由" + (pro.Job_Hold == null ? "" : string.Format("{0:yyyy-MM-dd}", pro.Job_Hold)) + "修改为" + this.txtHold.Text.Trim() + "，";
}
if (pro.ProjectControl_MS_ResourcePlanReceived != Funs.GetNewDateTime(this.txtResourcePlanReceived.Text.Trim()))
{
operationLog += "Resource Plan Received 由" + (pro.ProjectControl_MS_ResourcePlanReceived == null ? "" : string.Format("{0:yyyy-MM-dd}", pro.ProjectControl_MS_ResourcePlanReceived)) + "修改为" + this.txtResourcePlanReceived.Text.Trim() + "，";
@@ -1030,6 +1036,11 @@ namespace FineUIPro.Web.EditorManage
{
eproject.ProjectControl_JobStatus = "Cancelled";
}
if (!string.IsNullOrEmpty(this.txtHold.Text))//Hold Date有输入时,状态为Hold
{
eproject.ProjectControl_JobStatus = "Hold";
}
if (pro.ProjectControl_JobStatus != eproject.ProjectControl_JobStatus)
{
operationLog += "Job Status 由" + pro.ProjectControl_JobStatus + "修改为" + eproject.ProjectControl_JobStatus + "，";
@@ -1039,10 +1050,10 @@ namespace FineUIPro.Web.EditorManage
eproject.EProjectId = eProject.EProjectId;
BLL.EProjectService.UpdateProjectJobStatus(eproject);
// 当eproject状态为Cancelled或Hold时更新人工时状态
if (eproject.ProjectControl_JobStatus == "Cancelled" || eproject.ProjectControl_JobStatus == "Hold")
// 当eproject状态为Cancelled或Hold时更新人工时状态: 如日期不为空改为一个月后触发状态
if ((eproject.ProjectControl_JobStatus == "Cancelled" && !eproject.ProjectControl_PC_CancelDate.HasValue) || (eproject.ProjectControl_JobStatus == "Hold" && !eproject.Job_Hold.HasValue))
{
var updatePlan = Funs.DB.ManHours_Plan.Where(x => x.EProjectId == eProject.EProjectId);
if (updatePlan != null)