From 6ac768b911b4ddc93466a19b89969257c86d8f87 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Thu, 19 Oct 2023 10:12:45 +0800 Subject: [PATCH 1/2] 2023-10-19 --- .vs/SGGL_SeDin/v17/.wsuo | Bin 264192 -> 265216 bytes .../0-3合同管理（Menu_HTGL）.sql | 63 ++- .../1-6合同管理（Menu_PHTGL）.sql | 39 +- SGGL/BLL/Common/Const.cs | 17 +- .../BillOfQuantities/PhtglQuantityService.cs | 133 ++++- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 24 + .../HJGL/WeldingManage/WeldReportEdit.aspx.cs | 4 +- .../BillOfQuantities/TemQuantityList.aspx | 253 +++++----- .../BillOfQuantities/TemQuantityList.aspx.cs | 24 +- .../TemQuantityList.aspx.designer.cs | 9 + .../BillOfQuantities/TemQuantitySelect.aspx | 60 ++- .../TemQuantitySelect.aspx.designer.cs | 9 - .../ContractTrackComparison.aspx | 293 +++++++++++ .../ContractTrackComparison.aspx.cs | 476 ++++++++++++++++++ .../ContractTrackComparison.aspx.designer.cs | 467 +++++++++++++++++ .../ContractCompile/ContractTrackList.aspx | 6 +- .../ContractTrackList.aspx.designer.cs | 63 --- .../ContractTrackProgressDetection.aspx | 16 + .../ContractTrackProgressDetection.aspx.cs | 17 + ...actTrackProgressDetection.aspx.designer.cs | 26 + .../PHTGL/ContractCompile/ContractWBS.aspx | 213 ++++++++ .../PHTGL/ContractCompile/ContractWBS.aspx.cs | 270 ++++++++++ .../ContractWBS.aspx.designer.cs | 278 ++++++++++ SGGL/FineUIPro.Web/common/Menu_DigData.xml | 65 ++- SGGL/FineUIPro.Web/common/Menu_HTGL.xml | 13 +- SGGL/FineUIPro.Web/common/Menu_JDGL.xml | 6 +- SGGL/FineUIPro.Web/common/Menu_PHTGL.xml | 5 +- SGGL/FineUIPro.Web/common/Menu_ZHGL.xml | 42 -- 28 files changed, 2562 insertions(+), 329 deletions(-) create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.cs create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.cs create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.designer.cs diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 1261326e19e8a0a1a723af7550cb66d640766925..b7abaf608b485145db2dbe1e6478c8798dc30905 100644 GIT binary patch delta 2277 zcmcJRZERCj7{`0gy?wE3x2}7kY_PF0SP`mS>9#TqD{RP%xG6=l!~h!|d;vxaEh`(a z0s=;t2z_F%XtE&DeejcT6ZXvvF!6(n_*oL8d_X}(P1Zy(IR8)S)e=H9zMSOO^Y+~5 zJokT|b8ge8UFo-6r(bX$HJMD+U=El|m(}?fVrh|)yPfmi58WFxeIXWOVv-KZVKGKo z+3j$kUjt@PsI;U(oT8*MB4U(P=5KN5CwQ_FZ8InVmi%}b>SE9YeuK>{)a;P$xfJEc zAM_sl-ba<=Okd+hFASc{Kj1^X1T+Fye$03&5qp=4JfW06F;$R=x4-y~=4uCVDfHYubKcv>j zDq9B|j_qM(t&K0SvMOLz*}y2}=(DOupKDgN0;uj zm$FqOVt|s>UC!JLXPIFk_UPH_F5wi9$d#Bo`uAM&{ZZ)B%*Sj6-CaE_)>5)_M697K zeiu@5&2ckFXQKPFo~5f5*gnr3I_>EfyC~~HaD48K^v|iZo|3b>oPvWbJWDyX*bx_M ziY969w&zK1JwoBy$#JtPwEc?e(Lz$~qMqU^*Qsmk4s^UXIClN4G9A2fYulS&tFcUd zhf^4rkD-R1s2^1_p2S0eMQjhpq$k@y6S?qNqTsZJuLmjVUfX*5xY|#N=5EeSu}{w~ zFA|v!ti%5KHZ<0uM91hqjJuS57)3?a&*pnxcX_8oj}Qn1C_n{fU;$QO15W@uC;^5G zqjndJRTQ*uqOA+>jJOb6Dg57{_bs>uz61R9_o#mWcfgO}C-5`)6`bi?;6P<8GDC5D znVF+5{Uhp3=&$m2S;Y2ee(87HyH%ULK-5RGP5))}s}4QAAuTR$5>gjk?Sj%9H_+ke zBHFT{C=&^v?@{#&o4bYn#^$)l)P^a%71U0i?^X41?*|Iq?hn)LXr&(Bal@wFsF5|c zTn2OA+2SEe53G>=KAId@p@gD>>SP(MjMo+UBAeQp+Wc+9I|F)nuMoP}->y(NR;g`n zkh|LP{`^7>&4C?DTm1doeg39st1sw}27RF&(U33L8u0hEZ0}pz6544pK|gHlStWJ! z<%U!kyLd5vLfBS4&1(df(Wmi6Mf}y}D+Yxwr`mb{>BUc)OCtEBZ8xnp^;~12a8xc; zXk!6cW4U7Lz?U;q=cRoYJ!ZZ;9olt8T|l?zRi011Hm(XutBzMqR7r7DXuWqtr#AGF zY&kV#5feied9s9#?F>!?J#xxAUMc0JdMVTiF;C8jlU_OQRld?HEowlk_sUM~bw!P6 z+pOxl+LTqT;Xe_kRhqD>ArgZ#^!A`zb4zuh_NAiMWBGE;p{T(>ds7zl)>>5m?_|XQ AVE_OC delta 3329 zcmeI!eRPvo9l-JD-lQc5(vm=6ffkmQQo6pZ=_qMCpafbRuwjd38#*Q}D-5;{Xlc5% z%q4TY%z@hGrv%0}u}+*Xb8F+QqOuB8r{VzJ)H$cybe`$a;~UvzFU;@l5>JQQj(VJb zdC&Re{+|2XJonz`-sgF4be}8Q>*{TEO|&e_i%IY(%Sz-04yu@L%WB@fV#&srpHL;7 zh)TEKrtXrYZg9Rvnn0P!#qBOo+azR*sCG%(W-NE5PMDKZh%=CnamYkD&T`I2o&{6y zRr5ni=jqrf?m&*bGS^Y#PSu=AUWf})$EId>DlR227**~kuHgzZ?Bf{KK#O-|P{F{z zJE$?UGR>gumShK}M|^~4@MB>5YsO=8Gp2O^b138Rwdtwc#O5BD+|)Da?MCED)qRr@ z>2rtVbjF=_Rc$xdl_g_yrE!91p!GHtd&?8q$Fh`}^K|db6w2xBs49}s_$G&$B-6py zi^rdIn!4lPQ1}*g-3Og!ZcI-`dUJ3>*mKFKf@P^#N;9H#)9dI+7aX4$b~-t*A>Fo~ ztfb3xv$|7~o(88`K6=zybwEOsA{lp>Kgk*Qf&aYa%2;uyxg`lpBm&?)o zS_#e=mSA}CKL$wymh^R>CmXuFHdd$H+C5XZwC&BbPqwW(F*bfm+vn=48i{rn6}7e1 zn(CyA`ioaTfB)g<9@_Ezkt3^jomkpcch8M?Ke^v_y7K66*Tfqg_6K5xby*{~&`$mI ztxR+l?y>a;b;1+)z3SWIIk#((Tj;_EaVxfC2X^b#QG#bKR$(f@M#>vXK*h*i_hWn_yX?37jZuxzyJo3 zz?bkKzKkJ!1z*Ksd<|d6H*f?GVOT{h>zf2eaSRXRTlhA5>J=&^9-KFukdR;hu^`>;pp@i%KBPztN%)V z8cDo>7x6co!Ap1r=6|n}pM~P-F~|R#W!TqJ8gbHU7P8@jY28h3o?{bFCQQFE&!gOn zDVT~Jd3@s7eXSa3Rbs_M-w9VKyo;2LV)}8a22W zb1@I|QHuo#Vj&ix4)s`!ci|E&!BQ;4rDjoGMz9?3MgtnL0`EZ+R^oD8fh(~J@5TFY z6;|VFydP`Oj25iLHE6{;tjD$3fQ`5g*P9Er;RbBNW^6$_Ik12 z2XHeYh~i(FTJtXa|J1%?Q)@2#-=A7JTlPX`jF~&7(sp zCT*qQ3Yer*PqQoG4*Zdiiz8P1W}nI?M|#UWy;c2hOJiAtRd|;E#iTjo- zhxG2SOR&9GudyWBUTd>5mE`G(;%P4(>`+P;c1@DK9mNvu^3UfruB`pG@GVyrgoBpl zIK@IRo5g~fwN(|Zvn$q>t*@-EDyy9BuP&=@t*R(%nLWo}UDL8|&bokq=)NM|r2hH+ zzam_&l_h#>?cmm+Z4BEF(@)veoo99@W($(qnG6jV=%DKFxjpXk(C@~_CJar@RKHP& z>`KQM-D|6l_Z-oIT|Evp)Z@@Q$H#m3sMUK1bhh}9kB$E+OFM>c^6BkL7HzB?s`TpP gV-6K+%@7&xkSAaN!6pmC_3!*1X=jl>RAhVl?=O{wdjJ3c diff --git a/DataBase/菜单初始化脚本/0-3合同管理（Menu_HTGL）.sql b/DataBase/菜单初始化脚本/0-3合同管理（Menu_HTGL）.sql index 5a6ab701..80aeb926 100644 --- a/DataBase/菜单初始化脚本/0-3合同管理（Menu_HTGL）.sql +++ b/DataBase/菜单初始化脚本/0-3合同管理（Menu_HTGL）.sql @@ -1,11 +1,11 @@ ---delete from Sys_ButtonToMenu where MenuId in (select MenuId from Sys_Menu where MenuType='Menu_HTGL') ---go ---delete from Sys_Menu where MenuType='Menu_HTGL' ---go - ---INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) ---VALUES('E9D387EB-2797-43E3-AACE-93413839CCF7','合同管理','',10,'0','Menu_HTGL',0,0,1) ---GO +-- delete from Sys_ButtonToMenu where MenuId in (select MenuId from Sys_Menu where MenuType='Menu_HTGL') +-- go +-- delete from Sys_Menu where MenuType='Menu_HTGL' +-- go +-- +-- INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +-- VALUES('E9D387EB-2797-43E3-AACE-93413839CCF7','合同管理','',10,'0','Menu_HTGL',0,0,1) +-- GO INSERT Sys_Menu ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) VALUES ( N'E36CBDD0-2E49-415E-BBE7-B8222F40D749',N'合同模板',20,N'0',N'Menu_HTGL',1,0,1) @@ -158,17 +158,44 @@ GO VALUES ( N'DADA9037-FB84-4F87-B582-22D8C9060CA2',N'10586190-0FDD-4DA8-A877-CE4599D6F0DF',N'保存',4) GO INSERT Sys_Menu ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) -VALUES ( N'1C770E20-7912-484C-9739-499B1B2F8DEB',N'电仪安装工程',N'PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5',60,N'8213BE20-2680-4A13-91B8-49028BB89869',N'Menu_HTGL',1,1,1) +VALUES ( N'1C770E20-7912-484C-9739-499B1B2F8DEB',N'电仪安装工程','',60,N'8213BE20-2680-4A13-91B8-49028BB89869',N'Menu_HTGL',1,0,1) GO - INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) - VALUES ( N'4A66821E-D8EE-4D1B-953D-7D18323A46DA',N'1C770E20-7912-484C-9739-499B1B2F8DEB',N'增加',1) - INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) - VALUES ( N'6CD2EF60-3F20-4A1F-B920-39A696EE1948',N'1C770E20-7912-484C-9739-499B1B2F8DEB',N'修改',2) - INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) - VALUES ( N'CD5B9E2F-52F1-496B-B34D-5C4F27881645',N'1C770E20-7912-484C-9739-499B1B2F8DEB',N'删除',3) - INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) - VALUES ( N'08F6077E-DEC5-4965-BC39-D81439B867B9',N'1C770E20-7912-484C-9739-499B1B2F8DEB',N'保存',4) - GO + INSERT Sys_Menu ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) + VALUES ( N'3593DF22-78C1-4A73-8468-B20CB44D88C9',N'电气工程',N'PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.1',10,N'1C770E20-7912-484C-9739-499B1B2F8DEB',N'Menu_HTGL',1,1,1) + GO + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'E85E577E-D291-4BE4-A188-1299627CB9BF',N'3593DF22-78C1-4A73-8468-B20CB44D88C9',N'增加',1) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'96284F37-5F44-45BC-9A76-07C5951B65FA',N'3593DF22-78C1-4A73-8468-B20CB44D88C9',N'修改',2) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'B449607E-78A1-4D43-B96F-DC005B63D0A9',N'3593DF22-78C1-4A73-8468-B20CB44D88C9',N'删除',3) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'C0DAC9B2-E39B-4424-B84B-88CDC840366E',N'3593DF22-78C1-4A73-8468-B20CB44D88C9',N'保存',4) + GO + INSERT Sys_Menu ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) + VALUES ( N'3ECE6333-6785-424D-996E-B923A650D8C7',N'仪表工程',N'PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.2',20,N'1C770E20-7912-484C-9739-499B1B2F8DEB',N'Menu_HTGL',1,1,1) + GO + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'0F96E48B-F865-4735-916E-8A981E004898',N'3ECE6333-6785-424D-996E-B923A650D8C7',N'增加',1) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'D482584F-9CFD-4490-8BC3-9E19053F4E0D',N'3ECE6333-6785-424D-996E-B923A650D8C7',N'修改',2) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'D59B5E5F-C8B0-4ABB-AE90-0574F5057FA5',N'3ECE6333-6785-424D-996E-B923A650D8C7',N'删除',3) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'27A4B058-2DAA-49DD-BDA6-27E87DF14EFA',N'3ECE6333-6785-424D-996E-B923A650D8C7',N'保存',4) + GO + INSERT Sys_Menu ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) + VALUES ( N'480F8C85-F5F2-4C5C-BE72-2ADABB7250CF',N'电信工程',N'PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.3',30,N'1C770E20-7912-484C-9739-499B1B2F8DEB',N'Menu_HTGL',1,1,1) + GO + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'FE761E62-A580-470E-AE7D-ACC112F816F1',N'480F8C85-F5F2-4C5C-BE72-2ADABB7250CF',N'增加',1) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'3CF4C013-1A1E-4FB9-926B-CE50F187EFA5',N'480F8C85-F5F2-4C5C-BE72-2ADABB7250CF',N'修改',2) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'C13CB62F-8793-460F-A0D0-8FBBA7F588A4',N'480F8C85-F5F2-4C5C-BE72-2ADABB7250CF',N'删除',3) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'89CF8033-B506-41E2-96D5-9D2406D814D0',N'480F8C85-F5F2-4C5C-BE72-2ADABB7250CF',N'保存',4) + GO INSERT Sys_Menu ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) VALUES ( N'92101A90-9C22-4B43-B012-9AFF8402F85D',N'水暖安装工程',N'PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=6',70,N'8213BE20-2680-4A13-91B8-49028BB89869',N'Menu_HTGL',1,1,1) GO diff --git a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql index ef9d7f04..e29a1926 100644 --- a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql +++ b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql @@ -191,7 +191,7 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOff GO INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'ִͬи',N'PHTGL/ContractCompile/ContractTrackList.aspx',40,0,N'Menu_PHTGL',0,1,1) + VALUES ( N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'ͬ۸Ϣ',N'PHTGL/ContractCompile/ContractTrackList.aspx',40,0,N'Menu_PHTGL',0,1,1) GO INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) VALUES ( N'5AD91BF5-4CA6-4A9E-A370-D17B0D99010F',N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'޸',2) @@ -201,4 +201,41 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType], VALUES ( N'DD9A3A8A-8DD9-4B24-B51D-C3EB530B60F2',N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'',4) INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) VALUES ( N'C1708178-C52B-4D32-9849-C69622D96105',N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'',1) + GO + +INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) + VALUES ( N'98269480-3F36-4169-A91D-16144D903C6C',N'WBS',N'PHTGL/ContractCompile/ContractWBS.aspx',50,0,N'Menu_PHTGL',0,1,1) + GO + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'08CD24EB-98F4-407D-822F-8CF9C8D33E82',N'98269480-3F36-4169-A91D-16144D903C6C',N'޸',2) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'97308133-D190-4AD7-917F-A2AF444E8462',N'98269480-3F36-4169-A91D-16144D903C6C',N'ɾ',3) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'0B7306D1-A4A8-4C3C-814F-B28B991C5488',N'98269480-3F36-4169-A91D-16144D903C6C',N'',4) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'3D4B433D-EA34-4D0C-B744-E12CE232171C',N'98269480-3F36-4169-A91D-16144D903C6C',N'',1) + GO +INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) + VALUES ( N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'öԱͳ',N'PHTGL/ContractCompile/ContractTrackComparison.aspx',60,0,N'Menu_PHTGL',0,1,1) + GO + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'E2C32BE6-A98D-4A6E-A2C5-6C2A50CF1105',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'޸',2) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'C375017D-7521-4339-8CAB-029CD3EBB36B',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'ɾ',3) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'64464E85-267F-4559-89D4-FB6F1E2B5FA5',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'',4) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'1859C0E1-437C-419F-ABEE-63EE72E24AFC',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'',1) + GO +INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) + VALUES ( N'F545E899-B3B5-4B49-A741-DE19356553D5',N'ȼ',N'PHTGL/ContractCompile/ContractTrackProgressDetection.aspx',70,0,N'Menu_PHTGL',0,1,1) + GO + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'646C7C58-350D-484D-91BD-2FD3754FFD3E',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'޸',2) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'6765754C-917B-4C07-A0F6-CCDED2ABDD07',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'ɾ',3) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'1F7FDDC4-2746-4B65-9F65-37C71F11D342',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'',4) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'D11BD092-6A18-44A3-8ABD-9CF9B95340E1',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'',1) GO \ No newline at end of file diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 829132a1..b5f1c295 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3206,6 +3206,9 @@ namespace BLL public const string TemQuantityListMenuId3= "FAC4F0F7-A7C0-4F66-8BCB-846C082BCA40"; public const string TemQuantityListMenuId4= "10586190-0FDD-4DA8-A877-CE4599D6F0DF"; public const string TemQuantityListMenuId5= "1C770E20-7912-484C-9739-499B1B2F8DEB"; + public const string TemQuantityListMenuId5_1= "3593DF22-78C1-4A73-8468-B20CB44D88C9"; + public const string TemQuantityListMenuId5_2= "3ECE6333-6785-424D-996E-B923A650D8C7"; + public const string TemQuantityListMenuId5_3= "480F8C85-F5F2-4C5C-BE72-2ADABB7250CF"; public const string TemQuantityListMenuId6= "92101A90-9C22-4B43-B012-9AFF8402F85D"; public const string TemQuantityListMenuId7= "33A03E2C-4E00-4722-AA14-F50419468154"; public const string TemQuantityListMenuId8= "A5A31FE8-0643-4396-99E3-A4A31A947789"; @@ -3215,9 +3218,21 @@ namespace BLL /// public const string PHTGL_BidProjectQuantityMenuId = "687991B6-73AC-42FA-9A72-178AF94D1EB4"; /// - /// 合同执行跟踪 + /// 合同价格信息 /// public const string PHTGL_ContractTrackMenuId = "D9BAB30E-3255-4EA0-8631-EF15C9203EFD"; + /// + /// WBS工作包 + /// + public const string PHTGL_ContractWBSMenuId = "98269480-3F36-4169-A91D-16144D903C6C"; + /// + /// 费用对比统计 + /// + public const string PHTGL_ContractTrackComparisonMenuId = "D715B66F-8E99-498F-87DA-E85B4B8EB923"; + /// + /// 进度检测 + /// + public const string PHTGL_ContractTrackProgressDetectionMenuId = "F545E899-B3B5-4B49-A741-DE19356553D5"; #endregion diff --git a/SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs b/SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs index 0e6a5cd1..ee9616c6 100644 --- a/SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs +++ b/SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs @@ -17,6 +17,10 @@ namespace BLL return Funs.DB.PHTGL_Quantity.FirstOrDefault(x => x.Id == Id); } + public static PHTGL_Quantity GetPHTGL_QuantityByNumBer(string serialNumber,string marjor) + { + return Funs.DB.PHTGL_Quantity.FirstOrDefault(x => x.SerialNumber == serialNumber && x.Major==marjor); + } public static void AddPHTGL_Quantity(PHTGL_Quantity newtable) { @@ -132,10 +136,24 @@ namespace BLL public static ResponeData ImportData(string path, string majortype) { var responeData = new ResponeData(); - List rows; + List rows= new List(); + List remarkQuery=new List(); + string Major = ""; try { - rows = MiniExcel.Query(path).ToList(); + var sheetNames = MiniExcel.GetSheetNames(path); + foreach (var item in sheetNames) + { + if (item=="编制说明") + { + remarkQuery = MiniExcel.Query(path, sheetName: item).ToList(); + } + else + { + rows = MiniExcel.Query(path, sheetName: item).ToList(); + } + } + } catch (Exception e) { @@ -154,17 +172,46 @@ namespace BLL return responeData; } + Major = GetMajorItems().Where(x => x.Text == majortype).Select(x => x.Value).FirstOrDefault() ?? + ""; + List consts=new List(); + int SortIndex = 0; + foreach (var item in remarkQuery) + { + if (string.IsNullOrEmpty(Major)) break; + Model.Sys_Const model = new Model.Sys_Const() + { + ID = SQLHelper.GetNewID(), + ConstValue = item.A?.ToString(), + SortIndex = SortIndex, + GroupId = "工程量清单-"+ Major + }; + consts.Add(model); + SortIndex++; + } + + var old = ConstValue.drpConstItemList("工程量清单-" + Major); + if (old.Count>0) + { + Funs.DB.Sys_Const.DeleteAllOnSubmit(old); + Funs.DB.SubmitChanges(); + } + ; + Funs.DB.Sys_Const.InsertAllOnSubmit(consts); + Funs.DB.SubmitChanges(); foreach (var item in modeList) { - item.Major = GetMajorItems().Where(x => x.Text == majortype).Select(x => x.Value).FirstOrDefault() ?? - ""; - if (string.IsNullOrEmpty(item.Major)) break; + item.Major = Major; + if (string.IsNullOrEmpty(Major)) break; + if (string .IsNullOrEmpty(item.ProjectName)) continue; + if (item.ProjectName== "项目名称") continue; var queryPhtglQuantity = new PHTGL_Quantity { Major = item.Major, SubProject = item.SubProject, SubItemProject = item.SubItemProject, ProjectCode = item.ProjectCode, + ProjectName = item.ProjectName, IsTemplate = true }; var resultModel = GetPHTGL_QuantityByModle(queryPhtglQuantity); @@ -256,17 +303,19 @@ namespace BLL public static ListItem[] GetMajorItems() { - var list = new ListItem[10]; + var list = new ListItem[12]; list[0] = new ListItem("0", "土建工程"); list[1] = new ListItem("1", "钢结构预制工程"); list[2] = new ListItem("2", "工艺管道安装工程"); list[3] = new ListItem("3", "工艺设备安装工程"); list[4] = new ListItem("4", "非标设备现场制作安装工程"); - list[5] = new ListItem("5", "电仪安装工程"); - list[6] = new ListItem("6", "水暖安装工程"); - list[7] = new ListItem("7", "防腐绝热工程"); - list[8] = new ListItem("8", "无损检测工程"); - list[9] = new ListItem("9", "消防工程"); + list[5] = new ListItem("5.1", "电气工程"); + list[6] = new ListItem("5.2", "仪表工程"); + list[7] = new ListItem("5.3", "电信工程"); + list[8] = new ListItem("6", "水暖安装工程"); + list[9] = new ListItem("7", "防腐绝热工程"); + list[10] = new ListItem("8", "无损检测工程"); + list[11] = new ListItem("9", "消防工程"); return list; } @@ -305,12 +354,14 @@ namespace BLL (string.IsNullOrEmpty(table.Remarks) || x.Remarks.Contains(table.Remarks)) && x.IsTemplate == table.IsTemplate && (string.IsNullOrEmpty(table.ParentId) || x.ParentId.Contains(table.ParentId)) - - select new { x ,IntSerialNumber= Funs.GetNewIntOrZero(x.SerialNumber.Replace(".", "")) - } + + select x; + //select new { x ,IntSerialNumber= Funs.GetNewIntOrZero(x.SerialNumber.Replace(".", "")) + // } ; - var model = q.ToList().OrderBy(x => x.IntSerialNumber).Select(itemx => itemx.x).ToList(); + //var model = q.ToList().OrderBy(x => x.IntSerialNumber).Select(itemx => itemx.x).ToList(); + var model = q.ToList().OrderBy(x => x.SerialNumber, new CustomComparer()).ToList(); return model; } @@ -350,9 +401,61 @@ namespace BLL }; } + public static void CheckSubProjectName(List list) + { + foreach (var item in list) + { + var SubProject = ""; + var SubItemProject = ""; + var SerialNumberArry = item.SerialNumber?.Split('.'); + if (SerialNumberArry.Length==2) + { + item.SubProject = GetPHTGL_QuantityByNumBer(SerialNumberArry[0], item.Major).ProjectName; + UpdatePHTGL_Quantity(item); + + } + else if (SerialNumberArry.Length == 3) + { + item.SubProject = GetPHTGL_QuantityByNumBer(SerialNumberArry[0], item.Major).ProjectName; + item.SubItemProject= GetPHTGL_QuantityByNumBer(SerialNumberArry[0]+"."+ SerialNumberArry[1], item.Major).ProjectName; + UpdatePHTGL_Quantity(item); + } + + } + } + #endregion } + public class CustomComparer : IComparer + { + public int Compare(string x, string y) + { + if (string.IsNullOrEmpty(x)||string.IsNullOrEmpty(y)) + { + return 0; + } + var xParts = x.Split('.'); + var yParts = y.Split('.'); + for (int i = 0; i < Math.Min(xParts.Length, yParts.Length); i++) + { + int xNumber, yNumber; + if (int.TryParse(xParts[i], out xNumber) && int.TryParse(yParts[i], out yNumber)) + { + if (xNumber != yNumber) + { + return xNumber.CompareTo(yNumber); + } + } + else + { + return x.CompareTo(y); + } + } + + return xParts.Length.CompareTo(yParts.Length); + } + } public class PHTGL_QuantityDtoIn { [ExcelColumnIndex("A")] public string SerialNumber { get; set; } diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index d6fef964..9f17ed3c 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1267,11 +1267,14 @@ + + + @@ -12435,6 +12438,13 @@ ContractStandingBook.aspx + + ContractTrackComparison.aspx + ASPXCodeBehind + + + ContractTrackComparison.aspx + ContractTrackEdit.aspx ASPXCodeBehind @@ -12470,6 +12480,20 @@ ContractTrackProgressChart.aspx + + ContractTrackProgressDetection.aspx + ASPXCodeBehind + + + ContractTrackProgressDetection.aspx + + + ContractWBS.aspx + ASPXCodeBehind + + + ContractWBS.aspx + GeneralTermsConditions.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs index 77e15f0d..88c0514c 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs @@ -206,7 +206,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage && x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/) || x.WeldingDailyId == this.WeldingDailyId select x).ToList(); - weldJointIds= weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList(); + weldJointIds= weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.OrderByDescending(x=>x.TaskDate).First()).ToList(); task = weldJointIds; //foreach (var weldJointId in weldJointIds) //{ @@ -228,7 +228,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage where x.UnitWorkId == this.UnitWorkId && x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text) && x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/ select x).ToList(); - weldJointIds = weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList(); + weldJointIds = weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.OrderByDescending(x => x.TaskDate).First()).ToList(); task = weldJointIds; //foreach (var weldJointId in weldJointIds) //{ diff --git a/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx b/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx index a09ceb99..d318451f 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx @@ -5,151 +5,152 @@ - +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs new file mode 100644 index 00000000..a8e8e597 --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs @@ -0,0 +1,476 @@ +using BLL; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.PHTGL.ContractCompile +{ + public partial class ContractTrackComparison : PageBase + { + public string ContractId + { + get => (string)ViewState["ContractId"]; + set => ViewState["ContractId"] = value; + } + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.GetButtonPower(); + //主合同编号 + this.DropContractCode.DataTextField = "ContractNum"; + this.DropContractCode.DataValueField = "ContractNum"; + this.DropContractCode.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId); + this.DropContractCode.DataBind(); + Funs.FineUIPleaseSelect(this.DropContractCode); + DropMainContractCode_SelectedIndexChanged(null, null); + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + // 绑定表格 + this.BindGrid(); + + } + } + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid() + { + Model.PHTGL_ContractTrack table = new Model.PHTGL_ContractTrack(); + table.ProjectId = this.CurrUser.LoginProjectId; + table.ContractId = this.ContractId; + table.ProjectCode = this.txtProjectCode.Text.Trim(); + table.ProjectName = this.txtProjectName.Text.Trim(); + var tb = BLL.PhtglContractTrackService.GetListData(table, Grid1); + Grid1.RecordCount = PhtglContractTrackService.Count; + //tb = GetFilteredTable(Grid1.FilteredData, tb); + Grid1.DataSource = tb; + Grid1.DataBind(); + + + } + private void BindGrid2() + { + var db = Funs.DB; + var q = from x in db.PHTGL_ContractTrackMatchWBS + join y in db.WBS_ControlItemAndCycle on x.ControlItemAndCycleId equals y.ControlItemAndCycleId + where x.ContractTrackId == Grid1.SelectedRowID + select new + { + x.Id, + x.ContractTrackId, + x.ControlItemAndCycleId, + y.ControlItemAndCycleCode, + y.ControlItemContent, + y.Weights, + x.WorkPackageEstimate + }; + ; + + + } + private string GetDeleteScript() + { + return Confirm.GetShowReference("确定删除当前数据吗？", String.Empty, MessageBoxIcon.Question, Grid1.GetDeleteSelectedRowsReference(), String.Empty); + } + + #endregion + + #region GV 数据操作 + /// + /// 过滤表头 + /// + /// + /// + //protected void Grid1_FilterChange(object sender, EventArgs e) + //{ + // this.BindGrid(); + //} + + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + this.Grid1.PageIndex = e.NewPageIndex; + this.BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + this.Grid1.SortDirection = e.SortDirection; + this.Grid1.SortField = e.SortField; + this.BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + this.BindGrid(); + } + #endregion + + #region 数据编辑事件 + /// + /// 新增 + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(ContractId)) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackEdit.aspx?Id={0}", string.Empty, "增加 - "))); + + } + else + { + ShowNotify("请选择施工分包合同！", MessageBoxIcon.Information); + } + } + + /// + /// 编辑按钮 + /// + /// + /// + protected void btnEdit_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string ID = Grid1.SelectedRowID; + var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(ID); + if (model != null) ///已上报时不能删除 + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackEdit.aspx?Id={0}", ID, "编辑 - "))); + } + } + + /// + /// Grid行单击事件 + /// + /// + /// + protected void Grid1_OnRowClick(object sender, GridRowClickEventArgs e) + { + BindGrid2(); + } + + /// + /// Grid行双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.btnEdit_Click(null, null); + } + + /// + /// 批量删除 + /// + /// + /// + protected void btnDelete_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(rowID); + if (model != null) + { + BLL.PhtglContractTrackService.DeletePHTGL_ContractTrackById(rowID); + } + } + + BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + + #region 更新上级WBS内容每月实际费用 + /// + /// 更新上级WBS内容每月实际费用 + /// + /// + /// + /// + /// + private void UpdateWorkPackageParentThisValue(Model.SGGLDB db, string SuperWorkPackageId, DateTime months, decimal thisValue) + { + Model.WBS_WorkPackage workPackage = db.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == SuperWorkPackageId); + if (workPackage != null) + { + Model.WBS_WorkPackageParentDetail parentDetail = BLL.WorkPackageParentDetailService.GetWorkPackageParentDetailByParentIdAndMonths(SuperWorkPackageId, months); + if (parentDetail != null) + { + parentDetail.ThisValue += thisValue; + } + else + { + parentDetail = new Model.WBS_WorkPackageParentDetail(); + parentDetail.WorkPackageParentDetailId = SQLHelper.GetNewID(); + parentDetail.ParentId = SuperWorkPackageId; + parentDetail.Months = months; + parentDetail.ThisValue = thisValue; + db.WBS_WorkPackageParentDetail.InsertOnSubmit(parentDetail); + } + if (workPackage.SuperWorkPackageId != null) //还存在上级节点，需要继续循环 + { + UpdateWorkPackageParentThisValue(db, workPackage.SuperWorkPackageId, months, thisValue); + } + } + } + #endregion + + protected void btnSave_OnClick(object sender, EventArgs e) + { + JArray EditorArr = Grid1.GetMergedData(); + if (EditorArr.Count > 0) + { + for (int i = 0; i < EditorArr.Count; i++) + { + JObject objects = (JObject)EditorArr[i]; + var Id = objects["id"].ToString(); + var MainItemCode = objects["values"]["MainItemCode"].ToString(); + var MainItemName = objects["values"]["MainItemName"].ToString(); + var MajorName = objects["values"]["MajorName"].ToString(); + var MajorCode = objects["values"]["MajorCode"].ToString(); + //var ProjectCode = objects["values"]["ProjectCode"].ToString(); + var ProjectName = objects["values"]["ProjectName"].ToString(); + var ProjectDescription = objects["values"]["ProjectDescription"].ToString(); + var UnitOfMeasurement = objects["values"]["UnitOfMeasurement"].ToString(); + var Quantity = objects["values"]["Quantity"].ToString(); + var TotalCostFixedComprehensiveUnitPrice = objects["values"]["TotalCostFixedComprehensiveUnitPrice"].ToString(); + var MainMaterialCost = objects["values"]["MainMaterialCost"].ToString(); + var TotalPrice = objects["values"]["TotalPrice"].ToString(); + var CalculationRule = objects["values"]["CalculationRule"].ToString(); + var WorkContent = objects["values"]["WorkContent"].ToString(); + var Remarks = objects["values"]["Remarks"].ToString(); + var ConstructionSubcontractor = objects["values"]["ConstructionSubcontractor"].ToString(); + var ContractWeight = objects["values"]["ContractWeight"].ToString(); + var MaterialSupplier = objects["values"]["MaterialSupplier"].ToString(); + var IsWithinGeneralContractScope = objects["values"]["IsWithinGeneralContractScope"].ToString(); + var EstimatedQuantity = objects["values"]["EstimatedQuantity"].ToString(); + var EstimatedAmount = objects["values"]["EstimatedAmount"].ToString(); + var SettledQuantity = objects["values"]["SettledQuantity"].ToString(); + var SettledAmount = objects["values"]["SettledAmount"].ToString(); + + var model = PhtglContractTrackService.GetPHTGL_ContractTrackById(Id); + model.MainItemCode = MainItemCode; + model.MainItemName = MainItemName; + model.MajorName = MajorName; + model.MajorCode = MajorCode; + // model.ProjectCode = ProjectCode; + model.ProjectName = ProjectName; + model.ProjectDescription = ProjectDescription; + model.UnitOfMeasurement = UnitOfMeasurement; + model.Quantity = Quantity; + model.TotalCostFixedComprehensiveUnitPrice = TotalCostFixedComprehensiveUnitPrice; + model.MainMaterialCost = MainMaterialCost; + model.TotalPrice = TotalPrice; + model.CalculationRule = CalculationRule; + model.WorkContent = WorkContent; + model.Remarks = Remarks; + model.ConstructionSubcontractor = ConstructionSubcontractor; + model.ContractWeight = ContractWeight; + model.MaterialSupplier = MaterialSupplier; + model.IsWithinGeneralContractScope = bool.Parse(IsWithinGeneralContractScope); + model.EstimatedQuantity = EstimatedQuantity; + model.EstimatedAmount = Funs.GetNewDecimal(EstimatedAmount); + model.SettledQuantity = SettledQuantity; + model.SettledAmount = Funs.GetNewDecimal(SettledAmount); + + PhtglContractTrackService.UpdatePHTGL_ContractTrack(model); + } + } + BindGrid(); + } + + protected void btnQuery_OnClick(object sender, EventArgs e) + { + BindGrid(); + } + + protected void btnGetChart_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(ContractId)) + { + var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue); + if (model != null) + { + PageContext.RegisterStartupScript( + Window2.GetShowReference(string.Format("ContractTrackProgressChart.aspx?ContractId={0}", model.ContractId, "图表 - "))); + } + } + else + { + ShowNotify("请选择施工分包合同", MessageBoxIcon.Question); + } + } + #endregion + + #region 关闭弹出窗 + /// + /// 关闭弹出窗 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + + #region 获取权限按钮 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.PHTGL_ContractTrackComparisonMenuId); + if (buttonList.Count > 0) + { + if (buttonList.Contains(BLL.Const.BtnAdd)) + { + this.btnNew.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnModify)) + { + this.btnMenuEdit.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnDelete)) + { + this.btnMenuDelete.Hidden = false; + } + } + } + #endregion + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + Response.ClearContent(); + string filename = Funs.GetNewFileName(); + Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("合同执行跟踪表" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.ContentType = "application/excel"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + this.Grid1.PageSize = 500; + this.BindGrid(); + Response.Write(GetGridTableHtml(Grid1)); + Response.End(); + } + + /// + /// 导出方法 + /// + /// + /// + private string GetGridTableHtml(Grid grid) + { + StringBuilder sb = new StringBuilder(); + sb.Append(""); + sb.Append(""); + sb.Append(""); + foreach (GridColumn column in grid.Columns) + { + sb.AppendFormat("", column.HeaderText); + } + sb.Append(""); + foreach (GridRow row in grid.Rows) + { + sb.Append(""); + foreach (GridColumn column in grid.Columns) + { + string html = row.Values[column.ColumnIndex].ToString(); + if (column.ColumnID == "tfNumber") + { + html = (row.FindControl("lblNumber") as System.Web.UI.WebControls.Label).Text; + } + sb.AppendFormat("", html); + } + + sb.Append(""); + } + + sb.Append("
{0}
{0}
"); + + return sb.ToString(); + } + #endregion + + protected void DropMainContractCode_SelectedIndexChanged(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(DropContractCode.SelectedValue)) + { + var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue); + if (model != null) + { + ContractId = model.ContractId; + this.txtContractName.Text = model.ContractName; + } + else + { + ContractId = ""; + this.txtContractName.Text = string.Empty; + + } + } + BindGrid(); + } + + protected void btnImport_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(ContractId)) + { + var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue); + if (model != null) + { + PageContext.RegisterStartupScript( + Window2.GetShowReference(string.Format("ContractTrackIn.aspx?ContractId={0}", model.ContractId, "导入 - "))); + } + } + else + { + ShowNotify("请选择施工分包合同", MessageBoxIcon.Question); + } + } + + + protected void Window3_OnClose(object sender, WindowCloseEventArgs e) + { + BindGrid2(); + } + + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.designer.cs new file mode 100644 index 00000000..076beb91 --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.designer.cs @@ -0,0 +1,467 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.PHTGL.ContractCompile +{ + + + public partial class ContractTrackComparison + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel3; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// DropContractCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList DropContractCode; + + /// + /// txtContractName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtContractName; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// btnImport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnImport; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// Toolbar4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar4; + + /// + /// txtProjectCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectCode; + + /// + /// txtProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnGetChart 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnGetChart; + + /// + /// lblNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblNumber; + + /// + /// TextBox2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox2; + + /// + /// TextBox3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox3; + + /// + /// TextBox4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox4; + + /// + /// TextBox5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox5; + + /// + /// TextBox6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox6; + + /// + /// TextBox7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox7; + + /// + /// TextBox8 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox8; + + /// + /// TextBox9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox9; + + /// + /// TextBox10 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox10; + + /// + /// TextBox11 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox11; + + /// + /// TextBox12 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox12; + + /// + /// TextBox13 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox13; + + /// + /// TextBox14 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox14; + + /// + /// TextBox15 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox15; + + /// + /// TextBox16 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox16; + + /// + /// TextBox17 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox17; + + /// + /// TextBox18 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox18; + + /// + /// TextBox19 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox19; + + /// + /// TextBox20 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox20; + + /// + /// TextBox22 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox22; + + /// + /// NumberBox2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox NumberBox2; + + /// + /// TextBox24 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox24; + + /// + /// NumberBox3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox NumberBox3; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Window2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window2; + + /// + /// Window3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window3; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx index 4128a8ff..ede7e4c6 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx @@ -189,7 +189,7 @@ - @@ -234,7 +234,7 @@ - + --%> @@ -260,7 +260,7 @@ + Title="底部面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px" IconFont="_PullDown" Layout="HBox" Hidden="True"> diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs index ee26ef32..f9e9e9af 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs @@ -320,69 +320,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// protected global::FineUIPro.TextBox TextBox17; - /// - /// TextBox18 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox18; - - /// - /// TextBox19 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox19; - - /// - /// TextBox20 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox20; - - /// - /// TextBox22 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox22; - - /// - /// NumberBox2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox NumberBox2; - - /// - /// TextBox24 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox24; - - /// - /// NumberBox3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox NumberBox3; - /// /// ToolbarSeparator1 控件。 /// diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx new file mode 100644 index 00000000..74cc0878 --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx @@ -0,0 +1,16 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ContractTrackProgressDetection.aspx.cs" Inherits="FineUIPro.Web.PHTGL.ContractCompile.ContractTrackProgressDetection" %> + + + + + + + + + +
+
+
+
+ + diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.cs new file mode 100644 index 00000000..912e8656 --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.PHTGL.ContractCompile +{ + public partial class ContractTrackProgressDetection : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.designer.cs new file mode 100644 index 00000000..2c60b552 --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.PHTGL.ContractCompile +{ + + + public partial class ContractTrackProgressDetection + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + } +} diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx new file mode 100644 index 00000000..e4974a14 --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx @@ -0,0 +1,213 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ContractWBS.aspx.cs" Inherits="FineUIPro.Web.PHTGL.ContractCompile.ContractWBS" %> + + + + + + + + 合同执行跟踪表 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + + + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.cs new file mode 100644 index 00000000..bb75b6f2 --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.cs @@ -0,0 +1,270 @@ +using BLL; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.PHTGL.ContractCompile +{ + public partial class ContractWBS : PageBase + { + public string ContractId + { + get => (string)ViewState["ContractId"]; + set => ViewState["ContractId"] = value; + } + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.GetButtonPower(); + //主合同编号 + this.DropContractCode.DataTextField = "ContractNum"; + this.DropContractCode.DataValueField = "ContractNum"; + this.DropContractCode.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId); + this.DropContractCode.DataBind(); + Funs.FineUIPleaseSelect(this.DropContractCode); + DropMainContractCode_SelectedIndexChanged(null, null); + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + // 绑定表格 + this.BindGrid(); + + } + } + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid() + { + var db = Funs.DB; + var q = + from x in db.PHTGL_ContractTrack + join y in db.PHTGL_ContractTrackMatchWBS on x.Id equals y.ContractTrackId into g + from y in g.DefaultIfEmpty() + join z in db.WBS_ControlItemAndCycle on y.ControlItemAndCycleId equals z.ControlItemAndCycleId into _ControlJoin + from z in _ControlJoin.DefaultIfEmpty() + + where (string.IsNullOrEmpty(ContractId) || x.ContractId.Contains(ContractId)) && + (string.IsNullOrEmpty(CurrUser.LoginProjectId) || x.ProjectId.Contains(CurrUser.LoginProjectId)) && + (string.IsNullOrEmpty(this.txtProjectCode.Text.Trim()) || x.ProjectCode.Contains(this.txtProjectCode.Text.Trim())) && + (string.IsNullOrEmpty(this.txtProjectName.Text.Trim()) || x.ProjectName.Contains(this.txtProjectName.Text.Trim())) + + select new + { + MatchWbsId= y.Id , + y.ContractTrackId, + y.ControlItemAndCycleId, + z.ControlItemAndCycleCode, + z.ControlItemContent, + z.Weights, + y.WorkPackageEstimate, + x.Id, + x.ContractNum, + x.MainItemCode, + x.MainItemName, + x.MajorName, + x.MajorCode, + x.SubProject, + x.SubItemProject, + x.ProjectCode, + x.ProjectName, + x.ProjectDescription, + x.UnitOfMeasurement, + x.Quantity, + x.TotalCostFixedComprehensiveUnitPrice, + x.MainMaterialCost, + x.TotalPrice, + x.CalculationRule, + x.WorkContent, + x.Remarks, + x.ConstructionSubcontractor, + x.ContractWeight, + x.MaterialSupplier, + x.IsWithinGeneralContractScope, + x.EstimatedQuantity, + x.EstimatedAmount, + x.SettledQuantity, + x.SettledAmount, + x.ContractId + }; + ; + Grid1.RecordCount = q.Count(); + Grid1.DataSource = q.ToList(); + Grid1.DataBind(); + + } + + protected void DropMainContractCode_SelectedIndexChanged(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(DropContractCode.SelectedValue)) + { + var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue); + if (model != null) + { + ContractId = model.ContractId; + this.txtContractName.Text = model.ContractName; + } + else + { + ContractId = ""; + this.txtContractName.Text = string.Empty; + + } + } + BindGrid(); + } + + #endregion + + #region GV 数据操作 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + this.Grid1.PageIndex = e.NewPageIndex; + this.BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + this.Grid1.SortDirection = e.SortDirection; + this.Grid1.SortField = e.SortField; + this.BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + this.BindGrid(); + } + protected void btnQuery_OnClick(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + + #region 数据编辑事件 + /// + /// 新增 + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + object[] ID = Grid1.DataKeys[Grid1.SelectedRowIndex]; + var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(ID[0].ToString()); + if (model != null) ///已上报时不能删除 + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackMatchWBS.aspx?ContractTrackId={0}", ID, "编辑 - "))); + } + } + + /// + /// 批量删除 + /// + /// + /// + protected void btnDelete_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + object[] rowID = Grid1.DataKeys[rowIndex]; + var model = BLL.PhtglContracttrackmatchwbsService.GetPHTGL_ContractTrackMatchWBSById(rowID[1].ToString()); + if (model != null) + { + BLL.PhtglContracttrackmatchwbsService.DeleteModelById(rowID[1].ToString()); + } + } + + BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + object[] ID = Grid1.DataKeys[Grid1.SelectedRowIndex]; + var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(ID[0].ToString()); + if (model != null) ///已上报时不能删除 + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackMatchWBS.aspx?ContractTrackId={0}", ID, "编辑 - "))); + } + } + #endregion + + #region 关闭弹出窗 + /// + /// 关闭弹出窗 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + + #region 获取权限按钮 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.PHTGL_ContractWBSMenuId); + if (buttonList.Count > 0) + { + if (buttonList.Contains(BLL.Const.BtnAdd)) + { + this.btnNew.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnModify)) + { + this.btnMenuEdit.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnDelete)) + { + this.btnMenuDelete.Hidden = false; + } + } + } + #endregion + + + + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.designer.cs new file mode 100644 index 00000000..8f51d833 --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.designer.cs @@ -0,0 +1,278 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.PHTGL.ContractCompile +{ + + + public partial class ContractWBS + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel3; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// DropContractCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList DropContractCode; + + /// + /// txtContractName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtContractName; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// Toolbar4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar4; + + /// + /// txtProjectCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectCode; + + /// + /// txtProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// TextBox2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox2; + + /// + /// TextBox3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox3; + + /// + /// TextBox4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox4; + + /// + /// TextBox5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox5; + + /// + /// TextBox6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox6; + + /// + /// TextBox7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox7; + + /// + /// TextBox8 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox8; + + /// + /// TextBox9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox9; + + /// + /// NumberBox2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox NumberBox2; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/SGGL/FineUIPro.Web/common/Menu_DigData.xml b/SGGL/FineUIPro.Web/common/Menu_DigData.xml index b3d0385c..bb7a7a34 100644 --- a/SGGL/FineUIPro.Web/common/Menu_DigData.xml +++ b/SGGL/FineUIPro.Web/common/Menu_DigData.xml @@ -1,9 +1,51 @@  - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12,16 +54,19 @@ - + + + + - - - - - + + + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml index 9b647aea..6a68aebd 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml @@ -1,12 +1,14 @@  - - - + + + + + @@ -14,7 +16,10 @@ - + + + + diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml index 8d4aa005..fd6a0762 100644 --- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml @@ -1,7 +1,11 @@  - + + + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml index 997760f7..3ccb32ac 100644 --- a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml @@ -35,5 +35,8 @@ - + + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 342d91b8..9bc36592 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -48,48 +48,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From d0440ce2fb97a80d10323f29e1db2a5d969a1eff Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Tue, 24 Oct 2023 14:23:46 +0800 Subject: [PATCH 2/2] 2023-10-24 --- .vs/SGGL_SeDin/v17/.wsuo | Bin 265216 -> 264192 bytes DataBase/版本日志/SGGLDB_V2023-10-24.sql | 3 + .../PhtglContracttrackService .cs | 55 ++ .../PhtglContracttrackprogressService.cs | 82 ++- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 8 + .../ContractTrackComparison.aspx | 18 +- .../ContractTrackComparison.aspx.cs | 64 +- .../ContractTrackComparison.aspx.designer.cs | 27 - .../ContractCompile/ContractTrackList.aspx | 195 +----- .../ContractCompile/ContractTrackList.aspx.cs | 497 +++++++------- .../ContractTrackList.aspx.designer.cs | 225 ------- .../ContractTrackProgressDetection.aspx | 44 +- .../ContractTrackProgressDetection.aspx.cs | 44 +- ...actTrackProgressDetection.aspx.designer.cs | 54 ++ .../ContractTrackProgressDetectionGrid.aspx | 87 +++ ...ContractTrackProgressDetectionGrid.aspx.cs | 604 ++++++++++++++++++ ...rackProgressDetectionGrid.aspx.designer.cs | 143 +++++ SGGL/FineUIPro.Web/common/Menu_DigData.xml | 63 +- SGGL/FineUIPro.Web/common/Menu_PHTGL.xml | 9 +- SGGL/FineUIPro.Web/common/Menu_ZHGL.xml | 37 -- 20 files changed, 1406 insertions(+), 853 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2023-10-24.sql create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetectionGrid.aspx create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetectionGrid.aspx.cs create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetectionGrid.aspx.designer.cs diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index b7abaf608b485145db2dbe1e6478c8798dc30905..8deb1efc87ca3b79ce1806b8d50fcd1d1aea4464 100644 GIT binary patch delta 2453 zcmb8x2~<>77{KwlZw480K#)O3MI8`H*&J4J$wss=6_+%ZM03E%QWFgj1O@jNEa4WT zl`UhbttwMeR!T~{DOzD!mMxy+DbJ~6Xi)+EFAj#w>DW8x_wM)Z{pP*9yk$x^`j>9- z-!L?^lTN48(A?6}LZK4~f(6~s(;bk!MO0{GMIRZe_4f5Yd~~zZ>$r%btyC6jMPjo& zr;V4jK{l~g=IO`D13_`VIke7$+We(31dBi!kQ~_Gi{k)rv6c>$W`v?MY_P%)P10cq zoUXFerux>@8eQ0_V-s2Js#+pA?%%F1))Pll_VvVFJmnzz(#Oz=q3&{6JYzeeSxwvj zb7Z=t~FCl$;HZCONjK3Of;z*t8LO-vvVWsOe#xF=sMjAdAk5|p}|x}}LL=OVX9nX8xf|Hm@Ux3$+-4#=x@ zK(ev-nAWMhbk?kOvR1Rn+|UUoHOK82z}*mP(kdcG8QY!`HTmw`h%&v~oP376!0d|F zWL#FBJTW`ny+3T2s7N+RYqGV(#6#f=Klno}MgV1?CpJ?GmQ~dU6I;*?-O&Rf=!stF z4J$$shCT>KUqs+K^h19{B1$m3(F8Gw#Q@k4hj=6)5lKkKK%`(024e_@;(83j4X|T4 zQZWJ}aU*U*8b;w}jK&zj>W(Ey$2g3~1Wd#&n1so=6;m)3(=Z*kVFofV6SHtTX2XF@ zWMK~OKsN5gT-=4bF|UN(d@R5{Scn`f!eZQuT;w4iOHhD9EJYEDu?)+h&R2>RScz3w zjWt+{b+`}r;{lXB$gT|Q@em%y29%=$5|7|fRKkgk*o4RMIG(^}Jc+09G@gMATktHN z!&Yp=c07+4)cU_j@Dg6eE7*aZ*o7*%@hV=!ZdBuSyn#J<6K~;d?8QFR;2rG80o3AM zyodMk0Y1b>YW+VZIEYVh2!~OJBRGmr@fkixJ&xfEe2L@u3SZ*{zQMORiSO_|e!!17 zg`c3Fq>Gz3(OD|X9U&>dQ8wTl&f|Cdfkym^zoCBEMA;1W8CS<{dw7kI)&Q&0QN8ap zTDtQc|Ai;tc=hIxwq}?8sxJ=VvS}5u4PHyRPJ(QVEfR$?Z@?-s#oai`j%O0(OM^0RP_HdKwadrAA$8rKw~d(q5^!aZ^3PHoHZ*_vC-Y3c0B)>h_k%@;1$ zT%$Afkd{%oOY@VqgFen*eKlisu~l0ws&ck#&eLI;XM17=_!POmAW5Da z5>mb(&THCXKHvPG7$Qpx`$==MMb;GBon1Q^;{D=A4$e5eW6!C5YfkUoo3S=p+ZwH} fm#ODxIcFIR#g&~5*-pFOP*ZI;8fx^FUIzO=gcrp1 delta 2204 zcmcJQTWnNC7{_Nf>xhmx3aYkr+!FR-j)Ae4q;WK{coW zwSe`WMy*M@zQB{Q0nG-m5j+E^I5)h#7mZiIZtyDD1NuNe*bDZ7AP9j0upbP91K=PS z0@y+2l@L5D^6y2VCQRl0;;f)c zxeIc5Q4ggB-OJjbv#aDy;i=?G3k_s9rilXBE}k`)I8L{+n;oprC7vS3D3mj7Jqj)D z!3h;lNY`?=>uv}+f08!5l|kpT^qDM=O+BHD@r42L@VIrdt>Z;VV(Hf zoE5rN;h1yz9gJm^UKA}tzzNWR0#;xHcHjUhAQj979MRb&bJkeSto9G)q(>U?e?y$@ z%M#unA^QpZ41P`MT|@mFxDI{?H^5Es2iq3wXwA$-{i#{;WzU;g_P-nzO*y|z6a0Sj zqrr~&aCCm+>HwE$os869&{@6&Bz59>Ums5v3a%ZEu9uPgpx8*E{9(~Rx9}~ZkZVM4 zLadkCRC#yo9F12+nSqLux@R06O9)7qMH;=wixtH zVGs3o7-Y1cp)IX@qT3wfF9}JaXf+SVjLuye{nF!%c4la>rgOW?@z3DbHh_2i1)A<@ zp)0*k+STifgkxTV@Z}ZmL^4hZ6q3(*Yd?|$>m&~Hlf zy4>sQ?po1S)>&nS-O`Be6OjSKoODYkZ5!xyz$5?c>diHp@=%ID-8^Ph(_@8FnjWhv z5aldbM)Rtd8uXkyzOPxes5)WS9MpXucoHUkAEAq zk*@D+gNJvx2My%s_4bTvL^iOa%`?WiW}96t eH?P`NK|;%Co>1zvIawkNbF-#g6E3Ab)cyk5D#(`r diff --git a/DataBase/版本日志/SGGLDB_V2023-10-24.sql b/DataBase/版本日志/SGGLDB_V2023-10-24.sql new file mode 100644 index 00000000..947354a9 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-10-24.sql @@ -0,0 +1,3 @@ +alter table dbo.Sys_Const + alter column ConstValue nvarchar(500) +go \ No newline at end of file diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs index cf08d95d..e44b799a 100644 --- a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs +++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs @@ -214,6 +214,56 @@ namespace BLL PhtglContracttrackmatchwbsService.DeleteModelByContractTrackId(id); } + /// + /// 重新校验合同权重 + /// + /// + /// + public static void CheckContractWeightByContractId(string contractid ,string projectid) + { + Model.PHTGL_ContractTrack table = new Model.PHTGL_ContractTrack(); + table.ProjectId = projectid; + table.ContractId = contractid; + var list= GetPHTGL_ContractTrackByModle(table); + foreach (var item in list) + { + item .ContractWeight = GetContractWeightById(item.Id); + UpdatePHTGL_ContractTrack(item); + + } + } + /// + /// 获取清单的合同权重 + /// + /// + /// + public static string GetContractWeightById(string id ) + { + string ContractWeight = "0"; + var model = GetPHTGL_ContractTrackById(id); + if (model != null) + { + if (GetSumSettledAmountByContractId(model.ContractId, model.ProjectId) == 0) return ContractWeight; + var result = + (model.SettledAmount / GetSumSettledAmountByContractId(model.ContractId, model.ProjectId)) * 100; + ContractWeight = string.Format("{0:F}", result); + } + + return ContractWeight; + } + /// + /// 根据合同id 获取合同预算金额 + /// + public static decimal GetSumSettledAmountByContractId(string contractid, string projectid) + { + decimal SumSettledAmount = 0; + SumSettledAmount = + (from x in Funs.DB.PHTGL_ContractTrack + where x.ProjectId == projectid && x.ContractId == contractid + select x.SettledAmount ?? 0).ToList().Sum(); + return SumSettledAmount; + } + public static ResponeData ImportData(string path, string contractid, string projectid) { var responeData = new ResponeData(); @@ -252,6 +302,11 @@ namespace BLL if (string.IsNullOrEmpty(item.ProjectCode)) continue; var resultModel = GetPHTGL_ContractTrackByModle(phtglContractTrack); item.ContractNum = ContractService.GetContractById(contractid)?.ContractNum; + if (!string .IsNullOrEmpty(item.ProjectCode)&& !item.ProjectCode.Contains("-")) + { + + item.ProjectCode = item.MainItemCode + "-" + item.ProjectCode; + } if (resultModel.Any()) { item.Id = resultModel[0].Id; diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs index 4e3841e5..4cbc8a94 100644 --- a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs +++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Globalization; using System.Linq; using FineUIPro; using Model; @@ -69,7 +70,15 @@ namespace BLL return Funs.DB.PHTGL_ContractTrackProgress.FirstOrDefault(x => x.ContractTrackProgressId == ContractTrackProgressId); } - + public static PHTGL_ContractTrackProgress GetPHTGL_ContractTrackProgressByTrackIdAndDate(string ContractTrackId,string date) + { + return Funs.DB.PHTGL_ContractTrackProgress.FirstOrDefault(x => + x.ContractTrackId == ContractTrackId && x.Date==date); + } + /// + /// 根据合同价格信息主键创建进度日期数据 + /// + /// public static void CreateTemplateByContractTrackId(string ContractTrackId) { var model = PhtglContractTrackService.GetPHTGL_ContractTrackById(ContractTrackId); @@ -80,7 +89,7 @@ namespace BLL { var startDate = (DateTime)contractmode.ContractStartDate; var endDate = (DateTime)contractmode.ContractEndDate; - List months = GetMonthsBetween(startDate, endDate); + List months = GetMonthsBetween(startDate, endDate);//获取合同起止日期 foreach (DateTime month in months) { @@ -101,6 +110,7 @@ namespace BLL } } } + public static List GetMonthsBetween(DateTime startDate, DateTime endDate) { List months = new List(); @@ -135,9 +145,8 @@ namespace BLL Funs.DB.SubmitChanges(); } - public static void UpdatePHTGL_ContractTrackProgress(PHTGL_ContractTrackProgress newtable) - { + { var table = Funs.DB.PHTGL_ContractTrackProgress.FirstOrDefault(x => x.ContractTrackProgressId == newtable.ContractTrackProgressId); if (table != null) @@ -154,6 +163,71 @@ namespace BLL Funs.DB.SubmitChanges(); } } + /// + /// 重新校验计算进度数据 + /// + /// + public static void CheckProgressByContractTrackId(string contractTrackId) + { + var modeContractTrack = PhtglContractTrackService.GetPHTGL_ContractTrackById(contractTrackId); + if (modeContractTrack!=null) + { + var totalCostFixedComprehensiveUnitPrice = Funs.GetNewDecimalOrZero(modeContractTrack.TotalCostFixedComprehensiveUnitPrice); //全费用综合单价 + var settledAmount = modeContractTrack.SettledAmount??0;//预算金额 + var contractWeight= Funs.GetNewDecimalOrZero(modeContractTrack.ContractWeight)==0?0: Funs.GetNewDecimalOrZero(modeContractTrack.ContractWeight)/100;//合同权重 + var quserytable = new Model.PHTGL_ContractTrackProgress(); + quserytable.ContractTrackId = contractTrackId; + var list= GetPHTGL_ContractTrackProgressByModle(quserytable); + foreach (var item in list) + { + //产值=计划工程量*全费用综合单价（来源于“费用对比统计”）， + // 百分比 =（产值 / 预算金额）*合同权重 + item.ACWP_OutputValue = (item.ACWP_Quantity??0)* totalCostFixedComprehensiveUnitPrice; + if (settledAmount == 0) + { + item.ACWP_Percentage = 0; + } + else + { + item.ACWP_Percentage = Math.Round(((item.ACWP_Quantity ?? 0) / settledAmount) * contractWeight * 100, 2); + } + + item.BCWS_OutputValue = (item.BCWS_Quantity ?? 0) * totalCostFixedComprehensiveUnitPrice; + if (settledAmount == 0) + { + item.BCWS_Percentage = 0; + } + else + { + item.BCWS_Percentage = Math.Round(((item.BCWS_Quantity ?? 0) / settledAmount) * contractWeight * 100, 2) ; + } + UpdatePHTGL_ContractTrackProgress(item); + } + } + } + /// + /// 获取累计进程情况 + /// + /// + /// + public static PHTGL_ContractTrackProgress GetSumProgress(string contractTrackProgressId) + { + var result=new PHTGL_ContractTrackProgress(); + var model = GetPHTGL_ContractTrackProgressById(contractTrackProgressId); + var q = (from x in Funs.DB.PHTGL_ContractTrackProgress + where x.ContractTrackId == model.ContractTrackId && string.Compare(x.Date,model.Date)<=0 + select x).ToList(); + result.ACWP_Quantity = q.Sum(x => x.ACWP_Quantity ??0); + result.ACWP_OutputValue = q.Sum(x => x.ACWP_OutputValue ?? 0); + result.ACWP_Percentage = q.Sum(x => x.ACWP_Percentage ?? 0); + + result.BCWS_Quantity = q.Sum(x => x.BCWS_Quantity ?? 0); + result.BCWS_OutputValue = q.Sum(x => x.BCWS_OutputValue ?? 0); + result.BCWS_Percentage = q.Sum(x => x.BCWS_Percentage ?? 0); + + return result; + + } public static void DeleteModleById(string ContractTrackProgressId) { diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 4ce286b6..aa4510f8 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1274,6 +1274,7 @@ + @@ -12490,6 +12491,13 @@ ContractTrackProgressDetection.aspx + + ContractTrackProgressDetectionGrid.aspx + ASPXCodeBehind + + + ContractTrackProgressDetectionGrid.aspx + ContractWBS.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx index 1836809d..18568252 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx @@ -37,7 +37,7 @@ ClicksToEdit="1" DataIDField="Id" AllowSorting="true" SortField="Id" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="False" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" - EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" OnRowClick="Grid1_OnRowClick" EnableRowClickEvent="True"> + EnableRowDoubleClickEvent="true" OnRowClick="Grid1_OnRowClick" EnableRowClickEvent="True"> @@ -47,12 +47,7 @@ - - - - + @@ -70,9 +65,6 @@ - - @@ -190,7 +182,7 @@ - @@ -232,9 +224,9 @@ - + <%-- - + --%> diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs index a8e8e597..9cf8db00 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs @@ -129,23 +129,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile #endregion #region 数据编辑事件 - /// - /// 新增 - /// - /// - /// - protected void btnNew_Click(object sender, EventArgs e) - { - if (!string.IsNullOrEmpty(ContractId)) - { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackEdit.aspx?Id={0}", string.Empty, "增加 - "))); - - } - else - { - ShowNotify("请选择施工分包合同！", MessageBoxIcon.Information); - } - } /// /// 编辑按钮 @@ -307,6 +290,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile PhtglContractTrackService.UpdatePHTGL_ContractTrack(model); } } + if (!string.IsNullOrEmpty(ContractId)) + { + BLL.PhtglContractTrackService.CheckContractWeightByContractId(ContractId, this.CurrUser.LoginProjectId); + } + else + { + ShowNotify("计算合同权重失败，请选择施工分包合同后重新保存", MessageBoxIcon.Question); + } + BindGrid(); } @@ -315,22 +307,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile BindGrid(); } - protected void btnGetChart_Click(object sender, EventArgs e) - { - if (!string.IsNullOrEmpty(ContractId)) - { - var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue); - if (model != null) - { - PageContext.RegisterStartupScript( - Window2.GetShowReference(string.Format("ContractTrackProgressChart.aspx?ContractId={0}", model.ContractId, "图表 - "))); - } - } - else - { - ShowNotify("请选择施工分包合同", MessageBoxIcon.Question); - } - } #endregion #region 关闭弹出窗 @@ -356,10 +332,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.PHTGL_ContractTrackComparisonMenuId); if (buttonList.Count > 0) { - if (buttonList.Contains(BLL.Const.BtnAdd)) - { - this.btnNew.Hidden = false; - } + if (buttonList.Contains(BLL.Const.BtnModify)) { this.btnMenuEdit.Hidden = false; @@ -448,23 +421,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile BindGrid(); } - protected void btnImport_Click(object sender, EventArgs e) - { - if (!string.IsNullOrEmpty(ContractId)) - { - var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue); - if (model != null) - { - PageContext.RegisterStartupScript( - Window2.GetShowReference(string.Format("ContractTrackIn.aspx?ContractId={0}", model.ContractId, "导入 - "))); - } - } - else - { - ShowNotify("请选择施工分包合同", MessageBoxIcon.Question); - } - } - protected void Window3_OnClose(object sender, WindowCloseEventArgs e) { diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.designer.cs index 076beb91..6240e815 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.designer.cs @@ -86,24 +86,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// protected global::FineUIPro.Label txtContractName; - /// - /// btnNew 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnNew; - - /// - /// btnImport 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnImport; - /// /// btnOut 控件。 /// @@ -158,15 +140,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// protected global::FineUIPro.Button btnQuery; - /// - /// btnGetChart 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnGetChart; - /// /// lblNumber 控件。 /// diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx index ede7e4c6..d58edceb 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx @@ -37,7 +37,7 @@ ClicksToEdit="1" DataIDField="Id" AllowSorting="true" SortField="Id" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="False" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" - EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" OnRowClick="Grid1_OnRowClick" EnableRowClickEvent="True"> + EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableRowClickEvent="True"> @@ -70,9 +70,6 @@ - - @@ -108,13 +105,13 @@ - - @@ -188,54 +185,7 @@ - - <%-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --%> - + @@ -258,136 +208,6 @@ - - - + /// /// - protected void Grid1_OnRowClick(object sender, GridRowClickEventArgs e) - { - BindGrid2(); - BindGrid3(); - } + /// /// Grid行双击事件 @@ -234,206 +184,206 @@ namespace FineUIPro.Web.PHTGL.ContractCompile } } - protected void btnMatchWBS_Save_OnClick(object sender, EventArgs e) - { - SaveGrid2(); - } + //protected void btnMatchWBS_Save_OnClick(object sender, EventArgs e) + //{ + // SaveGrid2(); + //} - protected void btnMatchWBS_Delete_OnClick(object sender, EventArgs e) - { - if (Grid2.SelectedRowIndexArray.Length > 0) - { - Model.SGGLDB db = Funs.DB; - var controlItemAndCycles = from x in db.WBS_ControlItemAndCycle - where x.ProjectId == this.CurrUser.LoginProjectId - select x; - var unitWorks = from x in db.WBS_UnitWork - where x.ProjectId == this.CurrUser.LoginProjectId - select x; - var workPackages = (from x in db.WBS_WorkPackage - where x.ProjectId == this.CurrUser.LoginProjectId - select x).ToList(); - foreach (int rowIndex in Grid2.SelectedRowIndexArray) - { - string rowID = Grid2.DataKeys[rowIndex][0].ToString(); - var p = BLL.PhtglContracttrackmatchwbsService.GetPHTGL_ContractTrackMatchWBSById(rowID); - if (p != null) - { - decimal changePlanCost = 0 - (p.WorkPackageEstimate ?? 0); - var c = controlItemAndCycles.First(x => x.ControlItemAndCycleId == p.ControlItemAndCycleId); - c.PlanCost = 0; - BLL.ControlItemAndCycleService.UpdateControlItemAndCycle(c); - //更新上级WBS内容概算费用 - BLL.WorkPackageService.UpdateWorkPackagesPlanCost(workPackages, c.WorkPackageId, changePlanCost); - var workPackage = workPackages.FirstOrDefault(x => x.WorkPackageId == c.WorkPackageId); - if (workPackage != null) - { - var unitWork = unitWorks.FirstOrDefault(x => x.UnitWorkId == workPackage.UnitWorkId); - if (unitWork.PlanCost == null) - { - unitWork.PlanCost = changePlanCost; - } - else - { - unitWork.PlanCost += changePlanCost; - } - } - db.SubmitChanges(); - PhtglContracttrackmatchwbsService.DeleteModelById(rowID); - } - } - BindGrid2(); - ShowNotify("删除数据成功!", MessageBoxIcon.Success); - } - } + //protected void btnMatchWBS_Delete_OnClick(object sender, EventArgs e) + //{ + // if (Grid2.SelectedRowIndexArray.Length > 0) + // { + // Model.SGGLDB db = Funs.DB; + // var controlItemAndCycles = from x in db.WBS_ControlItemAndCycle + // where x.ProjectId == this.CurrUser.LoginProjectId + // select x; + // var unitWorks = from x in db.WBS_UnitWork + // where x.ProjectId == this.CurrUser.LoginProjectId + // select x; + // var workPackages = (from x in db.WBS_WorkPackage + // where x.ProjectId == this.CurrUser.LoginProjectId + // select x).ToList(); + // foreach (int rowIndex in Grid2.SelectedRowIndexArray) + // { + // string rowID = Grid2.DataKeys[rowIndex][0].ToString(); + // var p = BLL.PhtglContracttrackmatchwbsService.GetPHTGL_ContractTrackMatchWBSById(rowID); + // if (p != null) + // { + // decimal changePlanCost = 0 - (p.WorkPackageEstimate ?? 0); + // var c = controlItemAndCycles.First(x => x.ControlItemAndCycleId == p.ControlItemAndCycleId); + // c.PlanCost = 0; + // BLL.ControlItemAndCycleService.UpdateControlItemAndCycle(c); + // //更新上级WBS内容概算费用 + // BLL.WorkPackageService.UpdateWorkPackagesPlanCost(workPackages, c.WorkPackageId, changePlanCost); + // var workPackage = workPackages.FirstOrDefault(x => x.WorkPackageId == c.WorkPackageId); + // if (workPackage != null) + // { + // var unitWork = unitWorks.FirstOrDefault(x => x.UnitWorkId == workPackage.UnitWorkId); + // if (unitWork.PlanCost == null) + // { + // unitWork.PlanCost = changePlanCost; + // } + // else + // { + // unitWork.PlanCost += changePlanCost; + // } + // } + // db.SubmitChanges(); + // PhtglContracttrackmatchwbsService.DeleteModelById(rowID); + // } + // } + // BindGrid2(); + // ShowNotify("删除数据成功!", MessageBoxIcon.Success); + // } + //} - protected void btnProgress_Save_OnClick(object sender, EventArgs e) - { - SaveGrid3(); - } + //protected void btnProgress_Save_OnClick(object sender, EventArgs e) + //{ + // SaveGrid3(); + //} - private void SaveGrid2() - { - JArray EditorArr = Grid2.GetMergedData(); - if (EditorArr.Count > 0) - { - for (int i = 0; i < EditorArr.Count; i++) - { - JObject objects = (JObject)EditorArr[i]; - var Id = objects["id"].ToString(); - var WorkPackageEstimate = Funs.GetNewDecimal(objects["values"]["WorkPackageEstimate"].ToString()); + //private void SaveGrid2() + //{ + // JArray EditorArr = Grid2.GetMergedData(); + // if (EditorArr.Count > 0) + // { + // for (int i = 0; i < EditorArr.Count; i++) + // { + // JObject objects = (JObject)EditorArr[i]; + // var Id = objects["id"].ToString(); + // var WorkPackageEstimate = Funs.GetNewDecimal(objects["values"]["WorkPackageEstimate"].ToString()); - var model = PhtglContracttrackmatchwbsService.GetPHTGL_ContractTrackMatchWBSById(Id); - model.WorkPackageEstimate = WorkPackageEstimate; - PhtglContracttrackmatchwbsService.UpdatePHTGL_ContractTrackMatchWBS(model); - } - } - ShowNotify("保存成功", MessageBoxIcon.Success); - } + // var model = PhtglContracttrackmatchwbsService.GetPHTGL_ContractTrackMatchWBSById(Id); + // model.WorkPackageEstimate = WorkPackageEstimate; + // PhtglContracttrackmatchwbsService.UpdatePHTGL_ContractTrackMatchWBS(model); + // } + // } + // ShowNotify("保存成功", MessageBoxIcon.Success); + //} - private void SaveGrid3() - { - Model.SGGLDB db = Funs.DB; - var list = (from x in db.PHTGL_ContractTrackProgress - where x.ContractTrackId == Grid1.SelectedRowID - select x).ToList(); - PhtglContracttrackprogressService.DeleteModleByContractTrackId(Grid1.SelectedRowID); - decimal totalWeights = 0; - var SelectedList = (from x in db.PHTGL_ContractTrackMatchWBS - where x.ContractTrackId == Grid1.SelectedRowID - select x.ControlItemAndCycleId).ToList(); - var totalControlItemAndCycles = from x in db.WBS_ControlItemAndCycle - where x.ProjectId == this.CurrUser.LoginProjectId - select x; - var unitWorks = from x in db.WBS_UnitWork - where x.ProjectId == this.CurrUser.LoginProjectId - select x; - var workPackages = (from x in db.WBS_WorkPackage - where x.ProjectId == this.CurrUser.LoginProjectId - select x).ToList(); - var controlItemAndCycles = from x in totalControlItemAndCycles - where SelectedList.Contains(x.ControlItemAndCycleId) - select x; - foreach (var controlItemAndCycle in controlItemAndCycles) - { - totalWeights += controlItemAndCycle.Weights ?? 0; - } - JArray EditorArr = Grid3.GetMergedData(); - if (EditorArr.Count > 0) - { - Model.PHTGL_ContractTrackProgress model = null; - for (int i = 0; i < EditorArr.Count; i++) - { - JObject objects = (JObject)EditorArr[i]; - model = new Model.PHTGL_ContractTrackProgress(); - model.ContractTrackProgressId = SQLHelper.GetNewID(typeof(Model.PHTGL_ContractTrackProgress)); - model.ContractTrackId = Grid1.SelectedRowID; - model.BCWS_Quantity = Funs.GetNewDecimal(objects["values"]["BCWS_Quantity"].ToString()); - model.BCWS_OutputValue = Funs.GetNewDecimal(objects["values"]["BCWS_OutputValue"].ToString()); - model.BCWS_Percentage = Funs.GetNewDecimal(objects["values"]["BCWS_Percentage"].ToString()); - model.ACWP_Quantity = Funs.GetNewDecimal(objects["values"]["ACWP_Quantity"].ToString()); - model.ACWP_OutputValue = Funs.GetNewDecimal(objects["values"]["ACWP_OutputValue"].ToString()); - model.ACWP_Percentage = Funs.GetNewDecimal(objects["values"]["ACWP_Percentage"].ToString()); - model.Date = objects["values"]["Date"].ToString(); - BLL.PhtglContracttrackprogressService.AddPHTGL_ContractTrackProgress(model); - var old = list.FirstOrDefault(x => x.Date == model.Date); - decimal oldValue = 0; - if (old != null) - { - oldValue = old.ACWP_OutputValue ?? 0; - } - decimal changeValue = (model.ACWP_OutputValue ?? 0) - oldValue; - if (changeValue != 0) - { - foreach (var item in controlItemAndCycles) - { - var c = controlItemAndCycles.First(x => x.ControlItemAndCycleId == item.ControlItemAndCycleId); - decimal thisValue = 0; - if (totalWeights > 0 && c.Weights.HasValue) - { - thisValue = decimal.Round(c.Weights.Value / totalWeights * changeValue, 2); - } - DateTime? months = Funs.GetNewDateTime(model.Date + "-01"); - var WorkPackage = workPackages.FirstOrDefault(x => x.WorkPackageId == item.WorkPackageId); - Model.WBS_WorkPackageDetail WorkPackageDetail = BLL.WorkPackageDetailService.GetWorkPackageDetailByWorkPackageIdAndMonths(item.WorkPackageId, months.Value); - if (WorkPackageDetail != null) - { - WorkPackageDetail.ThisValue += thisValue; - } - else - { - WorkPackageDetail = new Model.WBS_WorkPackageDetail(); - WorkPackageDetail.WorkPackageDetailId = SQLHelper.GetNewID(); - WorkPackageDetail.WorkPackageId = item.WorkPackageId; - WorkPackageDetail.Months = months; - WorkPackageDetail.ThisValue = thisValue; - db.WBS_WorkPackageDetail.InsertOnSubmit(WorkPackageDetail); - } - //更新上级WBS内容每月实际费用 - UpdateWorkPackageParentThisValue(db, WorkPackage.SuperWorkPackageId, months.Value, thisValue); - ////更新单位工程 - Model.WBS_WorkPackageParentDetail unitWorkDetail = BLL.WorkPackageParentDetailService.GetWorkPackageParentDetailByParentIdAndMonths(WorkPackage.UnitWorkId, months.Value); - if (unitWorkDetail != null) - { - unitWorkDetail.ThisValue += thisValue; - } - else - { - unitWorkDetail = new Model.WBS_WorkPackageParentDetail(); - unitWorkDetail.WorkPackageParentDetailId = SQLHelper.GetNewID(); - unitWorkDetail.ParentId = WorkPackage.UnitWorkId; - unitWorkDetail.Months = months; - unitWorkDetail.ThisValue = thisValue; - db.WBS_WorkPackageParentDetail.InsertOnSubmit(unitWorkDetail); - } - ////更新建筑、安装工程 - Model.WBS_UnitWork unitWork = unitWorks.FirstOrDefault(x => x.UnitWorkId == WorkPackage.UnitWorkId); - if (unitWork != null) - { - Model.WBS_WorkPackageParentDetail projectType = BLL.WorkPackageParentDetailService.GetWorkPackageParentDetailByParentIdAndMonths(unitWork.ProjectType, this.CurrUser.LoginProjectId, months.Value); - if (projectType != null) - { - projectType.ThisValue += thisValue; - } - else - { - projectType = new Model.WBS_WorkPackageParentDetail(); - projectType.WorkPackageParentDetailId = SQLHelper.GetNewID(); - projectType.ParentId = unitWork.ProjectType; - projectType.ProjectId = this.CurrUser.LoginProjectId; - projectType.Months = months; - projectType.ThisValue = thisValue; - db.WBS_WorkPackageParentDetail.InsertOnSubmit(projectType); - } - } - db.SubmitChanges(); - } - } - } - } - ShowNotify("保存成功", MessageBoxIcon.Success); + //private void SaveGrid3() + //{ + // Model.SGGLDB db = Funs.DB; + // var list = (from x in db.PHTGL_ContractTrackProgress + // where x.ContractTrackId == Grid1.SelectedRowID + // select x).ToList(); + // PhtglContracttrackprogressService.DeleteModleByContractTrackId(Grid1.SelectedRowID); + // decimal totalWeights = 0; + // var SelectedList = (from x in db.PHTGL_ContractTrackMatchWBS + // where x.ContractTrackId == Grid1.SelectedRowID + // select x.ControlItemAndCycleId).ToList(); + // var totalControlItemAndCycles = from x in db.WBS_ControlItemAndCycle + // where x.ProjectId == this.CurrUser.LoginProjectId + // select x; + // var unitWorks = from x in db.WBS_UnitWork + // where x.ProjectId == this.CurrUser.LoginProjectId + // select x; + // var workPackages = (from x in db.WBS_WorkPackage + // where x.ProjectId == this.CurrUser.LoginProjectId + // select x).ToList(); + // var controlItemAndCycles = from x in totalControlItemAndCycles + // where SelectedList.Contains(x.ControlItemAndCycleId) + // select x; + // foreach (var controlItemAndCycle in controlItemAndCycles) + // { + // totalWeights += controlItemAndCycle.Weights ?? 0; + // } + // JArray EditorArr = Grid3.GetMergedData(); + // if (EditorArr.Count > 0) + // { + // Model.PHTGL_ContractTrackProgress model = null; + // for (int i = 0; i < EditorArr.Count; i++) + // { + // JObject objects = (JObject)EditorArr[i]; + // model = new Model.PHTGL_ContractTrackProgress(); + // model.ContractTrackProgressId = SQLHelper.GetNewID(typeof(Model.PHTGL_ContractTrackProgress)); + // model.ContractTrackId = Grid1.SelectedRowID; + // model.BCWS_Quantity = Funs.GetNewDecimal(objects["values"]["BCWS_Quantity"].ToString()); + // model.BCWS_OutputValue = Funs.GetNewDecimal(objects["values"]["BCWS_OutputValue"].ToString()); + // model.BCWS_Percentage = Funs.GetNewDecimal(objects["values"]["BCWS_Percentage"].ToString()); + // model.ACWP_Quantity = Funs.GetNewDecimal(objects["values"]["ACWP_Quantity"].ToString()); + // model.ACWP_OutputValue = Funs.GetNewDecimal(objects["values"]["ACWP_OutputValue"].ToString()); + // model.ACWP_Percentage = Funs.GetNewDecimal(objects["values"]["ACWP_Percentage"].ToString()); + // model.Date = objects["values"]["Date"].ToString(); + // BLL.PhtglContracttrackprogressService.AddPHTGL_ContractTrackProgress(model); + // var old = list.FirstOrDefault(x => x.Date == model.Date); + // decimal oldValue = 0; + // if (old != null) + // { + // oldValue = old.ACWP_OutputValue ?? 0; + // } + // decimal changeValue = (model.ACWP_OutputValue ?? 0) - oldValue; + // if (changeValue != 0) + // { + // foreach (var item in controlItemAndCycles) + // { + // var c = controlItemAndCycles.First(x => x.ControlItemAndCycleId == item.ControlItemAndCycleId); + // decimal thisValue = 0; + // if (totalWeights > 0 && c.Weights.HasValue) + // { + // thisValue = decimal.Round(c.Weights.Value / totalWeights * changeValue, 2); + // } + // DateTime? months = Funs.GetNewDateTime(model.Date + "-01"); + // var WorkPackage = workPackages.FirstOrDefault(x => x.WorkPackageId == item.WorkPackageId); + // Model.WBS_WorkPackageDetail WorkPackageDetail = BLL.WorkPackageDetailService.GetWorkPackageDetailByWorkPackageIdAndMonths(item.WorkPackageId, months.Value); + // if (WorkPackageDetail != null) + // { + // WorkPackageDetail.ThisValue += thisValue; + // } + // else + // { + // WorkPackageDetail = new Model.WBS_WorkPackageDetail(); + // WorkPackageDetail.WorkPackageDetailId = SQLHelper.GetNewID(); + // WorkPackageDetail.WorkPackageId = item.WorkPackageId; + // WorkPackageDetail.Months = months; + // WorkPackageDetail.ThisValue = thisValue; + // db.WBS_WorkPackageDetail.InsertOnSubmit(WorkPackageDetail); + // } + // //更新上级WBS内容每月实际费用 + // UpdateWorkPackageParentThisValue(db, WorkPackage.SuperWorkPackageId, months.Value, thisValue); + // ////更新单位工程 + // Model.WBS_WorkPackageParentDetail unitWorkDetail = BLL.WorkPackageParentDetailService.GetWorkPackageParentDetailByParentIdAndMonths(WorkPackage.UnitWorkId, months.Value); + // if (unitWorkDetail != null) + // { + // unitWorkDetail.ThisValue += thisValue; + // } + // else + // { + // unitWorkDetail = new Model.WBS_WorkPackageParentDetail(); + // unitWorkDetail.WorkPackageParentDetailId = SQLHelper.GetNewID(); + // unitWorkDetail.ParentId = WorkPackage.UnitWorkId; + // unitWorkDetail.Months = months; + // unitWorkDetail.ThisValue = thisValue; + // db.WBS_WorkPackageParentDetail.InsertOnSubmit(unitWorkDetail); + // } + // ////更新建筑、安装工程 + // Model.WBS_UnitWork unitWork = unitWorks.FirstOrDefault(x => x.UnitWorkId == WorkPackage.UnitWorkId); + // if (unitWork != null) + // { + // Model.WBS_WorkPackageParentDetail projectType = BLL.WorkPackageParentDetailService.GetWorkPackageParentDetailByParentIdAndMonths(unitWork.ProjectType, this.CurrUser.LoginProjectId, months.Value); + // if (projectType != null) + // { + // projectType.ThisValue += thisValue; + // } + // else + // { + // projectType = new Model.WBS_WorkPackageParentDetail(); + // projectType.WorkPackageParentDetailId = SQLHelper.GetNewID(); + // projectType.ParentId = unitWork.ProjectType; + // projectType.ProjectId = this.CurrUser.LoginProjectId; + // projectType.Months = months; + // projectType.ThisValue = thisValue; + // db.WBS_WorkPackageParentDetail.InsertOnSubmit(projectType); + // } + // } + // db.SubmitChanges(); + // } + // } + // } + // } + // ShowNotify("保存成功", MessageBoxIcon.Success); - } + //} #region 更新上级WBS内容每月实际费用 /// @@ -494,14 +444,14 @@ namespace FineUIPro.Web.PHTGL.ContractCompile var CalculationRule = objects["values"]["CalculationRule"].ToString(); var WorkContent = objects["values"]["WorkContent"].ToString(); var Remarks = objects["values"]["Remarks"].ToString(); - var ConstructionSubcontractor = objects["values"]["ConstructionSubcontractor"].ToString(); - var ContractWeight = objects["values"]["ContractWeight"].ToString(); - var MaterialSupplier = objects["values"]["MaterialSupplier"].ToString(); - var IsWithinGeneralContractScope = objects["values"]["IsWithinGeneralContractScope"].ToString(); - var EstimatedQuantity = objects["values"]["EstimatedQuantity"].ToString(); - var EstimatedAmount = objects["values"]["EstimatedAmount"].ToString(); - var SettledQuantity = objects["values"]["SettledQuantity"].ToString(); - var SettledAmount = objects["values"]["SettledAmount"].ToString(); + //var ConstructionSubcontractor = objects["values"]["ConstructionSubcontractor"].ToString(); + //var ContractWeight = objects["values"]["ContractWeight"].ToString(); + //var MaterialSupplier = objects["values"]["MaterialSupplier"].ToString(); + //var IsWithinGeneralContractScope = objects["values"]["IsWithinGeneralContractScope"].ToString(); + //var EstimatedQuantity = objects["values"]["EstimatedQuantity"].ToString(); + //var EstimatedAmount = objects["values"]["EstimatedAmount"].ToString(); + //var SettledQuantity = objects["values"]["SettledQuantity"].ToString(); + //var SettledAmount = objects["values"]["SettledAmount"].ToString(); var model = PhtglContractTrackService.GetPHTGL_ContractTrackById(Id); model.MainItemCode = MainItemCode; @@ -519,18 +469,20 @@ namespace FineUIPro.Web.PHTGL.ContractCompile model.CalculationRule = CalculationRule; model.WorkContent = WorkContent; model.Remarks = Remarks; - model.ConstructionSubcontractor = ConstructionSubcontractor; - model.ContractWeight = ContractWeight; - model.MaterialSupplier = MaterialSupplier; - model.IsWithinGeneralContractScope = bool.Parse(IsWithinGeneralContractScope); - model.EstimatedQuantity = EstimatedQuantity; - model.EstimatedAmount = Funs.GetNewDecimal(EstimatedAmount); - model.SettledQuantity = SettledQuantity; - model.SettledAmount = Funs.GetNewDecimal(SettledAmount); + //model.ConstructionSubcontractor = ConstructionSubcontractor; + //model.ContractWeight = ContractWeight; + //model.MaterialSupplier = MaterialSupplier; + //model.IsWithinGeneralContractScope = bool.Parse(IsWithinGeneralContractScope); + //model.EstimatedQuantity = EstimatedQuantity; + //model.EstimatedAmount = Funs.GetNewDecimal(EstimatedAmount); + //model.SettledQuantity = SettledQuantity; + //model.SettledAmount = Funs.GetNewDecimal(SettledAmount); PhtglContractTrackService.UpdatePHTGL_ContractTrack(model); } + } + ShowNotify("保存成功", MessageBoxIcon.Success); BindGrid(); } @@ -539,22 +491,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile BindGrid(); } - protected void btnGetChart_Click(object sender, EventArgs e) - { - if (!string.IsNullOrEmpty(ContractId)) - { - var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue); - if (model != null) - { - PageContext.RegisterStartupScript( - Window2.GetShowReference(string.Format("ContractTrackProgressChart.aspx?ContractId={0}", model.ContractId, "图表 - "))); - } - } - else - { - ShowNotify("请选择施工分包合同", MessageBoxIcon.Question); - } - } #endregion #region 关闭弹出窗 @@ -690,11 +626,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile } - protected void Window3_OnClose(object sender, WindowCloseEventArgs e) - { - BindGrid2(); - } - } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs index f9e9e9af..5b8601b2 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs @@ -158,15 +158,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// protected global::FineUIPro.Button btnQuery; - /// - /// btnGetChart 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnGetChart; - /// /// lblNumber 控件。 /// @@ -347,213 +338,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// protected global::FineUIPro.DropDownList ddlPageSize; - /// - /// panelBottomRegion 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Panel panelBottomRegion; - - /// - /// Panel7 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Panel Panel7; - - /// - /// Grid2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Grid Grid2; - - /// - /// Toolbar1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Toolbar Toolbar1; - - /// - /// ToolbarFill2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.ToolbarFill ToolbarFill2; - - /// - /// btnMatchWBS_New 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnMatchWBS_New; - - /// - /// btnMatchWBS_Delete 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnMatchWBS_Delete; - - /// - /// btnMatchWBS_Save 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnMatchWBS_Save; - - /// - /// NumberBox1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox NumberBox1; - - /// - /// Panel8 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Panel Panel8; - - /// - /// Grid3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Grid Grid3; - - /// - /// Toolbar3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Toolbar Toolbar3; - - /// - /// ToolbarFill1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.ToolbarFill ToolbarFill1; - - /// - /// btnProgress_New 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnProgress_New; - - /// - /// btnProgress_Delete 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnProgress_Delete; - - /// - /// btnProgress_Save 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnProgress_Save; - - /// - /// TextBox1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox1; - - /// - /// NumberBox4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox NumberBox4; - - /// - /// NumberBox5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox NumberBox5; - - /// - /// NumberBox6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox NumberBox6; - - /// - /// NumberBox7 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox NumberBox7; - - /// - /// NumberBox8 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox NumberBox8; - - /// - /// NumberBox9 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox NumberBox9; - /// /// Window1 控件。 /// @@ -572,15 +356,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// protected global::FineUIPro.Window Window2; - /// - /// Window3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Window Window3; - /// /// Menu1 控件。 /// diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx index 74cc0878..a5ac0f85 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx @@ -2,15 +2,51 @@ + - - + + 进度检测 + +
-
-
+ + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.cs index 912e8656..28ce3cd1 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.cs @@ -1,17 +1,57 @@ -using System; +using BLL; +using Newtonsoft.Json.Linq; +using System; using System.Collections.Generic; using System.Linq; +using System.Text; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; namespace FineUIPro.Web.PHTGL.ContractCompile { - public partial class ContractTrackProgressDetection : System.Web.UI.Page + public partial class ContractTrackProgressDetection : PageBase { + + public string ContractId + { + get => (string)ViewState["ContractId"]; + set => ViewState["ContractId"] = value; + } protected void Page_Load(object sender, EventArgs e) { + if (!IsPostBack) + { + //主合同编号 + this.DropContractCode.DataTextField = "ContractNum"; + this.DropContractCode.DataValueField = "ContractNum"; + this.DropContractCode.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId); + this.DropContractCode.DataBind(); + Funs.FineUIPleaseSelect(this.DropContractCode); + DropMainContractCode_SelectedIndexChanged(null, null); + + } + } + + protected void DropMainContractCode_SelectedIndexChanged(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(DropContractCode.SelectedValue)) + { + var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue); + if (model != null) + { + ContractId = model.ContractId; + this.txtContractName.Text = model.ContractName; + } + else + { + ContractId = ""; + this.txtContractName.Text = string.Empty; + } + + panelCenterRegion.IFrameUrl = "./ContractTrackProgressDetectionGrid.aspx?ContractId="+ContractId; + } } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.designer.cs index 2c60b552..db099d71 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.designer.cs @@ -22,5 +22,59 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel3; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// DropContractCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList DropContractCode; + + /// + /// txtContractName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtContractName; } } diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetectionGrid.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetectionGrid.aspx new file mode 100644 index 00000000..7a019c1b --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetectionGrid.aspx @@ -0,0 +1,87 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ContractTrackProgressDetectionGrid.aspx.cs" Inherits="FineUIPro.Web.PHTGL.ContractCompile.ContractTrackProgressDetectionGrid" %> + + + + + + + + 进度检测 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetectionGrid.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetectionGrid.aspx.cs new file mode 100644 index 00000000..1fc5b2e5 --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetectionGrid.aspx.cs @@ -0,0 +1,604 @@ +using BLL; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.PHTGL.ContractCompile +{ + public partial class ContractTrackProgressDetectionGrid : PageBase + { + #region Page_Init + + // 注意：动态创建的代码需要放置于Page_Init（不是Page_Load），这样每次构造页面时都会执行 + protected void Page_Init(object sender, EventArgs e) + { + InitGrid(); + } + public DataTable GridTable=new DataTable(); + private void InitGrid() + { + FineUIPro.BoundField bf; + FineUIPro.RenderField rf; + FineUIPro.TextBox txTextBox; + + + ContractId = Request.Params["ContractId"]; + + GridTable.Columns.Add("Id"); + ListItem[] list = new ListItem[8]; + list[0] = new ListItem("主项号", "MainItemCode"); + list[1] = new ListItem("主项名称", "MainItemName"); + list[2] = new ListItem("专业工程名称", "MajorName"); + list[3] = new ListItem("专业代码", "MajorCode"); + list[4] = new ListItem("分部工程", "SubProject"); + list[5] = new ListItem("分项工程", "SubItemProject"); + list[6] = new ListItem("项目编码", "ProjectCode"); + list[7] = new ListItem("项目名称", "ProjectName"); + + foreach (var item in list) + { + bf = new FineUIPro.BoundField(); + bf.ColumnID = item.Value; + bf.DataField = item.Value; + bf.HeaderText = item.Text; + bf.HeaderTextAlign = TextAlign.Center; + bf.TextAlign = TextAlign.Center; + Grid1.Columns.Add(bf); + GridTable.Columns.Add(item.Value); + } + if (!string.IsNullOrEmpty(ContractId)) + { + Model.PHTGL_ContractTrack queryContractTrack = new Model.PHTGL_ContractTrack(); + queryContractTrack.ProjectId = this.CurrUser.LoginProjectId; + queryContractTrack.ContractId = this.ContractId; + var modelContractTracks = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackByModle(queryContractTrack); + if (modelContractTracks.Count==0) return; + + + Model.PHTGL_ContractTrackProgress table = new Model.PHTGL_ContractTrackProgress(); + table.ContractTrackId = modelContractTracks[0].Id; + var tb = BLL.PhtglContracttrackprogressService.GetPHTGL_ContractTrackProgressByModle(table); + foreach (var item in tb) + { + //string date = item.Date.Replace("-", ""); + string date = item.Date+"#" ; + GroupField p = new GroupField(); + p.HeaderText = item.Date; + p.TextAlign = TextAlign.Center; + + GroupField p1 = new GroupField(); + p1.HeaderText = "当月进展情况"; + p1.TextAlign = TextAlign.Center; + + GroupField p1BCWS = new GroupField(); + p1BCWS.HeaderText = "BCWS"; + p1BCWS.TextAlign = TextAlign.Center; + + GroupField p1ACWP = new GroupField(); + p1ACWP.HeaderText = "ACWP"; + p1ACWP.TextAlign = TextAlign.Center; + + + GroupField p2 = new GroupField(); + p2.HeaderText = "累计进展情况"; + p2.TextAlign = TextAlign.Center; + + + + GroupField p2BCWS = new GroupField(); + p2BCWS.HeaderText = "BCWS"; + p2BCWS.TextAlign = TextAlign.Center; + + GroupField p2ACWP = new GroupField(); + p2ACWP.HeaderText = "ACWP"; + p2ACWP.TextAlign = TextAlign.Center; + + #region 当月进展情况 + + #region BCWS + + txTextBox = new FineUIPro.TextBox(); + txTextBox.ID = "txt" +date+ "BCWS_Quantity"; + rf = new RenderField(); + rf.ColumnID = date+"BCWS_Quantity"; + rf.DataField = date+"BCWS_Quantity"; + rf.HeaderText = "工程量"; + rf.TextAlign = FineUIPro.TextAlign.Left; + rf.Editor.Add(txTextBox); + p1BCWS.Columns.Add(rf); + + GridTable.Columns.Add(date + "BCWS_Quantity"); + + bf = new FineUIPro.BoundField(); + bf.ColumnID = date + "BCWS_OutputValue"; + bf.DataField = date + "BCWS_OutputValue"; + bf.HeaderText = "产值"; + bf.HeaderTextAlign = TextAlign.Center; + bf.TextAlign = TextAlign.Center; + p1BCWS.Columns.Add(bf); + GridTable.Columns.Add(date + "BCWS_OutputValue"); + + bf = new FineUIPro.BoundField(); + bf.ColumnID = date + "BCWS_Percentage"; + bf.DataField = date + "BCWS_Percentage"; + bf.HeaderText = "百分比"; + bf.HeaderTextAlign = TextAlign.Center; + bf.TextAlign = TextAlign.Center; + p1BCWS.Columns.Add(bf); + GridTable.Columns.Add(date + "BCWS_Percentage"); + #endregion + + #region ACWP + + txTextBox = new FineUIPro.TextBox(); + txTextBox.ID = "txt" + date + "ACWP_Quantity"; + rf = new RenderField(); + rf.ColumnID = date + "ACWP_Quantity"; + rf.DataField = date + "ACWP_Quantity"; + rf.HeaderText = "工程量"; + rf.TextAlign = FineUIPro.TextAlign.Left; + rf.Editor.Add(txTextBox); + p1ACWP.Columns.Add(rf); + GridTable.Columns.Add(date + "ACWP_Quantity"); + + bf = new FineUIPro.BoundField(); + bf.ColumnID = date + "ACWP_OutputValue"; + bf.DataField = date + "ACWP_OutputValue"; + bf.HeaderText = "产值"; + bf.HeaderTextAlign = TextAlign.Center; + bf.TextAlign = TextAlign.Center; + p1ACWP.Columns.Add(bf); + GridTable.Columns.Add(date + "ACWP_OutputValue"); + + bf = new FineUIPro.BoundField(); + bf.ColumnID = date + "ACWP_Percentage"; + bf.DataField = date + "ACWP_Percentage"; + bf.HeaderText = "百分比"; + bf.HeaderTextAlign = TextAlign.Center; + bf.TextAlign = TextAlign.Center; + p1ACWP.Columns.Add(bf); + GridTable.Columns.Add(date + "ACWP_Percentage"); + #endregion + + #endregion + + + #region 累计进展情况 + + #region BCWS + + txTextBox = new FineUIPro.TextBox(); + txTextBox.ID = "txt" + date + "SumBCWS_Quantity"; + rf = new RenderField(); + rf.ColumnID = date + "SumBCWS_Quantity"; + rf.DataField = date + "SumBCWS_Quantity"; + rf.HeaderText = "工程量"; + rf.TextAlign = FineUIPro.TextAlign.Left; + rf.Editor.Add(txTextBox); + p2BCWS.Columns.Add(rf); + + GridTable.Columns.Add(date + "SumBCWS_Quantity"); + + bf = new FineUIPro.BoundField(); + bf.ColumnID = date + "SumBCWS_OutputValue"; + bf.DataField = date + "SumBCWS_OutputValue"; + bf.HeaderText = "产值"; + bf.HeaderTextAlign = TextAlign.Center; + bf.TextAlign = TextAlign.Center; + p2BCWS.Columns.Add(bf); + GridTable.Columns.Add(date + "SumBCWS_OutputValue"); + + bf = new FineUIPro.BoundField(); + bf.ColumnID = date + "SumBCWS_Percentage"; + bf.DataField = date + "SumBCWS_Percentage"; + bf.HeaderText = "百分比"; + bf.HeaderTextAlign = TextAlign.Center; + bf.TextAlign = TextAlign.Center; + p2BCWS.Columns.Add(bf); + GridTable.Columns.Add(date + "SumBCWS_Percentage"); + #endregion + + #region ACWP + + txTextBox = new FineUIPro.TextBox(); + txTextBox.ID = "txt" + date + "SumACWP_Quantity"; + rf = new RenderField(); + rf.ColumnID = date + "SumACWP_Quantity"; + rf.DataField = date + "SumACWP_Quantity"; + rf.HeaderText = "工程量"; + rf.TextAlign = FineUIPro.TextAlign.Left; + rf.Editor.Add(txTextBox); + p2ACWP.Columns.Add(rf); + GridTable.Columns.Add(date + "SumACWP_Quantity"); + + bf = new FineUIPro.BoundField(); + bf.ColumnID = date + "SumACWP_OutputValue"; + bf.DataField = date + "SumACWP_OutputValue"; + bf.HeaderText = "产值"; + bf.HeaderTextAlign = TextAlign.Center; + bf.TextAlign = TextAlign.Center; + p2ACWP.Columns.Add(bf); + GridTable.Columns.Add(date + "SumACWP_OutputValue"); + + bf = new FineUIPro.BoundField(); + bf.ColumnID = date + "SumACWP_Percentage"; + bf.DataField = date + "SumACWP_Percentage"; + bf.HeaderText = "百分比"; + bf.HeaderTextAlign = TextAlign.Center; + bf.TextAlign = TextAlign.Center; + p2ACWP.Columns.Add(bf); + GridTable.Columns.Add(date + "SumACWP_Percentage"); + #endregion + + #endregion + + p1.Columns.Add(p1BCWS); + p1.Columns.Add(p1ACWP); + + + p2.Columns.Add(p2BCWS); + p2.Columns.Add(p2ACWP); + + p.Columns.Add(p1); + p.Columns.Add(p2); + + Grid1.Columns.Add(p); + + } + } + + } + + #endregion + public string ContractId + { + get => (string)ViewState["ContractId"]; + set => ViewState["ContractId"] = value; + } + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.GetButtonPower(); + + + // 绑定表格 + this.BindGrid(); + + } + } + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid() + { + if (!string .IsNullOrEmpty(ContractId)) + { + DataRow row; + Model.PHTGL_ContractTrack queryContractTrack = new Model.PHTGL_ContractTrack(); + queryContractTrack.ProjectId = this.CurrUser.LoginProjectId; + queryContractTrack.ContractId = this.ContractId; + var modelContractTracks = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackByModle(queryContractTrack); + foreach (var item in modelContractTracks) + { + row= GridTable.NewRow(); + row["Id"] = item.Id; + row["MainItemCode"] = item.MainItemCode; + row["MainItemName"] = item.MainItemName; + row["MajorName"] = item.MajorName; + row["MajorCode"] = item.MajorCode; + row["SubProject"] = item.SubProject; + row["SubItemProject"] = item.SubItemProject; + row["ProjectCode"] = item.ProjectCode; + row["ProjectName"] = item.ProjectName; + + Model.PHTGL_ContractTrackProgress qContractTrackProgress = new Model.PHTGL_ContractTrackProgress(); + qContractTrackProgress.ContractTrackId = item.Id; + var modelContractTrackProgresses = BLL.PhtglContracttrackprogressService.GetPHTGL_ContractTrackProgressByModle(qContractTrackProgress); + foreach (var detail in modelContractTrackProgresses) + { + // var date=detail.Date.Replace("-", ""); + var date=detail.Date + "#"; + row[date+ "BCWS_Quantity"] = detail.BCWS_Quantity; + row[date+ "BCWS_OutputValue"] = detail.BCWS_OutputValue; + row[date+ "BCWS_Percentage"] = detail.BCWS_Percentage; + row[date+ "ACWP_Quantity"] = detail.ACWP_Quantity; + row[date+ "ACWP_OutputValue"] = detail.ACWP_OutputValue; + row[date+ "ACWP_Percentage"] = detail.ACWP_Percentage; + + var SumModel = PhtglContracttrackprogressService.GetSumProgress(detail.ContractTrackProgressId); + row[date + "SumBCWS_Quantity"] = SumModel.BCWS_Quantity; + row[date + "SumBCWS_OutputValue"] = SumModel.BCWS_OutputValue; + row[date + "SumBCWS_Percentage"] = SumModel.BCWS_Percentage; + row[date + "SumACWP_Quantity"] = SumModel.ACWP_Quantity; + row[date + "SumACWP_OutputValue"] = SumModel.ACWP_OutputValue; + row[date + "SumACWP_Percentage"] = SumModel.ACWP_Percentage; + } + + GridTable.Rows.Add(row); + } + + Grid1.DataSource = GridTable; + Grid1.DataBind(); + } + + + } + #endregion + + #region GV 数据操作 + /// + /// 过滤表头 + /// + /// + /// + //protected void Grid1_FilterChange(object sender, EventArgs e) + //{ + // this.BindGrid(); + //} + + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + this.Grid1.PageIndex = e.NewPageIndex; + this.BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + this.Grid1.SortDirection = e.SortDirection; + this.Grid1.SortField = e.SortField; + this.BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + + this.BindGrid(); + } + #endregion + + #region 数据编辑事件 + + /// + /// 编辑按钮 + /// + /// + /// + protected void btnEdit_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string ID = Grid1.SelectedRowID; + var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(ID); + if (model != null) ///已上报时不能删除 + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackEdit.aspx?Id={0}", ID, "编辑 - "))); + } + } + + /// + /// Grid行双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.btnEdit_Click(null, null); + } + + protected void btnSave_OnClick(object sender, EventArgs e) + { + JArray EditorArr = Grid1.GetMergedData(); + if (EditorArr.Count > 0) + { + for (int i = 0; i < EditorArr.Count; i++) + { + JObject objects = (JObject)EditorArr[i]; + + var listfiled = objects["values"].ToList(); + + var Id = objects["id"].ToString(); + var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(Id); + + + if (model!=null) + { + foreach (var item in listfiled) //遍历行中的字段 + { + var b = item; + var txtname = b.First.Path.Substring(b.First.Path.LastIndexOf('.') + 1); + var txtvalue = b.First.Value(); + string date = txtname.Split('#')[0].ToString(); + string filed = txtname.Split('#')[1].ToString(); + + var modelContractTrackProgress = PhtglContracttrackprogressService.GetPHTGL_ContractTrackProgressByTrackIdAndDate(Id, date); + if (modelContractTrackProgress!=null) + { + switch (filed) + { + case "ACWP_Quantity": + modelContractTrackProgress.ACWP_Quantity = Funs.GetNewDecimalOrZero(txtvalue) ; + break; + case "BCWS_Quantity": + modelContractTrackProgress.BCWS_Quantity = Funs.GetNewDecimalOrZero(txtvalue); + break; + } + } + PhtglContracttrackprogressService.UpdatePHTGL_ContractTrackProgress(modelContractTrackProgress); + } + + } + + + } + } + + CheckProgressd(); + BindGrid(); + } + /// + /// 修改产值/百分比 + /// + private void CheckProgressd() + { + if (!string.IsNullOrEmpty(ContractId)) + { + Model.PHTGL_ContractTrack queryContractTrack = new Model.PHTGL_ContractTrack(); + queryContractTrack.ProjectId = this.CurrUser.LoginProjectId; + queryContractTrack.ContractId = this.ContractId; + var modelContractTracks = + BLL.PhtglContractTrackService.GetPHTGL_ContractTrackByModle(queryContractTrack); + foreach (var item in modelContractTracks) + { + PhtglContracttrackprogressService.CheckProgressByContractTrackId(item.Id); + } + } + } + + protected void btnQuery_OnClick(object sender, EventArgs e) + { + BindGrid(); + } + + protected void btnGetChart_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(ContractId)) + { + var model = ContractService.GetContractById(ContractId); + if (model != null) + { + PageContext.RegisterStartupScript( + Window2.GetShowReference(string.Format("ContractTrackProgressChart.aspx?ContractId={0}", model.ContractId, "图表 - "))); + } + } + else + { + ShowNotify("请选择施工分包合同", MessageBoxIcon.Question); + } + } + #endregion + + #region 获取权限按钮 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.PHTGL_ContractTrackProgressDetectionMenuId); + if (buttonList.Count > 0) + { + if (buttonList.Contains(BLL.Const.BtnAdd)) + { + //this.btnNew.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnModify)) + { + // this.btnMenuEdit.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnDelete)) + { + // this.btnMenuDelete.Hidden = false; + } + } + } + #endregion + + #region 关闭弹出窗 + /// + /// 关闭弹出窗 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + + #region 导出按钮 + /// 导出按钮 + ///
+ /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + Response.ClearContent(); + string filename = Funs.GetNewFileName(); + Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("合同执行跟踪表" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.ContentType = "application/excel"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + this.Grid1.PageSize = 500; + this.BindGrid(); + Response.Write(GetGridTableHtml(Grid1)); + Response.End(); + } + + /// + /// 导出方法 + /// + /// + /// + private string GetGridTableHtml(Grid grid) + { + StringBuilder sb = new StringBuilder(); + sb.Append(""); + sb.Append(""); + sb.Append(""); + foreach (GridColumn column in grid.Columns) + { + sb.AppendFormat("", column.HeaderText); + } + sb.Append(""); + foreach (GridRow row in grid.Rows) + { + sb.Append(""); + foreach (GridColumn column in grid.Columns) + { + string html = row.Values[column.ColumnIndex].ToString(); + if (column.ColumnID == "tfNumber") + { + html = (row.FindControl("lblNumber") as System.Web.UI.WebControls.Label).Text; + } + sb.AppendFormat("", html); + } + + sb.Append(""); + } + + sb.Append("
{0}
{0}
"); + + return sb.ToString(); + } + #endregion + + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetectionGrid.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetectionGrid.aspx.designer.cs new file mode 100644 index 00000000..dc989cb2 --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetectionGrid.aspx.designer.cs @@ -0,0 +1,143 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.PHTGL.ContractCompile +{ + + + public partial class ContractTrackProgressDetectionGrid + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel3; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar4; + + /// + /// txtProjectCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectCode; + + /// + /// txtProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnGetChart 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnGetChart; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Window2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window2; + } +} diff --git a/SGGL/FineUIPro.Web/common/Menu_DigData.xml b/SGGL/FineUIPro.Web/common/Menu_DigData.xml index b532a9bb..bb7a7a34 100644 --- a/SGGL/FineUIPro.Web/common/Menu_DigData.xml +++ b/SGGL/FineUIPro.Web/common/Menu_DigData.xml @@ -1,9 +1,51 @@  - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16,12 +58,15 @@ + + + - - - - - + + + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml index 4e56de27..3ccb32ac 100644 --- a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml @@ -35,9 +35,8 @@ - - - - - + + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 03eb9188..9bc36592 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -48,43 +48,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -