提交代码

2023-12-01 16:24:41 +08:00
parent 32c14198db
commit b696a63438
6 changed files with 287 additions and 4 deletions
@@ -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">
@@ -492,6 +492,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
                     select new
                     {
                         焊口号 = x.WeldJointCode,
+                         完成状态 = x.IsWeldOK,
                         单位名称 = x.UnitName,
                         流水段 = x.FlowingSection,
                         材质1 = x.Material1Code,
@@ -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>
@@ -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,