From 337cbbebe67f8b07ec5edd6577d0cdb06c9b36f5 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Fri, 23 Sep 2022 00:01:54 +0800 Subject: [PATCH] =?UTF-8?q?20220923=20=E7=84=8A=E6=8E=A5=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2022-09-24 lpf.sql | 1 + SGGL/BLL/HJGL/DataImport/DataImportService.cs | 25 +++ SGGL/FineUIPro.Web/Controls/Fastreport.aspx | 1 - SGGL/FineUIPro.Web/ErrLog.txt | 143 ++++++++++++++++++ .../Excel/DataIn/组件管理二维码信息导入.xlsx | Bin 9439 -> 9480 bytes .../File/Fastreport/组件打印.frx | 4 +- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 8 +- .../HJGL/DataImport/DrawingImport.aspx | 24 ++- .../HJGL/DataImport/DrawingImport.aspx.cs | 13 +- .../DataImport/DrawingImport.aspx.designer.cs | 27 ++++ .../HJGL/DataImport/DrawingImportEdit.aspx | 3 +- .../HJGL/DataImport/TDMImport.aspx | 27 +++- .../HJGL/DataImport/TDMImport.aspx.cs | 8 + .../DataImport/TDMImport.aspx.designer.cs | 27 ++++ .../HJGL/InfoQuery/PipelineQuery.aspx | 2 +- .../HJGL/PreDesign/PrePipeline.aspx | 4 + .../HJGL/PreDesign/PrePipeline.aspx.cs | 2 +- .../PreDesign/PrePipeline.aspx.designer.cs | 9 ++ 18 files changed, 307 insertions(+), 21 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2022-09-24 lpf.sql diff --git a/DataBase/版本日志/SGGLDB_V2022-09-24 lpf.sql b/DataBase/版本日志/SGGLDB_V2022-09-24 lpf.sql new file mode 100644 index 00000000..be7141eb --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2022-09-24 lpf.sql @@ -0,0 +1 @@ +alter table HJGL_Pipeline_Component add DrawingName varchar(100) \ No newline at end of file diff --git a/SGGL/BLL/HJGL/DataImport/DataImportService.cs b/SGGL/BLL/HJGL/DataImport/DataImportService.cs index 85b805ac..d3ad796c 100644 --- a/SGGL/BLL/HJGL/DataImport/DataImportService.cs +++ b/SGGL/BLL/HJGL/DataImport/DataImportService.cs @@ -51,6 +51,31 @@ namespace BLL ).OrderByDescending(x => x.Version).FirstOrDefault(); return q; } + public static string ConvertFileType(object ImportType) + { + string TypeName=string.Empty; + if (ImportType != null) + { + switch (ImportType.ToString ()) + { + case "0": + TypeName = "ISO轴测图"; + break; + case "1": + TypeName = "三维模型"; + break; + case "2": + TypeName = "属性文件"; + break; + case "3": + TypeName = "管道预制加工图"; + break; + } + + } + return TypeName; + + } public static List GetListVersionByUnitWorkId(string UnitWorkId) { //decimal a = 0.1M; diff --git a/SGGL/FineUIPro.Web/Controls/Fastreport.aspx b/SGGL/FineUIPro.Web/Controls/Fastreport.aspx index 510dde4b..29cb5a29 100644 --- a/SGGL/FineUIPro.Web/Controls/Fastreport.aspx +++ b/SGGL/FineUIPro.Web/Controls/Fastreport.aspx @@ -13,7 +13,6 @@
- diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 39f7ac69..3b3a0a0a 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -135,3 +135,146 @@ IP地址:::1 出错时间:09/13/2022 10:46:27 + +错误信息开始=====> +错误类型:HttpParseException +错误信息:基类包括字段“WebReport1”，但其类型(FastReport.Web.WebReport)与控件(FastReport.Web.WebReport)的类型不兼容。 +错误堆栈: + 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildFieldDeclaration(ControlBuilder builder) + 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse) + 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse) + 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse) + 在 System.Web.Compilation.TemplateControlCodeDomTreeGenerator.BuildMiscClassMembers() + 在 System.Web.Compilation.PageCodeDomTreeGenerator.BuildMiscClassMembers() + 在 System.Web.Compilation.BaseCodeDomTreeGenerator.BuildSourceDataTree() + 在 System.Web.Compilation.BaseCodeDomTreeGenerator.GetCodeDomTree(CodeDomProvider codeDomProvider, StringResourceBuilder stringResourceBuilder, VirtualPath virtualPath) + 在 System.Web.Compilation.BaseTemplateBuildProvider.GenerateCode(AssemblyBuilder assemblyBuilder) + 在 System.Web.Compilation.AssemblyBuilder.AddBuildProvider(BuildProvider buildProvider) +出错时间:09/22/2022 00:35:36 +出错文件:http://localhost:8008/Controls/Fastreport.aspx?ReportPath=D:%5C%E8%AF%BA%E5%BF%85%E8%BE%BE%5C%E8%B5%9B%E9%BC%8E%5CSGGL_SeDin_new%5CSGGL%5CFineUIPro.Web%5CFile%5CFastreport%5C%E7%BB%84%E4%BB%B6%E6%89%93%E5%8D%B0.frx +IP地址:::1 + +出错时间:09/22/2022 00:35:36 + + +错误信息开始=====> +错误类型:HttpParseException +错误信息:基类包括字段“WebReport1”，但其类型(FastReport.Web.WebReport)与控件(FastReport.Web.WebReport)的类型不兼容。 +错误堆栈: + 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildFieldDeclaration(ControlBuilder builder) + 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse) + 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse) + 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse) + 在 System.Web.Compilation.TemplateControlCodeDomTreeGenerator.BuildMiscClassMembers() + 在 System.Web.Compilation.PageCodeDomTreeGenerator.BuildMiscClassMembers() + 在 System.Web.Compilation.BaseCodeDomTreeGenerator.BuildSourceDataTree() + 在 System.Web.Compilation.BaseCodeDomTreeGenerator.GetCodeDomTree(CodeDomProvider codeDomProvider, StringResourceBuilder stringResourceBuilder, VirtualPath virtualPath) + 在 System.Web.Compilation.BaseTemplateBuildProvider.GenerateCode(AssemblyBuilder assemblyBuilder) + 在 System.Web.Compilation.AssemblyBuilder.AddBuildProvider(BuildProvider buildProvider) +出错时间:09/22/2022 00:35:41 +出错文件:http://localhost:8008/Controls/Fastreport.aspx?ReportPath=D:%5C%E8%AF%BA%E5%BF%85%E8%BE%BE%5C%E8%B5%9B%E9%BC%8E%5CSGGL_SeDin_new%5CSGGL%5CFineUIPro.Web%5CFile%5CFastreport%5C%E7%BB%84%E4%BB%B6%E6%89%93%E5%8D%B0.frx +IP地址:::1 + +出错时间:09/22/2022 00:35:41 + + +错误信息开始=====> +错误类型:HttpParseException +错误信息:基类包括字段“WebReport1”，但其类型(FastReport.Web.WebReport)与控件(FastReport.Web.WebReport)的类型不兼容。 +错误堆栈: + 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildFieldDeclaration(ControlBuilder builder) + 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse) + 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse) + 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse) + 在 System.Web.Compilation.TemplateControlCodeDomTreeGenerator.BuildMiscClassMembers() + 在 System.Web.Compilation.PageCodeDomTreeGenerator.BuildMiscClassMembers() + 在 System.Web.Compilation.BaseCodeDomTreeGenerator.BuildSourceDataTree() + 在 System.Web.Compilation.BaseCodeDomTreeGenerator.GetCodeDomTree(CodeDomProvider codeDomProvider, StringResourceBuilder stringResourceBuilder, VirtualPath virtualPath) + 在 System.Web.Compilation.BaseTemplateBuildProvider.GenerateCode(AssemblyBuilder assemblyBuilder) + 在 System.Web.Compilation.AssemblyBuilder.AddBuildProvider(BuildProvider buildProvider) +出错时间:09/22/2022 00:36:29 +出错文件:http://localhost:8008/Controls/Fastreport.aspx?ReportPath=D:%5C%E8%AF%BA%E5%BF%85%E8%BE%BE%5C%E8%B5%9B%E9%BC%8E%5CSGGL_SeDin_new%5CSGGL%5CFineUIPro.Web%5CFile%5CFastreport%5C%E7%BB%84%E4%BB%B6%E6%89%93%E5%8D%B0.frx +IP地址:::1 + +出错时间:09/22/2022 00:36:29 + + +错误信息开始=====> +错误类型:HttpParseException +错误信息:基类包括字段“WebReport1”，但其类型(FastReport.Web.WebReport)与控件(FastReport.Web.WebReport)的类型不兼容。 +错误堆栈: + 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildFieldDeclaration(ControlBuilder builder) + 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse) + 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse) + 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse) + 在 System.Web.Compilation.TemplateControlCodeDomTreeGenerator.BuildMiscClassMembers() + 在 System.Web.Compilation.PageCodeDomTreeGenerator.BuildMiscClassMembers() + 在 System.Web.Compilation.BaseCodeDomTreeGenerator.BuildSourceDataTree() + 在 System.Web.Compilation.BaseCodeDomTreeGenerator.GetCodeDomTree(CodeDomProvider codeDomProvider, StringResourceBuilder stringResourceBuilder, VirtualPath virtualPath) + 在 System.Web.Compilation.BaseTemplateBuildProvider.GenerateCode(AssemblyBuilder assemblyBuilder) + 在 System.Web.Compilation.AssemblyBuilder.AddBuildProvider(BuildProvider buildProvider) +出错时间:09/22/2022 00:36:58 +出错文件:http://localhost:8008/Controls/Fastreport.aspx?ReportPath=D:%5C%E8%AF%BA%E5%BF%85%E8%BE%BE%5C%E8%B5%9B%E9%BC%8E%5CSGGL_SeDin_new%5CSGGL%5CFineUIPro.Web%5CFile%5CFastreport%5C%E7%BB%84%E4%BB%B6%E6%89%93%E5%8D%B0.frx +IP地址:::1 + +出错时间:09/22/2022 00:36:58 + + +错误信息开始=====> +错误类型:ArgumentNullException +错误信息:路径不能为 null。 +参数名: path +错误堆栈: + 在 System.IO.FileStream.Init(String path, FileMode mode, FileAccess access, Int32 rights, Boolean useRights, FileShare share, Int32 bufferSize, FileOptions options, SECURITY_ATTRIBUTES secAttrs, String msgPath, Boolean bFromProxy, Boolean useLongPath, Boolean checkHost) + 在 System.IO.FileStream..ctor(String path, FileMode mode, FileAccess access, FileShare share) + 在 FastReport.Report.Load(String fileName) + 在 FineUIPro.Web.Controls.Fastreport.Page_Load(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\Controls\Fastreport.aspx.cs:行号 54 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:09/22/2022 00:43:55 +出错文件:http://localhost:8008/Controls/Fastreport.aspx +IP地址:::1 + +出错时间:09/22/2022 00:43:55 + + +错误信息开始=====> +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 FineUIPro.Web.HJGL.PreDesign.PrePipeline.btnImportQRCode_Click(Object sender, EventArgs e) + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:09/22/2022 00:46:14 +出错文件:http://localhost:8008/HJGL/PreDesign/PrePipeline.aspx +IP地址:::1 +操作人员:JT + +出错时间:09/22/2022 00:46:14 + + +错误信息开始=====> +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 FineUIPro.Web.HJGL.PreDesign.PrePipeline.btnImportQRCode_Click(Object sender, EventArgs e) + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:09/22/2022 00:46:21 +出错文件:http://localhost:8008/HJGL/PreDesign/PrePipeline.aspx +IP地址:::1 +操作人员:JT + +出错时间:09/22/2022 00:46:21 + diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/组件管理二维码信息导入.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/组件管理二维码信息导入.xlsx index 8364220b0869d497a60f876071cc5af73ab685f5..ec2e63a9185d39fe8bf6c48160fabb96b3a9b02b 100644 GIT binary patch delta 2156 zcmY+FdpHvcAICRysSVpS<#rm|I;Pwf3dt?^OX)@Km$^5WIl_3+#38)yQ!bI#LAj5i zCSjCoqnTDA_neST!azq|T8QHem?sbXqy*9Cvn~DMb^2dykEO01UMBDsCAo)fkNW<$R(d6)I#>=X0;RSdTweE=J% z;^$~n0YA#iZH|SIJxa?zidFba&|&?hc}Lq7q;nc1S5Y(s zl|Nh8W8c%QF^^(O*x=4KJHX@u;0mYH#U?d9(98m=0Q1NwbCxbGmNuH~Z(O8oD45

!ZLMQYFfgS2PnvGogma+RSPBBMxxWrjaZ zoUhD0v*`3vWx=o>>W<{Ke{rsQRPjE$ub#n()H0B^nkfT2hej3_)HRpc6;#(ZVjsCm33Fv;&XEOX_q_y z5TM6%ou`G+t;4Rgs9K#-+{0=6;54Hm$TZdf5-um2QdPBQ`Z~s6_#)I*b8YX}96SY$m{+>rZw(Rdeerpuh(EXN ztr-hiy0sQOL@$;2SQ+ZjRlU5Lvor`gp`X?XpV+kHpksDg_P*hp9)+!*OEk=Vxmyyg zAS&tW8SVZ1=qJGW^%kx)ocAh}T!fTM`&CGqm7%9r46k{BrbcY3hfJP4eCiZQct_n> zE(oqpo~dS*Up1Rf*60Z(^_sY9$otf{fcph2pAD?|bKDfUGOPN$;@pK+*|x@ps_c0L(M}~CPh)M79~DWa((VqhJBlR#r}4+_r}2;iadA5C|NX7 zrZoS}-QeIyY`#!o1ZHOemToNkRk++}wFGtR+l-|z!uwdt;+(EQ?fD0(`zscp`Zvow z)_PasL?qBZ&^h1}rAEiAq1!sd4lz=N3%;r)5soo?juhLqmg}=|Jfd65qBoZ=`r~p8 zrf{2bx`Sm7;NoFEI0HE*3A^?BujY`10>;jZ!O`lPs(3FsqZYKy|-BHpRd?RTi~fdMBk84OOi~hTQ8PRBL=W?N!>7=CPAe#axGlc*Ts(7^Z=#y&S|w|%%M>!9 zYu$4j2HlmjGeyV(a>;hU+jkxHpzZjg=)!9=7oFDP6E2dr*6)~-;?|H}`{wg_kjVBw zKhuVW(XYwyfI_n$$CNGUL2`;f@}*>TM9Pfq9<*Y^Zpbf8jAp{R>+XXxn|I?(hi2K8 zv<+=;sL&Jw`ueA@t&>KdUTxDIcjO864Vf*bnc%>Nd^3yIVYW3x{1}#&t;DP`Gs@2P zX4gFK9C}>Uf#dnfi1k_0ZYU~QGe+3cI<~mBc&HXVkAzhVleO1aDklfr)S5?zh-jzJ z>ohQNOu61))W^~AvfQK`i|~JOf(dpbJ`(V~`6zF~Zs3JRo6^=u^EHz0^Ri|k zX^UZoU%UVpsK@BVe~`F!p@=bq0!pPT7C<#c~sly=vIJg5W(f#yU( zAQT7$iYFVyMMj?vii|w1A5S6Il7=Em4x>B0mP~J&H^Vu3>>h1G12SB%vJktl5TxVF zHK~QLs6KtU<+#KT5}(u)mMW{CRo!KD+J&;moRXXXjl?T~(-V=WI$yqi={I{d*2&h% zSR%hUM1y|6NQ*(c4qyBl7BFS+tFy=DOs|6Y6RghD$z_3;X^g(U=Cyz@Q1<|+(nGd0 zkP+n^?H{q4Vz@$VeOwPadQB-rUCecWfxa4=PAR6~`xs@4Y`G)s=}{fJ)8iQ**P>c0 zSpR+4dWds&gB5S4s(a4ce-L3le-@0EDRw_g`b$GEZ-d4*o`D?ME0!48I&R&44@u*t zvLiepfA@MA(?txv9g6@rxdW4#Q+tuTg#468r=)JA&&sFxdyu%;T~CuWYrY_AIz$@> zVOY;ulotNahKVQph6k&^X70kLJkjwBl zU`9x)L7Agk+R2w(=$#b4NpSrNvr%y4L;CA;ywT%-f1zr9H0ziU6esZZeLo&!+VtIB zAetggv7C?B91YpPQqSYGzoZMGCyZ2hpF)j%Mjsxya;0wG!Dfc#4z9VroO&8;!{n!1&e zM*DhVeZB*vPwtGh@}+Rpm77&2YSR+YWN)P*FBT09ltD3#IK(~(VqMhd#uNkusulr! zBsFLyhUj!*;kxSXsS8MTs$5!ab)DyHKmJH#aQg2e6VDHn*pjvq`||S&qr;lS$iX9K z`?&49Rll_14W`>0ZkLC1bijBDbMSV#WvAuPvi7P~kuUYdVLR0HJMPj3Yi_uW83~41 zrL1BpHj6I3?PM#7(lHgu8%8g}rC0crBAQS+GlBX{nRm#bNOs`KMYlFT`Ic}-s>3cg zQj>^=Ul%LtiX;h-80kf_!{4;nSOT7Fncg+7X31DZyk_YyL^$%J9n7 zQcliyuY#sa!wD0quzvEux3(XNu_LKwK%JmV9GD+uXJ;YXZ#F!rWatmqzK4|1x}-g? z1+K=lM!WrKx3w~}pKDBqc1cz>c2S#av9X6d?QllejiSq?9s`~{cS}p``yVy?#e+7G zCi!4PduJ!c!uUAFD5+O3*Va^v~W1`T#UMy1@z zVFb8p?dG3G#wnVx*i*LC?IpweZoGO=XUca(StL|FqIJCVeq;%FNohlJ3W2|*OcC9r zMd)jo5%P^=1!!*@{^OU$Iu1+RCn~N)+bQO z{w4*-$)0w(dY-kMKJ4D_=I0}BSvM|*Jd>K_NDD-kJ}#`%l7wE|jB3nUi~7Qzv>7W1 zCulw<1HeQ?>gNqxp_K-Id-wFVVKdC;T>Q;U?;d>*gh00_oFVU(E0KYG!KDm7nf98-BCg!wr9QCom{+A_X4HrJJV((BwE59%U^GHgtPbqJ$*)ag}Q^onJ|)nKnTb1sdsz>9W1~;)Xr}T=FEl(I|AiR>oba3ghN#H z13I%6b%e&^re~u%q1SdabnlPXZ(Vo@?L9>(m+{Dw4!5B2p|`r-tdQfTM42pFy9)Wk zCV8>&Vx#9~7{|5h;n5b%g+py9S9)&?1&DpoC-zMzdBV(Mt)|yG?!k`pSww{9?lV(k zK@z&v$I`Vbmy@t@$ujyKBsF1fg}_6+)?yt5JFJjqNX|_5JQ2Evnp4E;l>Jk*J7}-L zJG}~*1FW+`(XAyR2bs2Rv>6ao+)xU_5xf8CQ3gQ-X - + using System; using System.Collections; using System.Collections.Generic; @@ -99,7 +99,7 @@ namespace FastReport } - + diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 91482771..c5778153 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -75,19 +75,19 @@ False - ..\..\..\..\ChengDa\sggl_cd\SGGL\FineUIPro.Web\bin\FastReport.dll + C:\Users\1420031550\Desktop\fastreport\FastReport.dll False - ..\..\..\..\Development\DepCode\reference-bll\Reference BLL\FastReport.Bars.dll + C:\Users\1420031550\Desktop\fastreport\FastReport.Bars.dll False - ..\..\..\..\Development\DepCode\reference-bll\Reference BLL\FastReport.Editor.dll + C:\Users\1420031550\Desktop\fastreport\FastReport.Editor.dll False - ..\..\..\..\ChengDa\sggl_cd\SGGL\FineUIPro.Web\bin\FastReport.Web.dll + C:\Users\1420031550\Desktop\fastreport\FastReport.Web.dll False diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx index 1f57eda8..ac4ee185 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx @@ -53,10 +53,17 @@ + + + + - + @@ -70,16 +77,22 @@ Width="60px" HeaderTextAlign="Center" TextAlign="Center" /> + TextAlign="Left" Width="150px"> - + TextAlign="Left" Width="70px"> + + + + + @@ -95,6 +108,9 @@ DataField="CreateDate" SortField="CreateDate" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px"> + + diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.cs index 53612203..659e38fe 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.cs @@ -17,6 +17,8 @@ namespace FineUIPro.Web.HJGL.DataImport //this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); this.InitTreeMenu();//加载树 + Funs.FineUIPleaseSelect(DropImportType); + GetButtonPower(); } } @@ -123,11 +125,13 @@ namespace FineUIPro.Web.HJGL.DataImport if (tvControlItem.SelectedNodeID == "1" || tvControlItem.SelectedNodeID == "2") { this.btnNew.Hidden = true; + this.btnDelete.Hidden = true; this.btnSearch.Hidden = true; } else { this.btnNew.Hidden = false; + this.btnDelete.Hidden = false; this.btnSearch.Hidden = false; @@ -150,7 +154,7 @@ namespace FineUIPro.Web.HJGL.DataImport from ( select * from HJGL_DataImport a where not exists (select 1 from HJGL_DataImport b where a.FileName=b.FileName and a.UnitWorkId=b.UnitWorkId and a.Version listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID)); @@ -159,6 +163,11 @@ namespace FineUIPro.Web.HJGL.DataImport strSql += " AND Import.FileName LIKE @FileName"; listStr.Add(new SqlParameter("@FileName", "%" + this.txtfilename.Text.Trim() + "%")); } + if (DropImportType.SelectedValue != Const._Null) + { + strSql += " AND Import.ImportType=@ImportType"; + listStr.Add(new SqlParameter("@ImportType", DropImportType.SelectedValue)); + } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); // 2.获取当前分页数据 @@ -175,7 +184,7 @@ namespace FineUIPro.Web.HJGL.DataImport from ( select * from HJGL_DataImport a where exists (select 1 from HJGL_DataImport b where a.FileName=b.FileName and a.UnitWorkId=b.UnitWorkId and a.Version listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID)); diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.designer.cs index 2f911897..4c081816 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.designer.cs @@ -122,6 +122,15 @@ namespace FineUIPro.Web.HJGL.DataImport /// protected global::FineUIPro.TextBox txtfilename; + ///

+ /// DropImportType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList DropImportType; + /// /// btnSearch 控件。 /// @@ -140,6 +149,24 @@ namespace FineUIPro.Web.HJGL.DataImport /// protected global::FineUIPro.Button btnNew; + /// + /// btnDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnDelete; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label1; + /// /// ToolbarSeparator2 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx index ba19648a..30bb0382 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx @@ -17,7 +17,8 @@ - + + diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx index 40dd942f..ef3bb3b0 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx @@ -45,7 +45,7 @@ EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId" AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId" AllowSorting="true" SortField="DataImportId" SortDirection="ASC" OnSort="Grid1_Sort" - EnableCheckBoxSelect="true" EnableMultiSelect="false" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick" + EnableCheckBoxSelect="true" EnableMultiSelect="true" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick" AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"> @@ -53,10 +53,17 @@ + + + + - + @@ -70,16 +77,23 @@ Width="60px" HeaderTextAlign="Center" TextAlign="Center" /> + TextAlign="Left" Width="150px"> - + TextAlign="Left" Width="70px"> + + + + + + @@ -95,6 +109,9 @@ DataField="CreateDate" SortField="CreateDate" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px"> + + diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs index 7e64ba40..8fcd1ba3 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs @@ -17,6 +17,7 @@ namespace FineUIPro.Web.HJGL.DataImport //this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); this.InitTreeMenu();//加载树 + Funs.FineUIPleaseSelect(DropImportType); GetButtonPower(); } } @@ -122,11 +123,13 @@ namespace FineUIPro.Web.HJGL.DataImport if (tvControlItem.SelectedNodeID == "1" || tvControlItem.SelectedNodeID == "2") { this.btnNew.Hidden = true; + this.btnDelete.Hidden = true; this.btnSearch.Hidden = true; } else { this.btnNew.Hidden = false; + this.btnDelete.Hidden = false; this.btnSearch.Hidden = false; @@ -158,6 +161,11 @@ namespace FineUIPro.Web.HJGL.DataImport strSql += " AND Import.FileName LIKE @FileName"; listStr.Add(new SqlParameter("@FileName", "%" + this.txtfilename.Text.Trim() + "%")); } + if (DropImportType.SelectedValue !=Const._Null) + { + strSql += " AND Import.ImportType=@ImportType"; + listStr.Add(new SqlParameter("@ImportType", DropImportType.SelectedValue)); + } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); // 2.获取当前分页数据 diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.designer.cs index c843e2b1..928b530d 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.designer.cs @@ -122,6 +122,15 @@ namespace FineUIPro.Web.HJGL.DataImport /// protected global::FineUIPro.TextBox txtfilename; + /// + /// DropImportType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList DropImportType; + /// /// btnSearch 控件。 /// @@ -140,6 +149,24 @@ namespace FineUIPro.Web.HJGL.DataImport /// protected global::FineUIPro.Button btnNew; + /// + /// btnDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnDelete; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label1; + /// /// ToolbarSeparator2 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx index 0baf50bc..74ab256e 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx @@ -73,7 +73,7 @@ - +