From eedf0ea56c3fc98e0ddda107cd39ecdf9891b897 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 27 Oct 2025 14:26:40 +0800
Subject: [PATCH] 1

---
 .../Excel/HJGL_DataIn/焊口信息导入模板.xls    | Bin 38400 -> 37888 bytes
 .../FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs |  23 +++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/File/Excel/HJGL_DataIn/焊口信息导入模板.xls b/HJGL_DS/FineUIPro.Web/File/Excel/HJGL_DataIn/焊口信息导入模板.xls
index 6ba8a79b8d44ff7e8f6c831fe737b6ca0bdde8d7..c47159ad4de564a5d4148b8839852f5eaf28b16d 100644
GIT binary patch
delta 6047
zcmcgw2~bo=8vgsu05crIAObTu!{fe0ky~ygh$0>dh=Q&W<%pG3iH424C1z&Tn6hFh
zu-%O(WfDz{r3M|NNy-Ct%Om2tx)v^x7^9JRMBSovjYpjQ`_0MFlcct4_f7Ttd%pkg
zumA4;UeD_>>=X>!g$}vkQvv|bO(v5Z?Kq=KkP$cbbv)I|uD8vRuaVdKF28pFRLZu?
zMBKP0(X*tNzAk@D*l936k(as)o<PTWt#m(dTKxQ5pclO20}V;t&y@;40CzX2o^saX
zGzj3Xp#I(;5EcE*J3?;KoAk8TyNCc4eS+{l)p}QhK;D^IK4mlnz!uEMq;Dl?U?ot4
zPtXMPo^LmM_YLq0WWtgoZ?aash%3O_%8HBd3i71eaOyWCuyO<;2pts69auvHK<)zX
z1%5p1GQdvV;S;3CL>&`S*}RT8!9)l5&U#68fh)PV06|Xtw9iN7oI|QpjCHb<F7O;K
zP9UF~13;cre7v~>xn*hyuA$@L9aqV?$#=7$SKu^0G@)!BumxdPr+5`x|DW*c|6Rv4
z%RhuB4h^smk*Swm@{oZ;wBe&%;7S*`#swbgi0c7t9mG329Pkk?a90Thx`<EU;MhON
zU3I`~@JsRkMMC2o)nuEA(VR?K$73wG(yYp#5R<M>x;jW(<cW1jtruY`fFanbR<8j#
z1X^)#J1%0C;WQ^utM{?uwtNz$eur4`2Uw9V^V8sqb*W!lym=+@xv}O`1F*-Ij{-(G
z=WiKTJj2HV*as##R92$3D%E>l?|FgTyu|)CyuSWO=#fy6XGrlwX?38ecgk{@HTWXT
z!K%hO3kpbZkxd*I53=&uMr)P{4$mBqNwQ?ZtXZlZ9OmrJI?>P#!{YSjrN+58H@1<c
zNh2AIn@2bpPjL~S=K{A#$+#ovC{ZU%K>(w1qYnpYQmG2W0ukJk=?ZmQ65H`YFhR+e
zY4Hi2VzVLun%P!pyQ<;sy02d~CTb=N^oh=o`b8Gg$f#nP8C^`vVv6aU*kalgS4^iN
zJ|FR=h_@lW4e>7!-+=gT#E&7~jreWEpCf*E_-MLa7xv*39g%noBhu*UP(NzWhDqO_
zg{M&(UPX5fFQii#7V2kA4bu?XfJyY|!sr~0A6<-=B{ds^S>tz*RA(VL6X8i)BN9|?
zuynwH(&-j)Ey<u>;tIy4%EX}x;DZywexeOvptp4*4T+7R{Si7kDlUe)N9jm5y&4%!
zHPJefBh^O6=t!<q8yl-5c{C|5m0r+p`>-fppq(0jQbiYPbd^+4gCBSTNrohd0ud6i
z6f9n}OvH6rqbR{*n`j_%oyik;kpMDWDR1zQ*VTV>=MfD{45(0picg%(Ar9vfCu83h
zVz;{bXWw@-;(Rsu^NCY9#L<I@>59ZSOl~NjBbCDuKZt|PPpUmRkGgtOf0t#{0es>#
z4)I7Xahjc2QCHvdUB88R7@s(uL!8VdPPY>)>*}xF|Jp(v$cR&alK?`Im=|eVCwW)d
zp-cBH#6f&wo&X}a#Et^!D*NfoE=G(32<8*>1Q0Wbm{ue)0jT*LJOLyO;&2u~SDC4A
zy=BxIJ~2-KqqxM50_ZB+cj5;NaR{H7Cx8?#v7-RG%1&I}XCWTWh|_<Q07N9_McM_B
zoU-v)pM_Y<C*}ztl1uC;faH`19V-|y3P8sv<_REn5HXERVFC!{bMOQ(Vi1S30FqNo
zJ@uARi+p090Ft=Gjsi$dY5C-`g*c2)%o9K=m)KDN$tj=wy~X%`Y5);-cF_ZAQ-zJk
zjLP&>xl9RZ)R0p`(&?!jJ^m1l&()JmdMY<B#s|iL9Ekk~A{#d!+*K?Wk!$hzT(Fon
zWyN7^mOYlOxN~fnIrgFyn{AI}i|8C1WsXhFX1qD}ShiTsv2o_uwNh-ZJ(kVCb8MnH
z_JI_eXOCr5>Kr@T99xl-KoxoC1ER{<sNJFbmAbm7(Qm;Jh_0e{^H5lL9VH4Z0BN@c
zcm^3h-dOiCcIA8d;Ni!Oy`=uN{e0W?a)oJB{V0g8P@1HlPsm`6rOO2V$PtYX0DEO_
zL|cjWbF}SfJyQVwh4vKM-N>DRzeZYoJ=lbH8QMsckf#jbBebj0dgIFXqg|4YhmRWk
zi{m^32he6<k6Jf?PtpDvt%kjAxT6p4X0)m?0FTf%p{@1+*oBs&m1P0kLfeS85+!gC
z?M1W|*#KEe03+J<XhU-V-0+alg0>0mS7Wf!ffX?q`@vH}1KLSwccNW`_Bq<`(KhD+
z%*CO1qdkaLn@@k36iync=j2egTUUIKnCQsKVfx9(ll+PwjeoZMMq=rvy#<P>Tgy(i
zocy4<^VIstz|;TS`|-4=kIF7ojNL8<zBZyK<xzX~^+kt5Jw7|WZqvu5pZ1SUh`bY0
z^1E%{W=!eXRk`X<n&6z8ZNBRse0lg_Y{uJ$39B}|v~5XWV?){A+?Liwp{-jlJjoQ!
zq`eVs_}MVz?C)RH_Xgit)s}hvbkU_7vi%*}8M*gvJYE-ht##j*`RS8)mKG_N8#~ur
z{Bir^ai;^vj{NG2n1>^`Caik@Y}K)f$Lfxov+L5%r)|F?_Is`NKi=WJ>g96{qB^nf
zNOt?GA1`-Ty>{@Mmc1>_>9e~gA2kKcd6<85=s&vjGxfN_CX)=NPNbgGy^R%9jwmcs
z5<H`lB+&&kG6l6jCr;JTlQZH;H|?KMMEYrZRTjBR7gmi4xBnf5vJ?Vv$;}r#^kh#0
zxHQe!RkfFtFGca`@Uvrxuk`W>0y~ePDx|xJcZI;jjLQkZC_}u6uY|EL&KP@r73tBL
zLvx)y>_0bW48=GILm?uAYSv%|whK8kp!^15?7S+{8V&<{%$yn6sni)`Ga%AEvxW|H
z_OO`{jXkptkf18?Bmh6-evOX+l;acv9ENdp{p=!-azt4DyV*rbOC4l%<LpA4XW`3s
zkJ|tbnPc~O4Dhr$c$5P?VKw$PUIRRP96UY)JcV=ZZF~oK&d)6>WLaN=XxN7vKmq9_
zrSMCiJi#CK<I4F%0nP$G{!mW0ygMxNCD4K|$e6;|InSGEO?MwR9}j68+)Mm%tGPNa
zfs|A4S~cFIYjf~EuQpm-2+N5#wqfn;Wg<>=P$VgV3VNtkO^?-%ludg|=+oK=Y!+HK
z7VmTGvhcpSu34`M7Nkzyu|pp`12KD;{2DP7!gTBryO3%L*yALZ81tIr?NQ}(Z~g(`
z1yB;~oq!UQw5C2*Kk$KU#xBfP8SdFztMM<n8r)VJ0FJ#1P}&G^p$WI+KLT7^3NQ<|
z^f$1)iDf007A$|k(vIaLEW5Gn$8s3U2`qoZ(v9T`mOd=^^xy^m#>#Unu?E^z)kv2&
zyhx_gmTJ-Xu%SJQ9HndDjZHX*Q^aQb9Ddy0*W-?`Lve$>lHf;%))Q>2hl3K09xWBb
zO<B@QWK`9XO$)r_(!b=b+lim?eydU-^AVqDe1Qg&AzEY(o-}{nq6M!nsBbbhu5BeW
HN$&n1nxDcY

delta 6638
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

diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs
index d58e176..5ae0a42 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs
@@ -295,7 +295,8 @@ namespace FineUIPro.Web.HJGL.DataIn
                     string col27 = pds.Rows[i][27].ToString().Trim();//合格等级
                     string col28 = pds.Rows[i][28].ToString().Trim();//硬度合格标准
                     string col29 = pds.Rows[i][29].ToString().Trim();//非常焊缝
-                    string col30 = pds.Rows[i][30].ToString().Trim();//备注                 
+                    string col30 = pds.Rows[i][30].ToString().Trim();//是否黄金口
+                    string col31 = pds.Rows[i][31].ToString().Trim();//备注                 
                     Model.HJGL_PW_IsoInfo NewIsoInfo = new Model.HJGL_PW_IsoInfo();
                     var getProject = projects.FirstOrDefault(x => x.ProjectCode == col0);//项目号
                     Model.HJGL_PW_IsoInfo getPWisInfo = null;
@@ -583,6 +584,13 @@ namespace FineUIPro.Web.HJGL.DataIn
                             result += "第" + (i + 2).ToString() + "行," + "非常焊缝格式输入有误" + "\n";
                         }
                     }
+                    if (!string.IsNullOrEmpty(col30))
+                    {
+                        if (col30 != "是" && col30 != "否" && col30 != "")
+                        {
+                            result += "第" + (i + 2).ToString() + "行," + "是否黄金口格式输入有误" + "\n";
+                        }
+                    }
                     if (string.IsNullOrEmpty(result))
                     {
                         if (getProject != null && getPWisInfo != null)
@@ -702,7 +710,8 @@ namespace FineUIPro.Web.HJGL.DataIn
                     string col27 = pds.Rows[i][27].ToString().Trim();//合格等级
                     string col28 = pds.Rows[i][28].ToString().Trim();//硬度合格标准
                     string col29 = pds.Rows[i][29].ToString().Trim();//非常焊缝
-                    string col30 = pds.Rows[i][30].ToString().Trim();//备注                 
+                    string col30 = pds.Rows[i][30].ToString().Trim();//是否黄金口    
+                    string col31 = pds.Rows[i][31].ToString().Trim();//备注    
                     Model.HJGL_PW_IsoInfo NewIsoInfo = new Model.HJGL_PW_IsoInfo();
                     var getProject = projects.FirstOrDefault(x => x.ProjectCode == col0);//项目号
                     Model.HJGL_PW_IsoInfo getPWisInfo = null;
@@ -845,7 +854,15 @@ namespace FineUIPro.Web.HJGL.DataIn
                         {
                             newJointInfo.IS_Proess = "0";
                         }
-                        newJointInfo.JOT_Remark = col30;
+                        if (col30 == "是")
+                        {
+                            newJointInfo.IsGold = true;
+                        }
+                        else
+                        {
+                            newJointInfo.IsGold = false;
+                        }
+                        newJointInfo.JOT_Remark = col31;
                         newJointInfo.InstallationId = getInstallation.InstallationId;
                         if (getNDTRate != null)
                         {