From 00aeaac1e23f79e040e134caee9e845764086ffb Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Mon, 10 Oct 2022 09:56:40 +0800 Subject: [PATCH] =?UTF-8?q?2022-10-10=20=E7=84=8A=E6=8E=A5=E6=9D=90?= =?UTF-8?q?=E6=96=99=E7=BC=96=E7=A0=81=E5=BA=93=E5=AF=BC=E5=85=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8F=8A=E5=85=B6=E7=9B=B8=E5=85=B3=E8=81=94=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9=E3=80=82=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E3=80=82=E5=90=88=E5=90=8C=E5=8A=B3=E5=8A=A1=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/API/HJGL/APIHJGLIndexService.cs | 81 ++++++++++++++++++ .../BLL/API/HJGL/APIPackagingManageService.cs | 6 +- .../API/HJGL/APIPipelineComponentService.cs | 12 +++ SGGL/BLL/BLL.csproj | 2 + .../HJGL_WeldingReportService.cs | 59 +++++++++++-- .../File/Excel/DataIn/MaterialCodeLib.xlsx | Bin 10502 -> 10457 bytes .../HJGL/BaseInfo/MaterialCodeLib.aspx | 6 +- .../HJGL/BaseInfo/MaterialCodeLibIn.aspx.cs | 14 +-- .../HJGL/DataImport/MaterialInformation.aspx | 12 +-- .../HJGL/WeldingManage/WeldMatMatch.aspx | 6 +- .../SetSubReviewEdit2.aspx.cs | 2 +- SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx | 4 +- SGGL/Model/APIItem/HJGL/HJGLIndexItem.cs | 43 ++++++++++ SGGL/Model/HJGL/PackagingManageItem.cs | 2 + SGGL/Model/Model.csproj | 1 + .../Controllers/HJGL/HJGLIndexController.cs | 36 ++++++++ .../HJGL/PackagingManageController.cs | 4 +- SGGL/WebAPI/WebAPI.csproj | 2 + 18 files changed, 260 insertions(+), 32 deletions(-) create mode 100644 SGGL/BLL/API/HJGL/APIHJGLIndexService.cs create mode 100644 SGGL/BLL/API/HJGL/APIPipelineComponentService.cs create mode 100644 SGGL/Model/APIItem/HJGL/HJGLIndexItem.cs create mode 100644 SGGL/WebAPI/Controllers/HJGL/HJGLIndexController.cs diff --git a/SGGL/BLL/API/HJGL/APIHJGLIndexService.cs b/SGGL/BLL/API/HJGL/APIHJGLIndexService.cs new file mode 100644 index 00000000..37d17258 --- /dev/null +++ b/SGGL/BLL/API/HJGL/APIHJGLIndexService.cs @@ -0,0 +1,81 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Model; +namespace BLL +{ + public class APIHJGLIndexService + { + public static Model.HJGLIndexItem GetJGLIndexItem(string projectid) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + Model.HJGLIndexItem hJGLIndexItem = new Model.HJGLIndexItem(); + var PipeRate1 = BLL.HJGL_WeldingReportService.GetPipeRate_finished(projectid); + var PipeRate2 = BLL.HJGL_WeldingReportService.GetPipeRate_unfinished(projectid); + + var getCH_CheckItemList = (from x in Funs.DB.HJGL_Batch_NDEItem + join y in Funs.DB.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId + join z in Funs.DB.View_HJGL_WeldJoint on y.WeldJointId equals z.WeldJointId + join line in Funs.DB.HJGL_Pipeline on z.PipelineId equals line.PipelineId + where z.ProjectId == projectid + select new Model.sp_index_HJGLItem + { + ProjectId = line.ProjectId, + ID = x.NDEItemID, + UnitId = line.UnitId, ///重定义单位 + UnitName = z.UnitName, + WorkAreaId = line.UnitId, /// 重定义区域 + MaterialId = line.UnitWorkId, ///重定义材质 + CHT_TotalFilm = x.TotalFilm, + CHT_PassFilm = x.PassFilm, + Specification = z.Specification, + WeldTypeCode = z.WeldTypeCode, + JointAttribute = z.JointAttribute, + UnitWorkName = z.UnitWorkName, + MaterialCode = z.MaterialCode + }).ToList(); + var tb_type06 = getCH_CheckItemList.GroupBy(x => x.JointAttribute).Select(x => new { + JointAttribute = x.Key, + Current_pass_film = x.Sum(m => m.CHT_PassFilm) ?? 0, + Cht_totalfilm = x.Sum(m => m.CHT_TotalFilm) ?? 0 + }); + var GC_model = tb_type06.Where(x => x.JointAttribute == "预制口").FirstOrDefault(); + var XC_model = tb_type06.Where(x => x.JointAttribute == "安装口").FirstOrDefault(); + double PassRate1 = 0; + double PassRate2 = 0; + if (GC_model!=null &&GC_model.Cht_totalfilm>0) + { + PassRate1 = Math.Round((100 * GC_model.Current_pass_film * 1.0) / GC_model.Cht_totalfilm, 1); + } + if (XC_model!=null&& XC_model.Cht_totalfilm > 0) + { + PassRate2 = Math.Round((100 * XC_model.Current_pass_film * 1.0) / XC_model.Cht_totalfilm, 1); + } + hJGLIndexItem.GCFirstPassRate = PassRate1.ToString()+" %"; + hJGLIndexItem.XCFirstPassRate = PassRate2.ToString()+" %"; + + hJGLIndexItem.GCProgress = BLL.HJGL_WeldingReportService.GetGCRate_finished(projectid).ToString() + "/" + HJGL_WeldingReportService.GetSumSize(projectid, 1).ToString() + " DIN"; + hJGLIndexItem.XCProgress = BLL.HJGL_WeldingReportService.GetXCRate_finished(projectid).ToString() + "/" + HJGL_WeldingReportService.GetSumSize(projectid, 2).ToString() + " DIN"; + + if (PipeRate1 + PipeRate2 == 0) + { + hJGLIndexItem.PipePrefabricationRate = "0 %"; + } + else + { + hJGLIndexItem.PipePrefabricationRate = Math.Floor(Math.Round(decimal.Parse((PipeRate1 / (PipeRate1 + PipeRate2)).ToString("0.000")), 2) * 100).ToString()+" %"; + + + } + hJGLIndexItem.GCWelderEfficacy = HJGL_WeldingReportService.GetWelderEfficacy_GC(projectid).ToString()+" DIN/天"; + hJGLIndexItem.XCWelderEfficacy = HJGL_WeldingReportService.GetWelderEfficacy_XC(projectid).ToString()+" DIN/天"; + + return hJGLIndexItem; + } + + } + } +} diff --git a/SGGL/BLL/API/HJGL/APIPackagingManageService.cs b/SGGL/BLL/API/HJGL/APIPackagingManageService.cs index 36fdf88c..6d2edd1b 100644 --- a/SGGL/BLL/API/HJGL/APIPackagingManageService.cs +++ b/SGGL/BLL/API/HJGL/APIPackagingManageService.cs @@ -10,7 +10,7 @@ namespace BLL { public class APIPackagingManageService { - public static List GetPackagingManageList(string projectId) + public static List GetPackagingManageList(string projectId,int pagesize,int pageindex) { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { @@ -28,8 +28,9 @@ namespace BLL ContactName = x.ContactName, ContactPhone = x.ContactPhone, StackingPosition = x.StackingPosition, + State= x.State, }).Distinct(); - return q.ToList(); + return q.Take(pagesize*pageindex).Skip(pageindex).ToList(); } } @@ -50,6 +51,7 @@ namespace BLL ContactName = x.ContactName, ContactPhone = x.ContactPhone, StackingPosition = x.StackingPosition, + State =x.State }).FirstOrDefault(); var tb_packing = (from x in db.HJGL_PackagingManage where x.PackagingManageId==packagingManageId select x ).FirstOrDefault() ; var PipelineComponentIdList = tb_packing.PipelineComponentId.Split(','); diff --git a/SGGL/BLL/API/HJGL/APIPipelineComponentService.cs b/SGGL/BLL/API/HJGL/APIPipelineComponentService.cs new file mode 100644 index 00000000..d66aa67d --- /dev/null +++ b/SGGL/BLL/API/HJGL/APIPipelineComponentService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + public class APIPipelineComponentService + { + } +} diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 085a5278..ace51f53 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -145,10 +145,12 @@ + + diff --git a/SGGL/BLL/HJGL/WeldingManage/HJGL_WeldingReportService.cs b/SGGL/BLL/HJGL/WeldingManage/HJGL_WeldingReportService.cs index ea1002bc..8a5b030f 100644 --- a/SGGL/BLL/HJGL/WeldingManage/HJGL_WeldingReportService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/HJGL_WeldingReportService.cs @@ -46,7 +46,7 @@ namespace BLL return result; } /// - /// 工厂预制完成率 + /// 工厂预制完成数 /// /// /// @@ -72,7 +72,7 @@ namespace BLL return result; } /// - /// 工厂预制未完成率 + /// 工厂预制未完成数 /// /// /// @@ -83,7 +83,7 @@ namespace BLL return result; } /// - /// 现场安装完成率 + /// 现场安装完成数 /// /// /// @@ -109,7 +109,7 @@ namespace BLL return result; } /// - /// 现场安装未完成率 + /// 现场安装未完成数 /// /// /// @@ -120,7 +120,7 @@ namespace BLL return result; } /// - /// 管道完成预制率 + /// 管道完成预制数 /// /// /// @@ -131,7 +131,7 @@ namespace BLL return result; } /// - /// 管道未完成预制率 + /// 管道未完成预制数 /// /// /// @@ -141,6 +141,11 @@ namespace BLL result = GetSumSize(projectId, 0) - GetPipeRate_finished(projectId); return result; } + /// + /// 焊工功效 + /// + /// + /// public static decimal GetWelderEfficacy(string projectId) { decimal result = 0; @@ -160,6 +165,48 @@ namespace BLL } + return decimal.Truncate(result); + } + public static decimal GetWelderEfficacy_GC(string projectId) + { + decimal result = 0; + var db = Funs.DB; + var q = (from x in db.HJGL_WeldJoint + join y in db.HJGL_WeldingDaily on x.WeldingDailyId equals y.WeldingDailyId + where x.ProjectId == projectId && x.JointAttribute=="预制口" + group x by x.ProjectId into g + select new + { + TotalDin = g.Sum(x => x.Size), + worktime = g.Select(x => x.WeldingDailyId).Distinct().Count(), + }); + foreach (var item in q) + { + result = decimal.Divide((decimal)item.TotalDin, item.worktime); + + } + + return decimal.Truncate(result); + } + public static decimal GetWelderEfficacy_XC(string projectId) + { + decimal result = 0; + var db = Funs.DB; + var q = (from x in db.HJGL_WeldJoint + join y in db.HJGL_WeldingDaily on x.WeldingDailyId equals y.WeldingDailyId + where x.ProjectId == projectId && x.JointAttribute == "安装口" + group x by x.ProjectId into g + select new + { + TotalDin = g.Sum(x => x.Size), + worktime = g.Select(x => x.WeldingDailyId).Distinct().Count(), + }); + foreach (var item in q) + { + result = decimal.Divide((decimal)item.TotalDin, item.worktime); + + } + return decimal.Truncate(result); } } diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/MaterialCodeLib.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/MaterialCodeLib.xlsx index 1d62630adf544ff2df4e610e6b6c038067d6403c..d03e27fbe6c8a4c293581c01756e3a8f12ddec55 100644 GIT binary patch delta 2225 zcmZ9Oc{J1w7sr3LVURJlhCyT-ON6p7BNBtkGDT*>jIxzI#-XN0V@cVDNm;U!F}AT) zMorQpk0zBTB+96G2HCTX$Md}BJe~92bM86!obUbX-tYaKo8mF--qZ&o@`?%)zVics z4+sDt000m!7{o_Jhv6b3!t@CjFI1xc2p>U8cAuWH^iDM8@ripILci1;Md^%WN7^09 zU{0X9*m$OdgL@`(RcJ%fdc^}h{mu(DUd}K{k<<^t4L?%O+MYEv9Yix`#O0N#uMFhK=(^mc0QvwI?kWE9(qWu zGC!=B%wbB>yQj`qtiB~Va$2$*QYajOOmx-$%A;oa+gDLigjzmLznrmTg+T{uQQ#r| zMr=G+j%YOEYo2u-G@~UnWL7yHSP@ex6nKr{lxa6H)xtK6`=ecn43MTBaz#=!rlU3O z?iCXJXuXP$;L#_$SJRUQYE{^grIs)GZhnkkuu=+;551FS^**KsGEU^JZ%=*UUD^0K zIXdp=SMz=TbMe4{b5@JI8tqe&1VU|ZPtHU>n0O~yHYbEQO9>w7k%9~_=R8>mFx^gl z*4(&=N0M%++}NynMe@Gx+ec6*gVuUJYv(O0`q>BA*|4hTQ%{=HEb!ft^x=y&BXmgr zm17a;!pqDd+R*ZOM(E7(iczk~27RvdZD+Fo^~nvzAfr#gj&_N)Ab#`6;xCt`n_W#S zh^)-#^atj#hi&CiIaJ-=G~`jHAqQ74U83`twaf6@L zE@5iL%JbuCBSvTgu&?0~Te;#aD;P*^NU?T&u7+B-5r4nvgHM=Wwkhc!u$c7xxcEW8 zxJLeAFPfGX;6HUv&vrSALkqv=%nbep8dz*(^Molm0y2z7ura^rJD1zs(cOD^BShhf zsSw>VMh{A+%#(S-Wr=!3jX<}es-`_-F4|)k6HjrX^l(0oxu)Q%9j4l_v&1!x`sTx{ z;`7GFgM<}=*MS59eAOK4u7jZl8;pGwetOWav2Zw7>Mz3Sg;Vh-2c^9?I(b_mm)Pec z;J~qL_HeGrz={z5)S=SOTd@!&$Iy#1@x)&tas8_xf~-T`xe!Hzg0C$VYGnu44#r|# z_)eS=7qu`wBHsEbV7onsY5gv*Q@Eyc7_#je{6P(;>pOj%50x&}yVUS5CBm1xS-`<$ zSFkL5wJdAEyh2x$Xa&6idp*!(C~1@@km!%WICX4~lbxf_Pq=Lebd?Wg<>&Pq5bKvk zU)zZIV*IZ>ay5KeS4o_lzFX$DCFOTJhPw~j__S#2pkOMrJBA$e^XrQPWfz!r>LuOt z1+ZF|4GryX5Rtt_jclTPek}c>!+=eSyt*!p+WHaR_IY!{_#rMU&~(HNhOI9p-G$IM z??c9sa|)^1itt5gcdr_)CjMhkqM^IRntGY9YnHD2;EtymYRgQMnjhxa2CIKJ^M+Fp zSOLV_h_IEb35ruodUjUBq)YH=mr{-rD4gJ5S`2$_)hFlkP&_X_uRsm)_AJAIa#YzM ziRY^!w#^d;fSsLP;_d9TXb(8K9f)$)b8cm5_Zgf~2kVhR@mxY($QNI}>6*{IkZTvJWOsvg=BiXL@~x329=>g43EvK^71eT;)vVPi zGDO2l>mpfR0cmwlWj)DI4B3W_NA6Wk5@pm%7(5 zHaa9cDCS=TXERX(b~5BdRy?fQlp%WKWq+lJNSxdT&@-oQ*_0SGmU!A#J5)o}1f-W2 z+dlG9opt-w+&4qT9nk}AR^KBbYnCmE)FAGA>JKYK_i(xyLvr&O3%M{^u}!>%9mp0} z*Ie?K-FJqAWp-;q)5*TbUe9ve36Yzgg>de#r$?MNy8HJC`A7)LRUHOb4|$ZN(-9-k z2T@OaxVkF69pN}qfPcF=?IExN?bZy=no>^$QGeCT_@+0m6 z>~iN(g)5qS_fhNTuSw)0VFb-!Z$YV_)(}4qW(yI1FKDG_<+08TEn|vXReWM(dVODp zLxJ~WzJIP0Y-1Qz=eav3EW=RMfREVvP_Jy3)K`L$#JG2n1LI6TR%@iktwFm83*5ib zvjRruhV(_1jdyIvw~W<`FTUPS;KQSb;W6^7G|Jk@z}=o1XpxCkCnM7WVM(p()L>aKwXKUG|Al=sUTVJBPwBF~o&ue_q8O z(d-m_p%Jgx@uW#PEjTL=ha7rS{R8muN0bWA>QzH~ZO;lI(1fSNHqYek{80 zFPBD{ml@b@epwlv-p8_UW{~A;$n0y7o{b;EQ#KE}&J4IKQ_Lisr3M)qWqQuAVw?8l ztc}sg%VnRkcCwtDot%#qHN_b1R|XPpZ~n69j067?uSLyC0Q}zvKoQV7F31K00Oc`Q zffAu5srVa)007&y=kE{@r~DLCpsZ?1QY;{nV!s6$%7hk@ub85WP=WuyyMK4JQ7{NC g#s5~i%UkGgakrXPq1;1Q^Tkuf5NaTM&40AN0ck7zp#T5? delta 2263 zcmY*bc|6mNAKzwZ?yJQ%_t9KK)8Ps^lB2nA;a%8zRm7_%N zjwdBYA|hv6?#J`{qh7zyU!T|K_~-L}zdx_{s7-=xZ7&B!!4ksP3;}_3IY1zO5C}vH zQj5eB1HJJ0Kny83sLb99H?1zv_OO1xeNE2_^+80&7P|Ys8d|wzJ4X{D3O6xA7pta+ zWV$F5gpvB33(iSGIzQzG@xJ4Io6i-5=aT2+l*RrUSyT5q<_OEJJTzf-c0kee2K5;A z%sKd!AH{Jpb)1F&8c35oVy-6x$~1|$^IjW@NIi8)Ox0D%Pe{drh7It%?-Y_1XbQ+& z>htN?&{GS=_R7}?p4k=TX>ec5Ih_PJd^Lky_EuwOis7%brb5z`C)lwSFaouBhhgR_IO1 zsg+l~aVPFsfj8A_r*WAR4u*y)^1RMQymK0fIo-4u?T~u-ioQcJ`A6ceYKyORXt7Qb zI8Bppz9i2YD6vgF#NWC3-7|W7x_g7%CI1+Ss}JaZ4{?m^Pb|nw-i$$L-(Ek7pm(#c zODfSBys_LG6<6OaFHeKRBi^GUyfi6stkp@xqX>(8Qjx`(K5iep&G@vgW-|DCI$zOn zrha9wBewiLJ@W@bKE_r*!J-;*iF+$$!gsGdoJ`~Ea2_5hb8~T?JJe*zc9xE8^;hZQ zwkTTkXOcd?Vyr)=GTK}dgV~s0gFF`5eR3~jr;phz9Mb9P-P;UpsY$~Y<%u}n)eYQU zIoHMlRvoy~lAVIjP@R1RPkU-sh~1ndE`~mP8D(@opuwOzKdY+Odu99E)GYBDug9ko zpOyNo1*m!^8N#+S#-;{crjZ>C><(3?SxqnRvH@9aB6Z_1EQG5wK50mX4Fu}o0FXRV zl#l5jr34a|l{dr%SgTs&T`6@BTFoDyba?xHDu0rY=4HwCrS`$rl6Y;QeTs+)Qj3RU z4O zB6H|Y_K9~(De9U`aF1p2m7yui>UtkI<>H2drVek_n#^dzIguHvPf4jBb%>>I@4?N7 zOIel=Z%n*=`HsmxT~G%*BKMT@=$-MUNa30rTUFZf0?IlS@iD#m|u# zOT)*{_~q$fJQhtHM)ZeQ3Ov(1ggx>JOKKh%av}LGG*$44dUE8-=U!F%6wwC8jB4^O zplMmEGXO~poyb9kh4BxDQx8UM%8&P zr-F&o-AWioLQX%Oza>nd$d0l*A^Ez7{I+zHE1(ho{ba-rkJoGGzI#(H&0b0m{yD0S zsuUH6_Pnua2@s4`&FY9scfPUs=5P3|;MybXqnbAf$6c;7l&6w%R@xZmdx&>DWks>9 zIWf_U-5nL~5nU_aBBD{UX`9e=vE{JeY00$->k^%ZU8m5)ER}&ebmRa9k6t%SCfIvz zA>$GaV+bOBcskdv*!}@Q_V*9I-~PVOkPTOdIuFNWWe)0DO_-giOS{VkiUud=KgyX8 z!7G%+GjDv^mRytlM8rtno+GsC_rJN$W|VPC2=_^%@6~aQh=1gL%&)5G*%!33XZSZH z9;V2UrN#%IoYDEaeqLIcL-nr6S=9i=IJleQdDq3VQ-Q-~gyE81*sGZpr~St9x=cQ- zAPgXfn5EH7q&}L=z(0_d~}*)U+#J&S;B3Pjc>p&k}_kt5K5UQ&FT{boxuGxm86wt@3!H5PQ*2qsuMf z6#U!N0E)Ja=Q+D_hB5Lr9DD9T z86HAYPk*03T~+6tV31snHOLLI&Nd`v-hY9IkHyE8=0!f9A=&e2-=$72R_=f|znery z0j%wrZo6BzIsx*^&%qLuzWvA1`PJ|>TV0%Q`0t zD`*oTSCL4=@2unMI`UU3M;jq`1&*}~p@jQ1#vn#|0>cuDzhd4D(w9JS-W7&% zM0mGN8imQ1R!=z*-uqHfx#@LudDNJO+sXyhn425#i+*3>;1Nv1pyYJo^Nrx90O$KZ z9Z}X7Jen6f7Fwk>UiKhYnKYtMxel_S4V2D19`c3l#07d?6A7uTKz_277FhvWX dej|L~QUw2R2q6s+(R$!ApcXC55vuTC?_Zmx4dMU* diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx index 68cbaa81..0aac678a 100644 --- a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx @@ -49,16 +49,16 @@ TextAlign="Left" SortField="MaterialCode"> - - + --%> diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibIn.aspx.cs index 21af2ed2..276504bc 100644 --- a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibIn.aspx.cs @@ -128,7 +128,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo return; } - DataRow[] dv = ds.Tables[0].Select("采购码 <>'' and 元件类型 <>''"); + DataRow[] dv = ds.Tables[0].Select("元件编码 <>'' and 类型 <>''"); //导入数据库 if (dv.Length > 0) { @@ -137,20 +137,20 @@ namespace FineUIPro.Web.HJGL.BaseInfo HJGL_MaterialCodeLib item = new HJGL_MaterialCodeLib(); #region 数据验证和赋值 - if (dv[i]["采购码"] != null && !string.IsNullOrEmpty(dv[i]["采购码"].ToString())) + if (dv[i]["元件编码"] != null && !string.IsNullOrEmpty(dv[i]["元件编码"].ToString())) { - item.MaterialCode = dv[i]["采购码"].ToString(); + item.MaterialCode = dv[i]["元件编码"].ToString(); } else { - errorInfos += (i + 2) + "Line, [采购码] 不能为空
"; + errorInfos += (i + 2) + "Line, [元件编码] 不能为空
"; } item.MaterialDef = dv[i]["材料描述"].ToString(); item.MaterialSpec = dv[i]["规格"].ToString(); - item.MaterialMade = dv[i]["材质"].ToString(); + // item.MaterialMade = dv[i]["材质"].ToString(); item.MaterialUnit = dv[i]["单位"].ToString(); - item.MaterialName = dv[i]["元件类型"].ToString(); - item.PipeGrade = dv[i]["管道等级"].ToString(); + item.MaterialName = dv[i]["类型"].ToString(); + //item.PipeGrade = dv[i]["管道等级"].ToString(); //item.ProjectId = CurrUser.LoginProjectId; //= SQLHelper.GetNewID(typeof(Model.Editor_CostReport)); if (!codeLib.Select(x => x.MaterialCode).Contains(item.MaterialCode)) diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx index 334fd323..afd641fa 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx @@ -116,12 +116,12 @@ FieldType="String" HeaderText="规格" HeaderTextAlign="Center" TextAlign="Left"> - - + --%> - - + --%> - diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx.cs index 86d3877a..e89130f1 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx.cs @@ -46,7 +46,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement PHTGL_BidApproveUserReviewService.InitGetBidCompleteDropDownList(DropBidCode, true); Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.DropConstructionManager, null, Const.UnitId_SEDIN, null, true); Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.DropProjectManager, null, Const.UnitId_SEDIN, null, true); - BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropApproval_Construction, CurrUser.UnitId, Const.ConstructionMinister, Const.ConstructionViceMinister, false); + BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropApproval_Construction, null, CurrUser.UnitId, Const.ConstructionMinister + "," + Const.ConstructionViceMinister, false); BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropDeputyGeneralManager, null, this.CurrUser.UnitId, Const.DeputyGeneralManager, false); if (PHTGL_ActionPlanReviewService.IsSpecialProject(this.CurrUser.LoginProjectId)) { diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx b/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx index 07c0c843..c8a71ad8 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx +++ b/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx @@ -12,14 +12,14 @@ text-align: center; min-width: 0.75rem; margin-right: 0.02083rem; - font-size: revert; + font-size: smaller; color: #6ceff1; } .real-time-echarts02 { text-align: center; min-width: 0.75rem; margin-right: 0.02083rem; - font-size: revert; + font-size: smaller; color: rgb(6 247 192 / 85%); } .real-time-echarts02-unit { diff --git a/SGGL/Model/APIItem/HJGL/HJGLIndexItem.cs b/SGGL/Model/APIItem/HJGL/HJGLIndexItem.cs new file mode 100644 index 00000000..847a9dc5 --- /dev/null +++ b/SGGL/Model/APIItem/HJGL/HJGLIndexItem.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Model +{ + public class HJGLIndexItem + { + /// + /// 工厂焊接一次合格率 + /// + public string GCFirstPassRate { get; set; } + /// + /// 现场焊接一次合格率 + /// + public string XCFirstPassRate { get; set; } + /// + /// 工厂预制进度 + /// + public string GCProgress { get; set; } + /// + /// 现场预制进度 + /// + public string XCProgress { get; set; } + /// + /// 工厂焊工功效 + /// + public string GCWelderEfficacy { get; set; } + /// + /// 现场焊工功效 + /// + public string XCWelderEfficacy { get; set; } + /// + /// 管道实时预制率 + /// + public string PipePrefabricationRate { get; set; } + + + + } +} diff --git a/SGGL/Model/HJGL/PackagingManageItem.cs b/SGGL/Model/HJGL/PackagingManageItem.cs index 9053d68d..aff7930a 100644 --- a/SGGL/Model/HJGL/PackagingManageItem.cs +++ b/SGGL/Model/HJGL/PackagingManageItem.cs @@ -14,6 +14,8 @@ namespace Model public string ContactName { get; set; } public string ContactPhone { get; set; } public string StackingPosition { get; set; } + + public int? State { get; set; } } public class PackagingPrepipeItem diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj index b9e9474d..7920e6e0 100644 --- a/SGGL/Model/Model.csproj +++ b/SGGL/Model/Model.csproj @@ -63,6 +63,7 @@ + diff --git a/SGGL/WebAPI/Controllers/HJGL/HJGLIndexController.cs b/SGGL/WebAPI/Controllers/HJGL/HJGLIndexController.cs new file mode 100644 index 00000000..aea521a0 --- /dev/null +++ b/SGGL/WebAPI/Controllers/HJGL/HJGLIndexController.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Http; +using System.Web.Mvc; + +namespace WebAPI.Controllers +{ + /// + /// + /// + public class HJGLIndexController : ApiController + { + /// + /// 获取首页数据分析 + /// + /// + /// + public Model.ResponeData GetJGLIndexItem(string projectId) + { + var responeData = new Model.ResponeData(); + try + { + responeData.data = BLL.APIHJGLIndexService.GetJGLIndexItem(projectId); + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + + return responeData; + } + } +} \ No newline at end of file diff --git a/SGGL/WebAPI/Controllers/HJGL/PackagingManageController.cs b/SGGL/WebAPI/Controllers/HJGL/PackagingManageController.cs index e6b714d4..35ef68e5 100644 --- a/SGGL/WebAPI/Controllers/HJGL/PackagingManageController.cs +++ b/SGGL/WebAPI/Controllers/HJGL/PackagingManageController.cs @@ -13,12 +13,12 @@ namespace WebAPI.Controllers /// public class PackagingManageController : ApiController { - public Model.ResponeData GetPackagingInformationList(string projectid) + public Model.ResponeData GetPackagingInformationList(string projectid, int pagesize, int pageindex) { var responeData = new Model.ResponeData(); try { - responeData.data = BLL.APIPackagingManageService.GetPackagingManageList(projectid); + responeData.data = BLL.APIPackagingManageService.GetPackagingManageList(projectid, pagesize,pageindex); } catch (Exception ex) { diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj index 9324051f..6379af06 100644 --- a/SGGL/WebAPI/WebAPI.csproj +++ b/SGGL/WebAPI/WebAPI.csproj @@ -169,6 +169,7 @@ + @@ -293,6 +294,7 @@ +