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

2023-04-04 001

Browse Source
This commit is contained in:
李鹏飞
2023-04-04 16:30:24 +08:00
parent e7295249ff
commit 31a0baf6fe
7 changed files with 102 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
+5 -4
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="03/30/2023 14:31:12" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="04/03/2023 15:49:36" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@@ -99,7 +99,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRGqdFBVtU86qKJnkKElUelG"/>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRHL95wpPPwN6TqtHpqK4gKl"/>
<TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
<Column Name="PrefabricatedComponents" DataType="System.String" PropName="CH_TrustCode"/>
<Column Name="PlanStartDate" DataType="System.String" PropName="CH_TrustMan"/>
@@ -122,6 +122,7 @@ namespace FastReport
<Column Name="MaterialGroup" DataType="System.String"/>
<Column Name="Remark" DataType="System.String"/>
<Column Name="MetalType" DataType="System.String"/>
<Column Name="FlowingSection" DataType="System.String" PropName="Column"/>
</TableDataSource>
<TableDataSource Name="Data" ReferenceName="Data.Data" DataType="System.Int32" Enabled="true">
<Column Name="CH_TrustID" DataType="System.String"/>
@@ -193,8 +194,8 @@ namespace FastReport
</TableRow>
<TableRow Name="Row4" Height="45.36">
<TableCell Name="Cell26"/>
<TableCell Name="Cell16" Text="管线计划安装日期:" VertAlign="Center" Font="宋体, 11pt"/>
<TableCell Name="Cell17" Border.Lines="Bottom" Text="[Table1.PlanStartDate]" VertAlign="Center" Font="宋体, 11pt"/>
<TableCell Name="Cell16" Text="流水段:" VertAlign="Center" Font="宋体, 11pt"/>
<TableCell Name="Cell17" Border.Lines="Bottom" Text="[Table1.FlowingSection]" VertAlign="Center" Font="宋体, 11pt"/>
<TableCell Name="Cell34" HorzAlign="Center" VertAlign="Center" Font="宋体, 11pt"/>
</TableRow>
</TableObject>
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
+1 -1
View File
@@ -363,7 +363,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
string strSql = @" SELECT com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,unitwork.UnitWorkName,
com.PipelineId, punit.UnitName AS PreUnit,aunit.UnitName AS AssembleUnit,mat.PrefabricatedComponents,
com.QRCode,com.State,CONVERT(varchar(100), pipe.PlanStartDate, 23) as PlanStartDate,pipe.PipelineCode,
com.QRCode,com.State,CONVERT(varchar(100), pipe.PlanStartDate, 23) as PlanStartDate,pipe.PipelineCode,pipe.FlowingSection,
('PrePipeline$'+com.PipelineComponentId )as QRCode2,mater.*
FROM HJGL_Pipeline_Component com
LEFT JOIN HJGL_PipeLineMat mat ON mat.PipeLineMatId=com.PipeLineMatId
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
+27 -2
View File
@@ -353,7 +353,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID);
this.hdUnitWorkId.Text = string.Empty;
if (pipeline != null)
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
this.BindGrid();
}
else
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNodeID;
NoAuditBindGrid();
}
}
#endregion
@@ -944,7 +957,19 @@ namespace FineUIPro.Web.HJGL.WeldingManage
protected void ckIsAudit_CheckedChanged(object sender, CheckedEventArgs e)
{
BindGrid();
Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID);
this.hdUnitWorkId.Text = string.Empty;
if (pipeline != null)
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
this.BindGrid();
}
else
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNodeID;
NoAuditBindGrid();
}
}
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx
+6 -2
View File
@@ -123,6 +123,10 @@
<f:RenderField HeaderText="材质2" ColumnID="Material2Code"
DataField="Material2Code" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="140px" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField HeaderText="达因" ColumnID="Size"
DataField="Size" SortField="Size" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField HeaderText="外径" ColumnID="Dia" DataField="Dia" SortField="Dia"
FieldType="Double" HeaderTextAlign="Center" TextAlign="Left" Width="120px" >
@@ -136,8 +140,8 @@
</f:RenderField>
<f:RenderField HeaderText="焊缝类型" ColumnID="WeldTypeCode"
DataField="WeldTypeCode" SortField="WeldTypeCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true">
</f:RenderField>
HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true" Hidden="true">
</f:RenderField>
<f:RenderField HeaderText="焊接方法" ColumnID="WeldingMethodCode"
DataField="WeldingMethodCode" SortField="WeldingMethodCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="140px" ExpandUnusedSpace="true" Hidden="true">