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-06-05 08:24:19 +08:00
parent 1677a6d714
commit 3990f747ce
67 changed files with 6774 additions and 1645 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="WeldingLocationCode"
DataField="WeldingLocationCode" SortField="WeldingLocationCode" FieldType="String" HeaderTextAlign="Center"
<f:RenderField HeaderText="焊接位置" ColumnID="WeldingLocationR"
DataField="WeldingLocationR" SortField="WeldingLocationR" 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["WeldingLocationCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(11).SetCellValue(itemOver["WeldingLocationR"].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="WeldingLocationCode"
DataField="WeldingLocationCode" FieldType="String" HeaderTextAlign="Center"
<f:RenderField HeaderText="焊接位置<br>Welding Location" ColumnID="WeldingLocationR"
DataField="WeldingLocationR" FieldType="String" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs
+3 -4
View File
@@ -37,10 +37,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
/// </summary>
private DataTable GetDataTable()
{
string strSql = @"SELECT weldJoint.WeldJointId,weldJoint.ProjectId,ins.InstallationCode,unit.UnitName,pipeline.PipelineCode,
string strSql = @"SELECT weldJoint.WeldJointId,weldJoint.ProjectId,ins.InstallationCode,unit.UnitName,pipeline.PipelineCode,weldJoint.WeldingLocationR,
(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,
(CASE WHEN weldJoint.JointAttribute='固定F' THEN 'F'+weldJoint.WeldJointCode ELSE 'S'+weldJoint.WeldJointCode END) AS WeldJointCode,
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,
weldType.WeldTypeCode,com1.ComponentsCode AS ComponentsName1,mat1.MaterialCode AS MaterialCode1,weldJoint.HeartNo1,
com2.ComponentsCode AS ComponentsName2,mat2.MaterialCode AS MaterialCode2,weldJoint.HeartNo2, WeldMethod.WeldingMethodName,
@@ -284,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["WeldingLocationCode"].ToString());
reportModel.GetRow(rowIndex).GetCell(5).SetCellValue(itemOver["WeldingLocationR"].ToString());
reportModel.GetRow(rowIndex).GetCell(5).CellStyle = style;
//寸径
if (reportModel.GetRow(rowIndex).GetCell(6) == null) reportModel.GetRow(rowIndex).CreateCell(6);
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldSummary.aspx.cs
+15 -9
View File
@@ -35,14 +35,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
{
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
{
listStr.Add(new SqlParameter("@unitId", this.drpUnitId.SelectedValue));
}
else
{
listStr.Add(new SqlParameter("@unitId", null));
}
if (this.drpInstallationId.SelectedValue != BLL.Const._Null)
{
listStr.Add(new SqlParameter("@installationId", this.drpInstallationId.SelectedValue));
@@ -50,6 +43,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
else
{
listStr.Add(new SqlParameter("@installationId", null));
}
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
{
listStr.Add(new SqlParameter("@unitId", this.drpUnitId.SelectedValue));
}
else
{
listStr.Add(new SqlParameter("@unitId", null));
}
if (this.drpWorkAreaId.SelectedValue != BLL.Const._Null)
{
@@ -61,7 +63,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
}
if (this.drpPipingClassId.SelectedValue!=BLL.Const._Null)
{
listStr.Add(new SqlParameter("@pipingClassId", this.drpWorkAreaId.SelectedValue));
listStr.Add(new SqlParameter("@pipingClassId", this.drpPipingClassId.SelectedValue));
}
else
{
@@ -71,6 +73,10 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
{
listStr.Add(new SqlParameter("@ndeCode", this.txtNDECode.Text.Trim()));
}
else
{
listStr.Add(new SqlParameter("@ndeCode", null));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunProc("sp_rpt_WeldSummary", parameter);
this.Grid1.RecordCount = tb.Rows.Count;