lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+12 -12
View File
@@ -140,7 +140,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWork, this.CurrUser.LoginProjectId, true);
Base_WeldingLocationServie.InitWeldingLocationDropDownList(this.drpWeldingLocationId,true);
Base_WeldingLocationServie.InitWeldingLocationDropDownList(this.drpWeldingLocationId, true);
var report = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(this.WeldingDailyId);
if (report != null)
@@ -179,7 +179,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
//txtWeldingDate.MaxDate = DateTime.Now;
this.txtWeldingDate.Text = string.Format("{0:yyyy-MM-dd}", System.DateTime.Now);
this.txtTableDate.Text = string.Format("{0:yyyy-MM-dd}", System.DateTime.Now);
this.txtTableDate.Text = string.Format("{0:yyyy-MM-dd}", System.DateTime.Now);
string perfix = string.Format("{0:yyyyMMdd}", System.DateTime.Now) + "-" + this.CurrUser.PersonName + "-";
this.txtWeldingDailyCode.Text = BLL.SQLHelper.RunProcNewId("SpGetThreeNumber", "dbo.HJGL_WeldingDaily", "WeldingDailyCode", this.CurrUser.LoginProjectId, perfix);
}
@@ -227,7 +227,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
var weldJointIds = (from x in list
where x.UnitWorkId == this.UnitWorkId && x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text)
&& x.WeldingDailyId == null
&& x.WeldingDailyId == null
select x).ToList();
weldJointIds = weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.OrderByDescending(x => x.TaskDate).First()).ToList();
task = weldJointIds;
@@ -307,14 +307,14 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
string stateName = string.Empty;
if (PipeArea != null && !string.IsNullOrEmpty(PipeArea.ToString()))
{
string txt = PipelineService.GetPipeArea().FirstOrDefault(x => x.Value == PipeArea.ToString())?.Text;
return txt;
string txt = PipelineService.GetPipeArea().FirstOrDefault(x => x.Value == PipeArea.ToString())?.Text;
return txt;
}
return stateName;
}
#region 焊接日报 提交事件
@@ -461,7 +461,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
return;
}
if (this.drpUnit.SelectedValue==BLL.Const._Null)
if (this.drpUnit.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择单位名称！", MessageBoxIcon.Warning);
return;
@@ -867,7 +867,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
newWeldJoint.WeldingDailyCode = this.txtWeldingDailyCode.Text.Trim();
newWeldJoint.CoverWelderId = coverWelderId;
newWeldJoint.BackingWelderId = backingWelderId;
newWeldJoint.CoverWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId,coverWelderId).TeamGroupId;
newWeldJoint.CoverWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId, coverWelderId).TeamGroupId;
newWeldJoint.BackingWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId, backingWelderId).TeamGroupId;
//if (item.WeldingLocationId != Const._Null)
//{
@@ -1002,7 +1002,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
updateWeldJoint.WeldingDailyCode = null;
updateWeldJoint.CoverWelderId = null;
updateWeldJoint.BackingWelderId = null;
updateWeldJoint.CoverWelderTeamGroupId= null;
updateWeldJoint.CoverWelderTeamGroupId = null;
updateWeldJoint.BackingWelderTeamGroupId = null;
BLL.WeldJointService.UpdateWeldJoint(updateWeldJoint);
}