From b1bf2f846eeef7593ca2f4039457d68ee17a5122 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Sat, 12 Oct 2024 15:17:49 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8D=95=E7=84=8A?= =?UTF-8?q?=E5=8F=A3=E6=89=93=E5=8D=B0=E9=A1=BA=E5=BA=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/SGGL_SeDin_New/v17/.wsuo | Bin 65024 -> 65536 bytes .../File/Fastreport/焊口打印.frx | 6 +++--- .../HJGL/WeldingManage/WeldTask.aspx.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo index 181fa974d4dfc294a7fc74af8c9841d92dfe27a9..a91c4f1e097f4ce986860cdb92bf83a2f51bdc9c 100644 GIT binary patch delta 1270 zcmd6mOK%cU6vyWdLkoDJ<;Fcta%J&P08={!&(3dZZ+>q?~^bV!6`5c_!d4==K8of%a|2#7Gyvc z95@eFKnbjZ3t$ag1eZV=RKR6HSQ4&aaTQzxRj>{=z;$o~@blNet3k&fPQHe*3EqIW z;2qckgT8ycL)IlPobs(BbtP%`b23K4Y|gP5w4|FuhDl(_#WX2uKT@f{P(4ej8PoUQ zD3$o9Qd}}dTroE7l8m@(N1|tN2G}F5$()sq~8t?=cC`G9{f&N z*{3l5M2(e`rS?2&1-|w@oygzy?EEha7~S+baSIbzC(LdKb(QT_Xpf4f&nm(?p*s%S zAAw@41mQ7R9P=qId^qy|lvq_~=w>q=dIl*(n~ zTq>)m^^{srbE$e=kqg=E!@}bSMdRrbv$dktaf1&g9K*60dS+W}t71DZ?XFgXV`jO_ QK9Mb>x%`ZVzC#;xi60TbENg**O)i|K-dRNp(L$uy|x){{K#x##rGeeXM`m5N+B>iN1Z^?&>E zem@yKU~zL(nrDjSa=CsXXlEel?9aXXdoaUk$89}a!>4-R*rWNFj=7zVt_Be$c zEwaLO`-rxAVwTB@a8>+D3}E|QGJO0GVg@-oA;vU@_8EPb(qu$$(yZ?~`C~sn$M@78 zJTLBirWMaCZfC(5@Yq*J)4E+;)Qw$9b|;Dr)7z zjGoFAr?V+NUCyQox>ih;bNa~o>OtpnUiiql@R6BoF?(*EJ zgI+~AE5f$i7}>7rSD4cA-i++FRJ|luXQY~cmU-C(&S~vw?+Wk}?z5cPxSSvAQph5G F`3=;-WQYI& diff --git a/SGGL/FineUIPro.Web/File/Fastreport/焊口打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/焊口打印.frx index 272a4e17..f03b0c43 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/焊口打印.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/焊口打印.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -99,7 +99,7 @@ namespace FastReport } - + @@ -156,7 +156,7 @@ namespace FastReport - + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs index 63da02e0..3b06ecb5 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs @@ -1311,7 +1311,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage WeldJointId = x.WeldJointId, Spec = x.Specification, SortIndex = x.WeldJointCode.Replace(x.PipelineCode + "/", ""), - }).ToList(); + }).OrderBy(x=> x.pipelineCode).ThenBy(x=> x.SortIndex).ToList(); var tb = LINQToDataTable(result); if (tb != null && tb.Rows.Count > 0) { From 973762307baba6b9742a5bbb571a4723f57596f2 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Thu, 17 Oct 2024 00:01:35 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/SGGL_SeDin_New/v17/.wsuo | Bin 65536 -> 65024 bytes .../HJGL/PreDesign/PackagingManageService .cs | 4 ++++ .../File/Fastreport/组件打印.frx | 6 +++--- .../PreDesign/PackagingManageEdit.aspx.cs | 4 ++-- .../HJGL/PreDesign/PrePipeline.aspx | 4 ++++ .../HJGL/PreDesign/PrePipeline.aspx.cs | 14 +++++++++++++- .../PreDesign/PrePipeline.aspx.designer.cs | 9 +++++++++ 7 files changed, 35 insertions(+), 6 deletions(-) diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo index a91c4f1e097f4ce986860cdb92bf83a2f51bdc9c..1e688e056aa1e73cbd8f24407f00600332852186 100644 GIT binary patch delta 1477 zcmdUvOHUI~6vumqDGqg}Olc|FA{1$$MM_G`!$(}zje;^t1>e%r;uD`k;zDCTfD7sQ z048qS8s{UR8#l7|3-|%5NfQPCr!$2i1jE*w{MviZ+%xB#|2=mq6}j@e<>Ry@Wa^W8 z+ur{A@E-LLN+ZU={^F5CR9mFz|y7xOL)R z1v(X!;Oc@Rf>e-$fj*dyf_@MONw#*jW5%&~j5zZEKUrNcUtfgb5|{;fa2d>jd2j_> z1=qlJa0A=~x4><%01BW87C{M=!4kLw?t**ZK6n5gf@SasJO)oZp0MXBCeOfgV1gC! z(#}rtzQSUIeu{ZV#mcumRUCJ#XcxP=*#`eVSg>Y1nwqx4&boHkf#kyq7QBIlJpgpT zPQwtmi%PP-hqhtIkA0ikcKsLHY7K2UZyqFk{iOS3EAD$I)0#AD)%@#{8gQg&Y(cAf zCty&i9{s8{8Z79P&uvV#(7MVSS=cQHZo?4Od(Ua23)4Z@Gcsd_+5!W&Ytw;hvAp7S z8_YgK<^Jz+8*BXror$E$jOP_Tvu*c|8BK7hp#i$wL{lwDQGP#ePScv1H{eU{Q*N71Aa z&y>=mlJT2|orNynZw5T9jfAC9N0`YA8(Hk)_tD+{z(E|s& z^9N|Wcs1_X6P~=t-G9QvUYaQNJMFHN1cak6`SiV+H}iI8-n?%9@@#HupO#cHLIY}F z`|SFcpHF&!h`9AsT@k*7q9}C?s&*s-=OMJ+!4F0U32kKR3|3tr0Q_JVrZLRy62cq= zCmoq}V_36|q^j24-VLb_46{_dr@c->7y+Xo0@#H|+F3`PS;w3K7r+F_f*hCxc~AgT z;3BvLE`w<>1FnEsa1~qwMQ|P5P?U4ZO)PGKIWP|vz#>=zw*e<#0?(QezZrNAVI8~x zFTpFY0h)2w>$_AFD^6+k>NEw-e|5hQI~m!Nv9gE^HfUYU}m(mNo0#3pfS+ z3E&ppwU@MfRPn*Y?8RO?xkUaa^g8fRgPj7W)!!D%yEq-`}rx~kE7bV+Kk;Y#n>1$(J8l$Aq{ za&IG4rmw0_c4$ZP<8h1K_%J`XFx8@qlI>kz-XbGdIw<~FSv2BjdmfFfjMH1f94t~X zk|ARd0b{nE*%&GX8c&QH%JuM`h2W=J*SDr^{P5VuN^xw+ykN-uYrO118V;~$HxB)pD1n{0gWfNNc)xk!p^T<^c{ zH5ntB%yXG6BUw@df>YzaE;mKX9+krEpHCDf^-89qKTPK)^jtcdDOA#hd?A;vR5E%# zn|+XfbbrcP8z+xBetcuEnVQ>o0c51U2L%5k47UV9MtaK}-99L~tP~##s+nxGhh o["PlanStartDate"]).CopyToDataTable(); if (dtTable.Rows != null && dtTable.Rows.Count > 0) { diff --git a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx index 53ffaae9..9873fb20 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -99,7 +99,7 @@ namespace FastReport } - + @@ -163,7 +163,7 @@ namespace FastReport - + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs index 15770274..1bae74d9 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs @@ -78,11 +78,11 @@ namespace FineUIPro.Web.HJGL.PreDesign protected void btnSave_Click(object sender, EventArgs e) { - if (dropPipelineComponentCode.Values.Length==0) + /*if (dropPipelineComponentCode.Values.Length==0) { ShowNotify("请选择预制组件", MessageBoxIcon.Warning); return; - } + }*/ if (string.IsNullOrEmpty(PackagingManageId)) { Model.HJGL_PackagingManage table = new Model.HJGL_PackagingManage() ; diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx index ae328f8d..80327dc5 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx @@ -61,6 +61,10 @@ + +