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

feat(hjgl)焊前准备，日报管理增加附件

Browse Source
This commit is contained in:
李鹏飞
2026-06-24 16:56:00 +08:00
parent dfc9095282
commit 4670220614
23 changed files with 598 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
+38 -9
View File
@@ -202,23 +202,36 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Grid1.DataBind();
return;
}
string strSql = @"SELECT WeldingDailyId,WeldJointId,PipelineCode,WeldJointCode,
BackingWelderCode,CoverWelderCode,Material1Code,Material2Code,
Dia,DNDia,Thickness,WeldTypeCode,WeldingMethodCode,WeldingWireCode,WeldingMode,
WeldingRodCode,Size,JointAttribute,CoverWelderTeamGroupName,BackingWelderTeamGroupName,WeldingLocationCode
string strSql = @"SELECT jot.WeldingDailyId,jot.WeldJointId,jot.PipelineCode,jot.WeldJointCode,
jot.BackingWelderCode,jot.CoverWelderCode,jot.Material1Code,jot.Material2Code,
jot.Dia,jot.DNDia,jot.Thickness,jot.WeldTypeCode,jot.WeldingMethodCode,jot.WeldingWireCode,jot.WeldingMode,
jot.WeldingRodCode,jot.Size,jot.JointAttribute,jot.CoverWelderTeamGroupName,jot.BackingWelderTeamGroupName,jot.WeldingLocationCode,
beforeAtt.AttachUrl AS BeforePhotoUrl,
afterAtt.AttachUrl AS AfterPhotoUrl
FROM dbo.View_HJGL_WeldJoint
WHERE WeldingDailyId=@WeldingDailyId";
FROM dbo.View_HJGL_WeldJoint AS jot
OUTER APPLY (
SELECT TOP 1 temp.TempDetailId
FROM dbo.HJGL_WeldingDailyTempDetail AS temp
WHERE temp.WeldJointId = jot.WeldJointId AND temp.AuditState = 1
ORDER BY temp.AuditDate DESC, temp.SubmitDate DESC
) AS reportTemp
LEFT JOIN dbo.AttachFile AS beforeAtt ON beforeAtt.MenuId = @WeldReportMenuId
AND beforeAtt.ToKeyId = reportTemp.TempDetailId + '#Before'
LEFT JOIN dbo.AttachFile AS afterAtt ON afterAtt.MenuId = @WeldReportMenuId
AND afterAtt.ToKeyId = reportTemp.TempDetailId + '#After'
WHERE jot.WeldingDailyId=@WeldingDailyId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@WeldingDailyId", tvControlItem.SelectedNodeID));
listStr.Add(new SqlParameter("@WeldReportMenuId", Const.HJGL_WeldReportMenuId));
if (!string.IsNullOrEmpty(txtPipelineCode.Text.Trim()))
{
strSql += " AND PipelineCode LIKE @pipelineCode ";
strSql += " AND jot.PipelineCode LIKE @pipelineCode ";
listStr.Add(new SqlParameter("@pipelineCode", "%" + this.txtPipelineCode.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(txtWelderCode.Text.Trim()))
{
strSql += " AND (BackingWelderCode LIKE @welderCode OR CoverWelderCode LIKE @welderCode)";
strSql += " AND (jot.BackingWelderCode LIKE @welderCode OR jot.CoverWelderCode LIKE @welderCode)";
listStr.Add(new SqlParameter("@welderCode", "%" + this.txtWelderCode.Text.Trim() + "%"));
}
SqlParameter[] parameter = listStr.ToArray();
@@ -263,16 +276,23 @@ namespace FineUIPro.Web.HJGL.WeldingManage
jot.Thickness,
jot.WeldingMethodCode,
submitPerson.PersonName AS SubmitPersonName,
temp.SubmitDate
temp.SubmitDate,
beforeAtt.AttachUrl AS BeforePhotoUrl,
afterAtt.AttachUrl AS AfterPhotoUrl
FROM dbo.HJGL_WeldingDailyTempDetail AS temp
LEFT JOIN dbo.View_HJGL_WeldJoint AS jot ON jot.WeldJointId = temp.WeldJointId
LEFT JOIN dbo.SitePerson_Person AS coverWelder ON coverWelder.PersonId = temp.CoverWelderId
LEFT JOIN dbo.SitePerson_Person AS backingWelder ON backingWelder.PersonId = temp.BackingWelderId
LEFT JOIN dbo.Base_WeldingLocation AS location ON location.WeldingLocationId = temp.WeldingLocationId
LEFT JOIN dbo.Person_Persons AS submitPerson ON submitPerson.PersonId = temp.SubmitPersonId
LEFT JOIN dbo.AttachFile AS beforeAtt ON beforeAtt.MenuId = @WeldReportMenuId
AND beforeAtt.ToKeyId = temp.TempDetailId + '#Before'
LEFT JOIN dbo.AttachFile AS afterAtt ON afterAtt.MenuId = @WeldReportMenuId
AND afterAtt.ToKeyId = temp.TempDetailId + '#After'
WHERE temp.ProjectId = @ProjectId AND temp.AuditState = 0";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@WeldReportMenuId", Const.HJGL_WeldReportMenuId));
var unitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
if (unitWork == null)
@@ -380,7 +400,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
#endregion
#endregion
protected string ConvertImageUrlByImage(object photoUrl)
{
string url = string.Empty;
if (photoUrl != null)
{
url = BLL.UploadAttachmentService.ShowImage("../../", photoUrl.ToString());
}
return url;
}
#region 焊接日报 维护事件
/// <summary>