From 6d0290896ef51ef9f594de35cfe0199882941ed4 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Wed, 12 Oct 2022 18:36:04 +0800 Subject: [PATCH] =?UTF-8?q?2022-10-12=20=E7=BB=84=E4=BB=B6=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E4=B8=89=E7=BB=B4=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/HJGL/DataImport/DataImportService.cs | 20 +++++++++ SGGL/FineUIPro.Web/Controls/_3DLook.ascx | 1 + .../Excel/DataIn/组件管理二维码信息导入.xlsx | Bin 9480 -> 9450 bytes .../File/Fastreport/组件打印.frx | 4 +- .../HJGL/InfoQuery/PipelineQuery.aspx | 2 +- .../HJGL/InfoQuery/PipelineQuery.aspx.cs | 20 ++++++++- .../HJGL/PreDesign/PrePipelineQRCodeIn.aspx | 4 +- .../PreDesign/PrePipelineQRCodeIn.aspx.cs | 39 ++++++++++-------- .../common/mainMenu_HJGL_AVEVA.aspx | 7 ---- SGGL/Model/HJGL/3DParameter.cs | 2 + 10 files changed, 67 insertions(+), 32 deletions(-) diff --git a/SGGL/BLL/HJGL/DataImport/DataImportService.cs b/SGGL/BLL/HJGL/DataImport/DataImportService.cs index d3ad796c..548fb438 100644 --- a/SGGL/BLL/HJGL/DataImport/DataImportService.cs +++ b/SGGL/BLL/HJGL/DataImport/DataImportService.cs @@ -166,6 +166,26 @@ namespace BLL var newVersion = MaxVersion + 0.1m; return newVersion; } + public static string Getlatest3DModelNameByUnitWorkId(string UnitWorkId ) + { + string result = ""; + var q = (from x in Funs.DB.HJGL_DataImport + where x.UnitWorkId == UnitWorkId && x.ImportType == "1" + group x by x.UnitWorkId into tt + from t in tt.DefaultIfEmpty() + select new + { + FileName = (from x2 in tt where x2.Version == tt.Max(x => x.Version ) select x2.FileName).FirstOrDefault() + } + ).FirstOrDefault(); + //where t.Key == UnitWorkId & x.FileType == "1" select x.Version).Distinct().ToList(); + if (!string.IsNullOrEmpty(q.FileName)) + { + result=q.FileName.Substring (0,q.FileName.LastIndexOf('.')); + + } + return result; + } public static void InitVersionDownList(FineUIPro.DropDownList dropName, string UnitWorkId) { diff --git a/SGGL/FineUIPro.Web/Controls/_3DLook.ascx b/SGGL/FineUIPro.Web/Controls/_3DLook.ascx index ab9ea8c0..5b127caf 100644 --- a/SGGL/FineUIPro.Web/Controls/_3DLook.ascx +++ b/SGGL/FineUIPro.Web/Controls/_3DLook.ascx @@ -22,6 +22,7 @@ function BindData(dataList, Url_item,Url) { receiver.src = Url_item; // var newdatalist = dataList.split(","); + // console.log(dataList); receiver.contentWindow.postMessage(dataList, Url); } function iFrameHeight() { diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/组件管理二维码信息导入.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/组件管理二维码信息导入.xlsx index ec2e63a9185d39fe8bf6c48160fabb96b3a9b02b..2b9badb3748280c4dbac6cab317f490a964d2095 100644 GIT binary patch delta 2128 zcmY*ac{J3G8lGWB)-h$$3{!>~-<91oC0ogsB}}sK(lkh9UuS-V468GheDjno@Ex?{ z^+UT1F}v6#d(s4Z*-nHaP>yCX-II*Q!X97_ef9gt-OuC-5N zmLzMln2)c0+>Flr=F-&zG=H^m9jBfb205>QS%5Px8lRCO+I4uw;p|} zvq0hT7A4eHgsILup+egaquey({-iJ2q`4r?*%izk&Xs;$KAsWkBXpceH- zKke^XzA5Q63vrA&QK1v4n8i`PfZQZaLNEG z6?OWb5h0;|*RUN*7o98@m!tf`)se=mAhS+aQs9V72SHq4?-5u+Ye;s&`yoJ-O9*-^ zZ%90?M>!(c!IK2V^kJEVIV$|Lj#Wyx^ayW8+I00MC^5M>ellbX!_HsYcDMK#TW7sz5Tn-Hy8|B2i>NVqN*&mQqj9_oNb?O=%u4|Eo5y%kr zsX94kegY8ZkxaA{QIF~!X%mxNJD%@#6?%Krd$U9!Wk)f|ZEY+d)163Rd`ydh*qryi zlw>3-T##F|s_(%&J>>hLKwaMIe2f_CLkxyf{W;~%`q|Vw*>f)R0_*0k)h^A=*=(;k}}ea;a;Vg)xnt%tx+)8CC$BU(yM9mP=KDxji^BL zpX1`!-XJ+{aDhN|P`aI@{DOo|Bq;1vse8s==)`ZV`Hi z2xNoeELd#oOlx^iDNg?NG}5CD*uxEPxST~v|G85I<4d1_ZwKuQuSfHR{o%9(h&(WV5>uK8 zZD71jjcYF=TL%Nt$(MP12g>(q9a-0{jEV~7t$iPaZ_1V|=`Vub|o9wqI zkmxW)BCp6V?ub4*FEE#5sIZwSKDl+jUO#X#26y*#R{4+W71BH%A=V( z@}aD`l~2@twN&GE`5h`HowA~F@Cti!qEg zI(NtmH)r@T5kOyfHZCmrN|sRb?2oWZM%&(EM-95(mk8!!-Dtt(LiGAOxX*8CLYc;`sTbFN`+q zfk2>8x;+XFq+Ky?(?&et+z&yr*=CmTN8N$f;nTGrxCOi4p$ysW4X0SWI;RvNWv*IL zK1`j8WzrCg-Fkcty83l#3y9pXX^SsGaH=GiRO05ZaJAlC42Y*Ae0&vC`>(*o`%G5` z3zaJ&x|C1`&9+_9f*%?{k(4IIl?n<)-c@n#XaZgec8*`ejV7O0J2~cW)kDXr(KG#c zrM4CP`HL|2fgz=*4@sq6p6}~iwBo*C8~XNlZfZo>q*sF5Cn*a z{)YQlexeu`1S@BzT9Ja50Rtv&%80mG=#g%B#PdRjPSHu2JHrgTE^ z0jKb@wVa4Vz(DP+7AM`CVrjJr?dY*zqUovdYj4{dHVzD$)bc%+DNpfiDY4g0F>@WP zt7+^G)eXBl*F7SH{6`B<4pU*lGzHdw9^u|A%y^RApc~<5BmO=c0G?_2Adg%lnvKv( zZ<)9B$=e*C&9a}0(?sIZ z*3k(%4(Df>j&~jm)L&YO4Fw}mP5bcos-VB)hF{_u_kUlqgOmkWi2g=O0sT9EKp^BV zC4QH-Al*q&jQ$P>r%PhRxJbhEG~ttfkE)_@f!{naIt7bC|Ifo<5D4)b{M8XqbQhE; weE=&9cBb!RiC|Z{2~J)7FL{lAk)3{J-|_!jaHcbGm%wcLEDp=_M)EJ{KVbyQ!~g&Q delta 2150 zcmY*adpr{g8@A1*Hf+-rv(qpgQ^=A+?rCmQI>?>PJ@+FlAI@A3;d7sIiL^o?j8RQ) zqg+EXtwP8pxo@W;_tWY3{l32M{p)>y&-?uKKF{+mnkAdlM}>uAN7RZXsguG-DWe9k zR=dS>_EBf|SW zbsV$wW7TwfP__qNo_%K0y`;dcN$J7*sCe2EO5uljS@n?+m!gtSVx?XZ3|Mzj_TeTu zY3-o4m}?Ew?zp*V8bF}m5t~Cf^;HxDkF z`ro|R&wz(T_!Osdl0%e|J^JHR zq-lm+kA|(rc)i3b#DVFgOcwDjsKql39GO>iOeY|0Kc}EGe&_*Tf+}RePt#I=+Sv9u z-Z4%69kfD$1bNMxJy9Pea5=?m)MZ$zIbuLV#k1i_=uxoR-SuL72^L*JcTmAJ@ceFL zeP3M^Tm7BMhEZkR=U^RO3_dr|d5NAvrU))INL;YUFnco5& zJRXl-E%_DV4tK5Sp&^jt&>icCeFxmmryCsnP@X7aC0M0RA;s|?^;SDnZ)~+>l)Z_v zbt5-r+$ZngT{eDUj4d%$1CWYjSXxL+>`YnOnK`>xDzgUFP-ir+>5F~&lhO|vUDZrx zn1;Tz`D8KJJ}@jV_fdVZRc=LfEf%r~Hu5cmjSRFh`-<&O=faz5J(%k2>vvv73Z~s2 zXj%l5PPkK48ccdl9w=@vt0HA)@slsN-Ul+Gx%Lx6n8tobdU%!A5boiGwSTfSnKb!0ejmrVMWrghz# zFHrk%I!1}VnP}@wA#unZeGuh8RP9!5tU3Cd3x#**e($O6j9feEqKZsZL{-U)j~4zh z{W{h9v2*F(W(9F=|29>YJ87688jCE-d3(p-{|TEflozV7H495I68yR1S z_Y%9gSsw|pWcv=Wb#Ch;Hgmg0gBacwdlc$LaV(IKOT8|B4tBRPgk?h#wWC49G+ycb zd6v;4o(MiDGepLV00acOs20*FN_L$&$PjTMibauf4fd9VXTLLp!7P4xESnqt-5vd3S_nr4^1 z4HF5W&ULg4+U5zGYREhmbftZIO~1WtYBC?4ODWv+e)qn)8nhXmACY%$@}k{Jbj(Ha z#_H`0?yxS08JS*z$zB`tWnf#yGG6A8*>&&$eKS zAHmWylvtH`!;B0fyYgvk-_!DD9M2Oe)@4SIQ&h5G4zee-EOC#cp&E>AGWKMUjJ5iF z3B~({#tb?@L^EYZtA>SRp*nw28^OSfv*I&Ncdu3+mDNlF`&kXTOTc$#!ij#{KIdx* zMU7!5D`f2##q~ny=j<4I=;_CSGK~zqq@hc^v5$PFn?`QsGf5E}&v@&gSY{W(Da-Jf zx{gx#d{ut93}vBO@OLuGB`?+ID_ca?D7pOx?fe(UU)s+o*f$SN-E)%oI%%97Wvs*S zyMd^)-|Q$yg0LeG`1=x6g|s|UPOd`PLQ&4xLB1&VR5V{MHCW(B{wyCQfd2EOb>)8p zh*PuVRZu_kNI*bJ;D5_dlWwUR#kgUG@l0nyZPj1}Mys)~ZP%s(eK`%ZBA9*FS&BSll=74!f*RF(op J_@&%G(BHJh+w%Yb diff --git a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx index 734cba38..6ee8779c 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 } - + diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx index 4a272a97..7220bc2e 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx @@ -83,7 +83,7 @@ - - - + --%> diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs index 937fa07f..c0386ee6 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs @@ -169,17 +169,17 @@ namespace FineUIPro.Web.HJGL.PreDesign Model.HJGL_Pipeline pipeline = new Model.HJGL_Pipeline(); Model.HJGL_Pipeline_Component hJGL_Pipeline_Component = new Model.HJGL_Pipeline_Component(); - string pioelinecode = pds.Rows[i]["管线号"].ToString(); + string pipelinecode = pds.Rows[i]["管线号"].ToString(); string PipelineComponentCode = pds.Rows[i]["预制组件"].ToString(); string QRCode = pds.Rows[i]["二维码信息"].ToString(); - if (string.IsNullOrEmpty(pioelinecode)) + if (string.IsNullOrEmpty(pipelinecode)) { result += "第" + (i + 2).ToString() + "行," + "管线号" + "," + "此项为必填项！" + "|"; } else { - pipeline = getPipeline.FirstOrDefault(x => x.PipelineCode == pioelinecode); + pipeline = getPipeline.FirstOrDefault(x => x.PipelineCode == pipelinecode); if (pipeline == null) { result += "第" + (i + 2).ToString() + "行," + "不存在此管线号" + "|"; @@ -194,9 +194,9 @@ namespace FineUIPro.Web.HJGL.PreDesign else { hJGL_Pipeline_Component = HJGL_PipelineComponentService.GetPipelineComponentByCodeandpipelineId(PipelineComponentCode, pipeline.PipelineId); - if (pipeline == null) + if (hJGL_Pipeline_Component == null) { - result += "第" + (i + 2).ToString() + "行," + "不存在此预制组件" + "|"; + result += "第" + (i + 2).ToString() + "行," + "不存在此预制组件 " + PipelineComponentCode + " |"; continue; } @@ -222,32 +222,35 @@ namespace FineUIPro.Web.HJGL.PreDesign .GroupBy(x => new { pipelinecode = x.Field("管线号"), PipelineComponentCode = x.Field("预制组件"), - DrawingName = x.Field("预制图纸名称"), + // DrawingName = x.Field("预制图纸名称"), }) .Select(x => new { pipelinecode = x.Key.pipelinecode, PipelineComponentCode = x.Key.PipelineComponentCode, - DrawingName = x.Key.DrawingName, + // DrawingName = x.Key.DrawingName, QRCode = String.Join("&", x.Select(z => z.Field("二维码信息"))) }); foreach (var item in dt) { var pipeline = PipelineService.GetPipelineByPipelineCode(item.pipelinecode.Replace("\n", "").Replace(" ", "").Replace("\t", "").Replace("\r", "")); var hJGL_Pipeline_Component = HJGL_PipelineComponentService.GetPipelineComponentByCodeandpipelineId(item.PipelineComponentCode.Replace("\n", "").Replace(" ", "").Replace("\t", "").Replace("\r", ""), pipeline.PipelineId); - - model.Pipeline_ComponentQRCodeRootName rootName = new model.Pipeline_ComponentQRCodeRootName(); - rootName.QRCode = new List(); - var elementlist = item.QRCode.Split('&'); - foreach (var element in elementlist) + if (hJGL_Pipeline_Component!=null) { - model.Pipeline_ComponentQRCodeQRCodeItem qRCodeQRCodeItem = new model.Pipeline_ComponentQRCodeQRCodeItem(); - qRCodeQRCodeItem.element = element; - rootName.QRCode.Add(qRCodeQRCodeItem); + model.Pipeline_ComponentQRCodeRootName rootName = new model.Pipeline_ComponentQRCodeRootName(); + rootName.QRCode = new List(); + var elementlist = item.QRCode.Split('&'); + foreach (var element in elementlist) + { + model.Pipeline_ComponentQRCodeQRCodeItem qRCodeQRCodeItem = new model.Pipeline_ComponentQRCodeQRCodeItem(); + qRCodeQRCodeItem.element = element; + rootName.QRCode.Add(qRCodeQRCodeItem); + } + hJGL_Pipeline_Component.QRCode = JsonConvert.SerializeObject(rootName); + //hJGL_Pipeline_Component.DrawingName = item.DrawingName; + Pipeline_ComponentList.Add(hJGL_Pipeline_Component); } - hJGL_Pipeline_Component.QRCode = JsonConvert.SerializeObject(rootName); - hJGL_Pipeline_Component.DrawingName = item.DrawingName; - Pipeline_ComponentList.Add(hJGL_Pipeline_Component); + } errorInfos = string.Empty; diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HJGL_AVEVA.aspx b/SGGL/FineUIPro.Web/common/mainMenu_HJGL_AVEVA.aspx index 2a957146..3cfdee14 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_HJGL_AVEVA.aspx +++ b/SGGL/FineUIPro.Web/common/mainMenu_HJGL_AVEVA.aspx @@ -13,22 +13,15 @@
- - - - - diff --git a/SGGL/Model/HJGL/3DParameter.cs b/SGGL/Model/HJGL/3DParameter.cs index 1e1c3af4..3646d2a3 100644 --- a/SGGL/Model/HJGL/3DParameter.cs +++ b/SGGL/Model/HJGL/3DParameter.cs @@ -12,6 +12,8 @@ namespace Model /// 按钮类别 /// public string ButtonType { get; set; } + + public string ModelName { get; set; } /// /// 颜色模型 ///