From b80cb47621e4138319b1604222fc229531c31220 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Fri, 9 Dec 2022 14:46:31 +0800
Subject: [PATCH] =?UTF-8?q?2022-12-09=20=E7=84=8A=E6=8E=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/SGGL_SeDin/v17/.wsuo                      | Bin 22528 -> 24064 bytes
 .../HJGL/DataImport/MaterialInformation.aspx  |   2 +-
 .../HJGL/WeldingManage/WeldJointList.aspx     |   2 +-
 .../HJGL/WeldingManage/WeldTask.aspx.cs       |   3 ++-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index 47f3936e8e51794939eb8941103316149e94163b..8828e13c0da2d96009a5b45169e48ce3df06cb18 100644
GIT binary patch
delta 1376
zcmcIj&ubG=5YF3dnlyb$lZMt*TTLX^B3a0WZPQk515LHi#{Nn|4@I<Sz@sG*FKYjQ
z9_o&GQjvh*v1Sh<C<NMqw<^81;6cHIsA!?ogK;Lit4pb+9vm3n_r5o8_I)$6^Gj_0
zC0iO5m=nUnvAV_W#oPBAU`}}Ju`!#?)`4C{gS(*!6zq@Bx(vdNs}tReei%KBPJuts
zJ&4<kJ#l2jS7Aa7WC%1Hr$>#o!4e&@;1h@?V}HuR2Q2s`;%5`XOch2A5lLk~5zc#z
z0}}&x=pkezK}Xf9AF)*e;U?r-EHU+nNwRr|*4=_a#yOScFM`^uRz*Hb!rzMA8{l(`
z@XkH$8pHE(bS>GSFxCx4zV0#~pf|@e=3xRxm>sIITb_@5q-eA=SQca`_{KTMD`o}s
zD@ao2Mm(TZ&+cDPTT(TiI&bnU0mYUzP8Bg*Na3stiif6LrY555dN8K!(0&B!1T~oA
zG$T}OBU2~b435Kadla^U`sagx4sr5Y$6(nmYg?^cP<i3N`Z@Iv6V<HTmSS8)NZ%x*
zcR3U!MDS0HXe;fXMH<M#p}v_9&!4=1^<d`9>YV@UqyFvHTajy@JmDMKVlKx1y%5$?
za=j3>7ui%_3RdhfD0J-Ah>kbA%M@|6;zbTS;TH#aX(=kG(G;iQH2*ZxtQDdQOznK_
zqRBQ3v2WoWG{YHfM{)`!MJUBY=o#{A-q1Hz?yGN#B=T3}o_IVjDe+jZq|C-;skiI0
zEahc6pI4OGSUzzTq|tR6&6>fbfe?86gU;zS8Ydf^PxnGH-3d?ALB^mhJD^^u{~u|g
zGMQ8}o3NHW4HvW5p*xo#s+_6V;YfB6+_@-hX3lBF+z5m3xn^iS{_r4`hDtiAPF6}&
N43a}4tfbHAyI&qHCG!9P

delta 1354
zcmb_c&rcIk5bk^3LVvuLLQAPhD=ic($eLZdLWu}Xz-UZs7bS+&i)c$EF)<-PyqIv%
zn+LPw*_i$X*d`_>#$YUoCyU|A!9Tz#hZ=(ib%wTDP|Jmve3^Og&CHwmW_DL!vDG!U
zmgI~>n0L1%&X;2jJ1p`KPR2|olZ5z*3#NS$STa8wveynAHR(dxia3VoLHs~tC(0lK
zc5Gglk=z$MaYIq+tGl)r4d=b6_c!dLHGKf(Ai|4yK0U(>o~-5S-hAIA*VZS@3QY2V
zE=fu|I#Z_g1V}b!N_q$0dk|C!I(h$_bqEcpR0?uf)^4=h%i6vz#ZiZk_F1cr3cXlN
zI5fu2z_Qq~)=RGv?M%buiF1bQpH6LN<}?xi^@^%KZXHTy1uAY`Py^Z!lwtL<{gEM-
znmm>Fa-(BPP$z8-j%*l~JIca}M^s5Y9@Ajia~0n4p_UOmE?D4u=OsbiB%-TU{wUn@
z>0|>HpDt)_{J$@0n7Y#NmaD}|m*9oK6oZmav82&Lf;XWFP`D_Tf}f@1iz^Gaa;dx7
z+?`V+qq#2|i|sp4$G>gdk1Tw0hF9QmPamA*4)<Rd6l61`G$4FPg^i5;sgRAp*S@qM
zzKPa41+dhw3)<{!LZyH601du~g$7E%u3WZ~J*~Z-G-JgQL7y4e4Zl3f`tyT4ukgGk
z<xg`XFzIA8y?y(N3g8fN93qkj`vIlk80Z&V;0nEf2cfaTsLd0ZpC67XaaEJ!u~=5t
zlvqxV&)?MKVRcT;&gImYrjCM~+_KJ=X$0^KxG@m|*SH^6Q&G5`@>}RPV}ggNvqmOi
jT(%u`#Gb-YQV5C6I$Z1Rg4daW{B>4LTv<2MyfV`-)J5kA

diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
index 3acacc87..f1a988dc 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
@@ -34,7 +34,7 @@
                     <Items>
                         <f:Tree ID="tvControlItem" ShowHeader="false" Height="560px" Title="单位工程"
                             OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
-                            EnableSingleClickExpand="true" AutoLeafIdentification="true"
+                             AutoLeafIdentification="true"
                             EnableTextSelection="true" OnNodeExpand="tvControlItem_TreeNodeExpanded">
                         </f:Tree>
                     </Items>
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx
index caac6cfd..1583cdf1 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx
@@ -33,7 +33,7 @@
                     <Items>
                         <f:Tree ID="tvControlItem" ShowHeader="false" Height="560px" Title="单位工程"
                             OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
-                            EnableSingleClickExpand="true" AutoLeafIdentification="true"
+                            AutoLeafIdentification="true"
                             EnableTextSelection="true" OnNodeExpand="tvControlItem_TreeNodeExpanded">
                         </f:Tree>
                     </Items>
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
index 0232b69d..5f53e1b2 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
@@ -768,7 +768,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 {
                     NewItem.WeldingWireCode = values.Value<string>("WeldingWireCode").ToString();
                 }
-                if (!string.IsNullOrEmpty(values.Value<int>("Size").ToString()))
+
+                if (!string.IsNullOrEmpty(values.Value<string>("Size"))&&!string.IsNullOrEmpty(values.Value<int>("Size").ToString()))
                 {
                     NewItem.Size = values.Value<int>("Size");
                 }