2023-11-30

SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="09/09/2023 21:57:15" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="11/30/2023 10:26:25" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -89,7 +89,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFcxhCjhMIeesNn1NxRCHvA">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREC3I52kLS76GZ92OXWS6NB">
       <TableDataSource Name="Table1" Alias="Head" DataType="System.Int32" Enabled="true" SelectCommand="select * from CH_Trust where CH_TrustID=@CH_TrustID">
         <Column Name="CH_TrustID" DataType="System.String"/>
         <Column Name="CH_TrustCode" DataType="System.String"/>
@@ -216,7 +216,7 @@ namespace FastReport
           <TableCell Name="Cell41" Border.Lines="All" Text="检测时机" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
           <TableCell Name="Cell42" Border.Lines="All" Text="焊后" HorzAlign="Center" VertAlign="Center"/>
           <TableCell Name="Cell59" Border.Lines="All" Text="检测标准" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
-          <TableCell Name="Cell64" Border.Lines="All" Text="[Table1.CH_NDTCriteria]" HorzAlign="Center" VertAlign="Center" ColSpan="2"/>
+          <TableCell Name="Cell64" Border.Lines="All" Text="NB/T47013.2-2015" HorzAlign="Center" VertAlign="Center" ColSpan="2"/>
           <TableCell Name="Cell69" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
         </TableRow>
         <TableRow Name="Row10" Height="34.4">
@@ -241,7 +241,7 @@ namespace FastReport
         </TableRow>
       </TableObject>
     </PageHeaderBand>
-    <DataBand Name="Data1" Top="287.35" Width="718.2" Height="71.82">
+    <DataBand Name="Data1" Top="287.5" Width="718.2" Height="71.82">
       <TableObject Name="Tabel_Data" Left="18.9" Width="699.18" Height="71.82" Border.Lines="Top" ManualBuildEvent="Tabel_Data_ManualBuild">
         <TableColumn Name="Column21" Width="69.91"/>
         <TableColumn Name="Column22" Width="117.16"/>
@@ -272,8 +272,8 @@ namespace FastReport
           <TableCell Name="Cell144" Border.Lines="All" Text="[Data.Remark]" HorzAlign="Center" VertAlign="Center"/>
         </TableRow>
       </TableObject>
-      <DataFooterBand Name="DataFooter1" Top="416" Width="718.2">
+      <DataFooterBand Name="DataFooter1" Top="416.46" Width="718.2">
-        <ChildBand Name="Child2" Top="363.01" Width="718.2" Height="49.14" FillUnusedSpace="true">
+        <ChildBand Name="Child2" Top="363.32" Width="718.2" Height="49.14" FillUnusedSpace="true">
           <TableObject Name="Table6" Left="18.9" Width="699.18" Height="49.14" Border.Lines="Top">
             <TableColumn Name="Column53" Width="69.91"/>
             <TableColumn Name="Column54" Width="117.16"/>
@@ -297,7 +297,7 @@ namespace FastReport
         </ChildBand>
       </DataFooterBand>
     </DataBand>
-    <PageFooterBand Name="PageFooter1" Top="419.84" Width="718.2" Height="181.43">
+    <PageFooterBand Name="PageFooter1" Top="420.46" Width="718.2" Height="181.43">
       <TableObject Name="Table5" Left="18.9" Width="699.21" Height="135.6" Border.Lines="All" RepeatHeaders="false">
         <TableColumn Name="Column37" Width="99.45"/>
         <TableColumn Name="Column38" Width="90"/>
@@ -338,7 +338,7 @@ namespace FastReport
           <TableCell Name="Cell192" Border.Lines="All"/>
         </TableRow>
       </TableObject>
-      <ChildBand Name="Child1" Top="605.12" Width="718.2" Height="17.77" PrintOnBottom="true"/>
+      <ChildBand Name="Child1" Top="605.89" Width="718.2" Height="17.77" PrintOnBottom="true"/>
     </PageFooterBand>
   </ReportPage>
 </Report>

SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs

@@ -622,6 +622,14 @@ namespace FineUIPro.Web.HJGL.PointTrust
           //  Model.View_Batch_BatchTrust trust = BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(this.tvControlItem.SelectedNodeID);
           //  Model.HJGL_Batch_PointBatch batch = BLL.PointBatchService.GetPointBatchById(this.tvControlItem.SelectedNodeID);
             var trust = BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(reportId);
+            var CH_WeldMethod = (from batch in Funs.DB.View_Batch_BatchTrustItem
+                join joint in Funs.DB.View_HJGL_WeldJoint on batch.WeldJointId equals joint.WeldJointId
+                where batch.TrustBatchId == trust.TrustBatchId
+                select joint.WeldingMethodCode).Distinct().ToList();
+            var CH_SlopeType = (from batch in Funs.DB.View_Batch_BatchTrustItem
+                join joint in Funs.DB.View_HJGL_WeldJoint on batch.WeldJointId equals joint.WeldJointId
+                where batch.TrustBatchId == trust.TrustBatchId
+                select joint.GrooveTypeCode).Distinct().ToList();
             if (trust != null)
             {
                 string varValue = string.Empty;
@@ -634,6 +642,14 @@ namespace FineUIPro.Web.HJGL.PointTrust
 
                 }
 
+                if (CH_WeldMethod.Count>0)
+                {
+                    dr["CH_WeldMethod"] = string.Join(",", CH_WeldMethod);
+                }
+                if (CH_SlopeType.Count > 0)
+                {
+                    dr["CH_SlopeType"] = string.Join(",", CH_SlopeType);
+                }
                 if (!string.IsNullOrEmpty(trust.TrustBatchCode))
                 {
                     dr["CH_TrustCode"] = trust.TrustBatchCode;
@@ -654,7 +670,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
                     var list = BLL.Base_DetectionRateService.GetDetectionRateByDetectionRateId(trust.DetectionRateId);
                     if (list != null)
                     {
-                        dr["CH_NDTRate"] = list.DetectionRateCode;
+                        dr["CH_NDTRate"] = list.DetectionRateValue+"%"; 
 
                     }