feat(hjgl): 完善焊接任务与质量管理流程
This commit is contained in:
@@ -201,6 +201,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
this.txtUnitWorkName.Text = UnitWork.UnitWorkName;
|
||||
}
|
||||
}
|
||||
InitTeamGroupDropDown();
|
||||
var currentTask = Funs.DB.HJGL_WeldTask.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.TaskCode == this.txtTaskCode.Text.Trim());
|
||||
if (currentTask != null && !string.IsNullOrEmpty(currentTask.TeamGroupId))
|
||||
{
|
||||
drpTeamGroup.SelectedValue = currentTask.TeamGroupId;
|
||||
}
|
||||
this.InitTreeMenu();//加载树
|
||||
}
|
||||
}
|
||||
@@ -385,6 +392,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
Funs.FineUIPleaseSelect(drpFlowingSection);
|
||||
}
|
||||
|
||||
private void InitTeamGroupDropDown()
|
||||
{
|
||||
TeamGroupService.InitTeamGroupProjectUnitDropDownList(
|
||||
drpTeamGroup, this.CurrUser.LoginProjectId, drpUnit.SelectedValue, true);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region 管线查询
|
||||
@@ -512,6 +525,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
NewTask.ProjectId = this.CurrUser.LoginProjectId;
|
||||
NewTask.UnitWorkId = this.UnitWorkId;
|
||||
NewTask.UnitId = drpUnit.SelectedValue;
|
||||
NewTask.TeamGroupId = drpTeamGroup.SelectedValue == Const._Null ? null : drpTeamGroup.SelectedValue;
|
||||
|
||||
NewTask.TaskCode = this.txtTaskCode.Text.Trim();
|
||||
NewTask.SerialNumber = SerialNumber;
|
||||
@@ -595,6 +609,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
BLL.WeldJointService.UpdateWeldJoint(weldJoint);
|
||||
BLL.WeldTaskService.AddWeldTask(NewTask);
|
||||
}
|
||||
// 编辑任务单时同步更新同一TaskCode已有的全部焊口记录。
|
||||
BLL.WeldTaskService.UpdateTaskTeamGroup(this.CurrUser.LoginProjectId,
|
||||
this.txtTaskCode.Text.Trim(), drpTeamGroup.SelectedValue);
|
||||
//string pipelineId = this.tvControlItem.SelectedNodeID;
|
||||
//var model = BLL.PipelineService.GetPipelineByPipelineId(pipelineId);
|
||||
//model.State = 1;
|
||||
@@ -646,7 +663,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
this.txtTaskCode.Text = BLL.WeldTaskService.GetTaskCodeByDate(this.CurrUser.LoginProjectId, this.txtTaskDate.Text, UnitWorkId, drpUnit.SelectedValue);
|
||||
|
||||
InitTeamGroupDropDown();
|
||||
}
|
||||
protected void drpJointAttribute_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
@@ -708,4 +725,4 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user