2023-10-25

This commit is contained in:
2023-10-25 19:44:10 +08:00
parent 127146e24a
commit fa939f60d3
66 changed files with 522 additions and 636 deletions
@@ -79,6 +79,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (!IsPostBack)
{
this.PipelineId = Request.Params["PipelineId"];
Base_MediumService.InitMediumDropDownList(this.drpMedium, this.CurrUser.LoginProjectId, true);
Base_TestMediumService.InitMediumDropDownList(this.drpTestMedium, "1", true);
@@ -89,6 +90,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Base_TestMediumService.InitMediumDropDownList(this.drpLeakMedium, "2", true);
Base_PurgeMethodService.InitPurgeMethodDropDownList(this.drpPCMedium, true, "-请选择-");
BLL.Base_MaterialService.InitMaterialDropDownList(this.drpMaterial, true, "请选择");//材质1
Model.Project_Sys_Set pressUnit = BLL.Project_SysSetService.GetSysSetBySetId("8", this.CurrUser.LoginProjectId);
if (pressUnit != null && pressUnit.SetValue == "2")
{
@@ -99,12 +101,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
if (!string.IsNullOrEmpty(this.PipelineId))
{
Model.View_HJGL_Pipeline pipeline = BLL.PipelineService.GetViewPipelineByPipelineId(this.PipelineId);
BLL.UnitService.InitUnitDropDownListByUnitIds(this.drpUnit, UnitWorkService.getUnitWorkByUnitWorkId(pipeline.UnitWorkId).UnitId, true);//单位
this.ProjectId = pipeline.ProjectId;
this.UnitId = pipeline.UnitId;
this.UnitWorkId = pipeline.UnitWorkId;
this.txtPipelineCode.Text = pipeline.PipelineCode;
this.txtUnitName.Text = pipeline.UnitName;
//this.txtUnitName.Text = pipeline.UnitName;
drpUnit.SelectedValue=pipeline.UnitId;
this.txtSingleName.Text = pipeline.SingleName;
if (!string.IsNullOrEmpty(pipeline.MediumId))
@@ -181,12 +187,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
this.UnitWorkId = Request.Params["UnitWorkId"];
Model.WBS_UnitWork workArea = BLL.UnitWorkService.getUnitWorkByUnitWorkId(this.UnitWorkId);
BLL.UnitService.InitUnitDropDownListByUnitIds(this.drpUnit, workArea.UnitId, false);//单位
if (workArea != null)
{
this.ProjectId = workArea.ProjectId;
this.UnitId = workArea.UnitId;
this.ProjectId = workArea.ProjectId;
//this.InstallationId = workArea.InstallationId;
this.txtUnitName.Text = BLL.UnitService.GetUnitNameByUnitId(this.UnitId);
}
}
}
@@ -229,7 +235,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Model.HJGL_Pipeline pipeline = new Model.HJGL_Pipeline();
pipeline.ProjectId = this.ProjectId;
//pipeline.InstallationId = this.InstallationId;
pipeline.UnitId = this.UnitId;
pipeline.UnitId = drpUnit.SelectedValue;
pipeline.UnitWorkId = this.UnitWorkId;
pipeline.PipelineCode = this.txtPipelineCode.Text.Trim();
if (this.drpDetectionRate.SelectedValue != BLL.Const._Null)