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

提交代码

Browse Source
This commit is contained in:
高飞
2023-12-01 16:24:41 +08:00
parent 32c14198db
commit b696a63438
6 changed files with 287 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx
+2 -2
View File
@@ -108,8 +108,8 @@
DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
<f:RenderField HeaderText="完成状态" ColumnID="UnitWorkCode1" DataField="UnitWorkCode1"
SortField="UnitWorkCode" FieldType="String" HeaderTextAlign="Center" Width="100px">
<f:RenderField HeaderText="完成状态" ColumnID="IsWeldOK" DataField="IsWeldOK"
SortField="IsWeldOK" FieldType="String" HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="单位名称" ColumnID="UnitName" DataField="UnitName"
SortField="UnitName" FieldType="String" HeaderTextAlign="Center" Width="180px">
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
+1
View File
@@ -492,6 +492,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
select new
{
焊口号 = x.WeldJointCode,
完成状态 = x.IsWeldOK,
单位名称 = x.UnitName,
流水段 = x.FlowingSection,
材质1 = x.Material1Code,
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx
+4
View File
@@ -119,6 +119,10 @@
DataField="FinishSize" SortField="FinishSize" FieldType="Double" HeaderTextAlign="Center"
TextAlign="Left" Width="90px" Locked="true">
</f:RenderField>
<f:RenderField HeaderText="完成焊口" ColumnID="FinishJointCount"
DataField="FinishJointCount" SortField="FinishJointCount" FieldType="Int" HeaderTextAlign="Center"
TextAlign="Left" Width="90px" Locked="true">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="TotalDin" DataField="TotalDin" FieldType="Double"
HeaderText="总达因数" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
+3 -2
View File
@@ -311,10 +311,11 @@ namespace FineUIPro.Web.HJGL.InfoQuery
select new
{
管线号 = x.PipelineCode,
是否完成=x. IsFinished,
是否完成= x.IsFinished,
完成日期=x.FinishedDate,
完成达因=x.FinishSize,
总达因数=x.TotalDin,
完成焊口=x.FinishJointCount,
总达因数 =x.TotalDin,
总焊口量=x.JointCount,
单位名称=x.UnitName,
探伤比例=x.DetectionRateCode,
SGGL/Model/Model.cs
+36
View File
@@ -272185,6 +272185,8 @@ namespace Model
private System.Nullable<int> _JointCount;
private System.Nullable<int> _FinishJointCount;
private string _UnitName;
private string _UnitWorkCode;
@@ -272763,6 +272765,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FinishJointCount", DbType="Int")]
public System.Nullable<int> FinishJointCount
{
get
{
return this._FinishJointCount;
}
set
{
if ((this._FinishJointCount != value))
{
this._FinishJointCount = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(200)")]
public string UnitName
{
@@ -273719,6 +273737,8 @@ namespace Model
private string _IsWelding;
private string _IsWeldOK;
private string _IsHotProessStr;
private string _BackingWelderName;
@@ -275341,6 +275361,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsWeldOK", DbType="VarChar(6) NOT NULL", CanBeNull=false)]
public string IsWeldOK
{
get
{
return this._IsWeldOK;
}
set
{
if ((this._IsWeldOK != value))
{
this._IsWeldOK = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsHotProessStr", DbType="VarChar(2) NOT NULL", CanBeNull=false)]
public string IsHotProessStr
{