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

11

Browse Source
This commit is contained in:
佘春生
2024-07-01 09:29:35 +08:00
parent 3990f747ce
commit 26d1774fb1
35 changed files with 1432 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/JointComprehensive.aspx
+2 -2
View File
@@ -91,8 +91,8 @@
Width="80px">
</f:RenderField>
<f:RenderField HeaderText="焊接位置" ColumnID="WeldingLocationR"
DataField="WeldingLocationR" SortField="WeldingLocationR" FieldType="String" HeaderTextAlign="Center"
<f:RenderField HeaderText="焊接位置" ColumnID="WeldingLocationCode"
DataField="WeldingLocationCode" SortField="WeldingLocationCode" FieldType="String" HeaderTextAlign="Center"
Width="80px">
</f:RenderField>
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/JointComprehensive.aspx.cs
+1 -1
View File
@@ -248,7 +248,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
reportModel.GetRow(rowIndex).GetCell(10).CellStyle = style;
//焊接位置
if (reportModel.GetRow(rowIndex).GetCell(11) == null) reportModel.GetRow(rowIndex).CreateCell(11);
reportModel.GetRow(rowIndex).GetCell(11).SetCellValue(itemOver["WeldingLocationR"].ToString());
reportModel.GetRow(rowIndex).GetCell(11).SetCellValue(itemOver["WeldingLocationCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(11).CellStyle = style;
//管径
if (reportModel.GetRow(rowIndex).GetCell(12) == null) reportModel.GetRow(rowIndex).CreateCell(12);
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx
+2 -2
View File
@@ -79,8 +79,8 @@
DataField="WeldTypeCode" SortField="WeldTypeCode" FieldType="String" HeaderTextAlign="Center"
Width="120px">
</f:RenderField>
<f:RenderField HeaderText="焊接位置<br>Welding Location" ColumnID="WeldingLocationR"
DataField="WeldingLocationR" FieldType="String" HeaderTextAlign="Center"
<f:RenderField HeaderText="焊接位置<br>Welding Location" ColumnID="WeldingLocationCode"
DataField="WeldingLocationCode" FieldType="String" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs
+2 -2
View File
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
/// </summary>
private DataTable GetDataTable()
{
string strSql = @"SELECT weldJoint.WeldJointId,weldJoint.ProjectId,ins.InstallationCode,unit.UnitName,pipeline.PipelineCode,weldJoint.WeldingLocationR,
string strSql = @"SELECT weldJoint.WeldJointId,weldJoint.ProjectId,ins.InstallationCode,unit.UnitName,pipeline.PipelineCode,
(CASE WHEN weldJoint.PageNum IS NOT NULL AND weldJoint.PageNum<>'' THEN pipeline.SingleNumber+'-'+weldJoint.PageNum ELSE pipeline.SingleNumber END) AS SingleNumber,
pipeline.DrawingsNum,CONVERT(NVARCHAR(10),weldingDaily.WeldingDate,120) AS WeldingDate,rate.DetectionRateCode, weldJoint.WeldJointCode,
CAST(ISNULL(weldJoint.Size,0) AS REAL) AS Size,(CAST(ISNULL(weldJoint.Thickness,0) AS REAL)) AS Thickness,weldJoint.Specification,
@@ -283,7 +283,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
//}
//焊接位置
if (reportModel.GetRow(rowIndex).GetCell(5) == null) reportModel.GetRow(rowIndex).CreateCell(5);
reportModel.GetRow(rowIndex).GetCell(5).SetCellValue(itemOver["WeldingLocationR"].ToString());
reportModel.GetRow(rowIndex).GetCell(5).SetCellValue(itemOver["WeldingLocationCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(5).CellStyle = style;
//寸径
if (reportModel.GetRow(rowIndex).GetCell(6) == null) reportModel.GetRow(rowIndex).CreateCell(6);