From b47fc533f09b2ca29f77a663ede8f560d202e950 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Mon, 20 Nov 2023 18:47:23 +0800 Subject: [PATCH] 2023-11-20 --- .vs/SGGL_SeDin/v17/.wsuo | Bin 264192 -> 265216 bytes .../HJGL/WeldingManage/PipelineMatIn.aspx.cs | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 83e0e602c095982177369224946228eef59f9d4e..7646ab3cac4d3c7244c515d7836d7142455c1492 100644 GIT binary patch delta 2000 zcmbVLeQc9u5PzSKemLH4D|TBcP}^D-gmr7zZfl3r?i0`;n4#UzlcVjVBz z7VwP5?X4JH1a>h1qYuq#wDYn8d_F)0zzZk@N6 zooJfP#E!-D*bRr!-UC`JDQGw30-E*7eI%pu|C%~cc$})p`R2iE7m8Ju@wBLT85}6; z+(zuudOdqd#@3=P05`ii^r+~y4Ul)mMcaB6n+h|UKli5SEg3MpfoHT!Rui3YG!qNS z_c~u*OD#S@EV%{2#hrIA9j5Xu=UG|Jd5h>QbYvQri*jlgX?I$TxuX-_8L}h_&)OU#TKet!SM(H<<{@dv5AS_R{6E!%5%gvOJepPsW{+Fj!LHfxQZLS z41i&*oT=d2Ov@Ew+yTy$L|krLYavKJUnMuemqqXD0mC+MKdoI_WukYfBxdT{#n&Yj zTB>!B(7RO=snzW&zFB;$`Fn^9tJjNTG@zx{3=^CT32B$seldmXp)VLuMlfp7E|X59GfBnpOwh>{M2bYsx&M0iac)M z>07tqwiW-!Ha0++*|mOcaGVn=7k)(ix}TCMBK=pHeUIHpbi0vG7m1@UCH16(zGK+$ zq0?fz@06T;kVYk)WJCH;Dcw#ouSBCa+LjF0CjEihurC;|tMP?u!ri{EV0e=+(iMqB z61Ckm-J$AxX`8jbib2~%bAN+*j=qBJ1A_O^IT3A)&UWdO_gPGjx#$=Xu@6&vs+F7zgls&b=*dxj;e2JMv;>AQaouLP0=OV4|oXZZbusNIP}lkbxrVsGHMd zk_>tlE`FFZ)pX0;qH^cDm@OgBE%C!9GufMd*s>3c^TR?G%$!l#{{S@@om+O&U+%rn zx%c!r=boqa4ja7##(`2|7%Yp|Ckld)1o3LL=_K*dc6r|Aq130Ykz52v*IgwbzzCCQEIP_Wj<9a=DA6+_#hXJNyfYIwX&?f$Fb@jgKKe3nlv%VXo;682%{@f! z4Z4z$x`rqd@=P~or z>4@|yo@RA1u}X?W8r2R%Kk>=ZW1=IGm#B;t5%|~fO!!>Y38O6f;wohx;IAUoLCRTo zTpu~iZpE#U#hH!=orhR=e4pkughlnQ=rHQDFN+{1T=K;U-KBQf>xj%3D0Ws<-ieEH z;B6$UlE`y#!k^)7DyOdGD2N8MeN%YG7h5Uw%`rXd%yxWT?T$T4Mlx>`T{il7^Jh_ZuH`&?yLlC(Y4`u@ z@Ou8*C^C#yqx1hHekXkpiJFeYP=7X6Ev8|@hOHm`Q!c*JOH(U9AE`W;{zR!vd`_ck ztQaRxSXjRMW-n~w?1i-zc(xu`y0BqgiPcujj_%Eod2#ah$Qz@*>9=avJ(o$k6 z+1Gf*Fm;dFUSxHe?Jifb+36^5H5c2rx^0eDtJBuvIxu@MVX06rEEgJtDxpcJW|QeT zO3P;?M%yj4Af!~xrxnH{S88@IJGJNd^<(0M{o-$1m@y-PbzVsDWn?R_7^H+jS6-it zgm_YsU2gSOB?1 z=o9jAVupNJ2o|t{4GO>x4k&~oa6&PZz#=GxGAM_|PytI|DJ+9ZsDf&E29`q&tbmoI zPY`NxvIbXtzgw;2k@z+v+qvT&F`J1JYCL*b%b&{x~uA4-?xjjzj_fYmrdm+2f8OcU> z>D1cJkI2aGKDt6*z)Kt7Z?ZU@4!f<`Zf+@@ss@YO?6kXE%`RJu&EmGZi*3a&{L$b; zgkxgQ!HuS#3PCUkGo|N5>E)|m_Vf|m>|$i^_9pTjFxCENp$RjE%EB@-9w|7~6)!Ko zGJ>pZG)Rm5-b2dIpVAR__PQ>3K})JhKq8dU@q{A@IucCK(Hl|9z>j1b^PblQJJRU@ zVI%DxHtsR1AGhUcgZ>n{nJ8!95u1a}S@Z-MnoDma)C!%KS1idH-m&t%?@t_Dd;gR7 zr{@$%qr}%!Q8D!siIB)dlzG(L*G#0DXTDnxt6166Ijl*WxvDIG+ac#S?)s zQL9+SXnC;w2k{~ad?(VtHBnYJMAMjH%x&>^68Ke&IVDkM8E#X&jHDz>% diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs index 66b72644..af9f5414 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs @@ -418,7 +418,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (pds[i].B != null && !string.IsNullOrEmpty(pds[i].B.ToString())) { item.PrefabricatedComponents = pds[i].B.ToString(); - + if (!item.PrefabricatedComponents.Contains("-")) //预制组件关联的有图纸,图纸名称又是根据组件名称截取的 + { + result.Add((i + 2) + "Line, [预制组件] 不合规
"); + } } else {