From 9ac342d749c1b5ae427774bb6ed432eb70503898 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Thu, 30 Nov 2023 10:27:18 +0800
Subject: [PATCH] 2023-11-30

---
 .vs/SGGL_SeDin/v17/.wsuo                      | Bin 265216 -> 265216 bytes
 .../Fastreport/管道焊口检测委托单NoPic.frx    |  16 +++++++-------
 .../HJGL/PointTrust/TrustBatch.aspx.cs        |  20 ++++++++++++++++--
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index 7646ab3cac4d3c7244c515d7836d7142455c1492..b771a094c15c2dd18e87468af421ec39357e80ca 100644
GIT binary patch
delta 1954
zcmbtVZD?Cn7|wg{X>7x7o20Q{OSiUUwcDCC=||Q`>8=he8}wsyKZ;E4S3+@}jhH}9
zJDU!*((Ol<ckC8%SW?L!k<DD{1yQI|5C&=}D6{&*U$P%EYiU)~Hom7_y4X1=c;Mlj
z_kGSi@B6&x<3?u8kr{LJbY8K+U??G!YZk{G#Mp3t@7=mvo%SU-L|z47VPo(%uCXpz
zCfiC#Q$tIk1A|f|KR}MN1kv&kc*y}1jl>kuDrqb}%OPx#T}Zu=P(`T64|oyIa&B2C
zMnKFEZT)gziIPuKEQBprI=!F92eNG8KS;KjP)BfNac&yp0<SYl%wRZb&{lXD@(q0V
zvYNAHWirU4RkPC+ej%0<DhU;6aqK}Qmrp!GRy{!o%7_!aXm;{%jnZjRhKy+8D<gY1
znu}=Oe`ywLG?Mf$`2PFS3xJCl$V~xl)bu7?4seWcjy+Zx&8ESOFIf--cuWfwc2cRR
zYzDDcV!_R=UM+|S(y|X^v6w(D@i=Q8HD?^h$*~!!HYbAJ)>89J_Z%;0h*XiSEKJ52
zVVrQD@G4<~5W)3F+hq|@91ziqz|e}J;t6;i*NVGj=^n97UcgYvMBXI11!chXqIOxF
z2{A!5v4R$~U4oeP%KyyU{?NQBUaa+Vc`x<ijBdwWZIvO`bSxjl$rNWK!(gx}0wcKA
zGyyMSsJUxXv@L5w-Z?Vb2nKDvtR3W?yD=Bs1Gs9pW7IwfXK~Fw0Vgn2aS?y*58<`m
z4rKe<@KB$E%D#noHH+7<os32dpi*T<bJem%B$jEMg4yUP_yyv%OmjJA0B78%Z5wdE
zs%aXFeNKAJAim$7NKv0`krmq_iO573y~v<cvmE{lH2LvWh_wW>wYF?(^<ESu7uV;(
zk`p18d5~x^Yi4B`l5NKTKVxnT9{oBW#MI1-wRK#SOR!b6<cSnus-sjMci(28Ot1aW
zv+~4~+G>Z)9?I}|H;?!5o#jU5`A@avv)zCvpT3^#1vUr0T!a2J#9mM|#lHZWG8{MR
zaXWiXLYsffceR=wcet95G<y8LL8rUl)!=OE_qRCv8~p=Lx7X|I^9}SjyPEp6_eb9a
zw1n#|v@-+e#e=(fAE;MPI@ky<gd?%4S{xdiiANYF&-roLZ`M8>o|bTBsz$51ur#Uu
z_%Tc3jqh{ykBsmXBsef+%cWDLxuBQkvO9%p^g9^B$b7CIsAN&Vn<D`|P|l(`u~9`;
zs#%`H-8|^^Hv4?eK9`SD9T@aF`x;#yr@QHh+wb$Xc>MkbN)<u9@s8B1_tvmkur!dE
ze`UNo9f^aCC2AQ{qcJ#h^*Sp+*P=;XE@HX*cpZC9QdfYLtFA94S+Ds@S_1Xd2n$bz
zT}%(Vq&Kdq${d(<)3?%ZkVr{J)s<pxdfRR3CM156SYk<%)n_css$2h%?gA!%Z&2S_
zlsx*-9ciXe?F_*gHGoj3Duqneuly+ugBstEJo6rY3)IC)MwR(nib}Zn-YHCdQ?8P=
jSD$9Qo6Rrr8pvE6o47@p|AIL7;@#D%4*v`ZBRBp7Xu19m

delta 2043
zcmcIkeN0nV6z{q3@#(8jXaNBcuw#6*SiV~r@F)|%P-<X=#A#Y69TS{@t@5=|)XfA*
zMtTw-b7LXZk!ZF>d0CoFT`Du#;+%HbVvO5ATb9N6kDHN2=78Ocbi&j>camT4x##2E
z-?{gky2qm3W6`4x5wQw|BA!Aet8}NpLpqd}vmaj`O}Y&^)au4w(huV}L+XSDDk;>)
zR@|AWMJMN0c2Pq+1(QewK3*R|H5S4omFj5}Arzq$=@fYs^VBEMbq;NOe8k*h?81T)
zRk|dPz$@2KS2P8)XHjFUGMn!76gmnmR`IcTh0hFqiS9Te-{<>4DIR$yYrK+XU_^_S
z6J0uQA(G~^!x^2RF#0@2Dn%MSJ6<0{HRcVYD~k>m!1N&Xq@|d2#`c*dB(ErehO3uS
z*r(CY>z-7z8u%gVL_V?;=Fi)X|93mJ+6j;;yP|f05*WJ`ukv8En>khMK**pzRvQCO
z#Pp~)Ei-Ig(oq-UMoUbB(7j|hL{|*Ns@Jfze!3Z;c$4BSia`oD&S^F+wgY=Z8noCB
zvNLW3JnEN)Rn*8Wb3i4!)PwK=&Zz4IcC}==^KEo#215?B9Gq3X|G#mT=hkilA^4U-
z(x;s30QR9Pbr7AY$rznxhi&LeJC5h=pW(Q5J5Hxp$YPcsQ0&db%$!?ZEl~k2AlNcI
z)uUvU?jCqEh&Pu!H}R<~jjSqu1m`<P0LStgViw@Z*f4eqg7cc1=iG8~HGWxEj_zb9
zbmC0%AnZri+B$)aSg@_wgoeC94HfciRy?33=NwvdM2{Ga(WUm~HJ2^cTz1@RB%Z`8
z0vn1KD1ujXg6DbpVPZH;nX75PMJ>64Zgf`PkgLT@@Vs1nm}tSTH9B-Ajd;utpbuxv
zJD&ay^rEY}PGD1_U3PlN0lI0#*~)&{f-Z3oHscKaeGy$%N1#@oT^~lKwgx~L$h$=@
z4bS}4bic}sfo%zbv(;YndWW;MJH0f0YO5cVne;>Sju(aCx7(8N4|{^w!h0LZlttvg
zj8*lO0*heSxV@$U%UiQ>ckL>npt0VvXsoWc;I;ZfZxb*3Ul9qu+c?cS1jXH#PeC(}
zu)Y%8ZK5n%-QaB_vcKgn;N906(Li_<+te#CzgH)_+tS1Fm(COp6o6b;c?g>i1#avr
zL$RwO!q~!|beCc`e${32?j-=2Ml=}Lo$cvv*C>n*_4NF7O6}=!`=?UMJyWeB@Hx7>
zMb800`n%(#n`_Bl^dB&k)0#l>9@jIpOWPwV6ye{|YFMLa^Ye=G3YrT{`XYzjt}iTU
zG3sr0N3-5$GZmU_wvvKkqeI?z@HF7go(+_w0*~}u3TwK-nnZzl7d6s{xg-Vqdf)M8
z|2rd3wR-vE0qG;s#T;UmocCalJmIzuP4Ymbm@{DT83+VGGCblEjwOVGFCmoNiNeF}
z4%yLhGE5?0aKpagIC2m?2e)V)#$tyduh^(Bu$2_)3yX{``sM;-tKQUXGMVhfEk!Mb
z`HwkI9NM6woJ-y`Z>Vo5&C55H8cO?VCHohr`A$z0`%7oCq7poJcr!+yN$^=y$poPF
zBd5=qK}KLwONeB?N?twj30aMXK&14$iiG<HGRaX6C#Tya>jh9B8^|TTfn4tBxO9I3
z5+%booZ!pQk=q~z;z^t@?mBljWbztEB*S%5;j8$8n}*3-oG^KlBPd?Tmre$_Vqe>D
z+*s7)uQY0+2KM;&{K<Ji8r=eo82CQX*ZCJW%1Pe8X<+d~?kY&uAE85{))e3HJZB-&
f&tZHbMrMzJSsGf!8*!+2P&ymR>wKM|{AkEOo`ma$

diff --git a/SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx b/SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx
index 65753ae2..a5fedbe1 100644
--- a/SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx
+++ b/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">
-        <ChildBand Name="Child2" Top="363.01" Width="718.2" Height="49.14" FillUnusedSpace="true">
+      <DataFooterBand Name="DataFooter1" Top="416.46" Width="718.2">
+        <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>
diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs
index 5759a0ad..f1d2860d 100644
--- a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs
+++ b/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;
@@ -633,7 +641,15 @@ namespace FineUIPro.Web.HJGL.PointTrust
                     dr["CH_CheckUnit"] = BLL.UnitService.GetUnitNameByUnitId(trust.NDEUnit).ToString();
 
                 }
-              
+
+                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+"%"; 
 
                     }