shecs
/
Basf_FCL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20250312 费用增补

This commit is contained in:
毕文静 2025-03-12 10:19:37 +08:00
parent f6b3af99f6
commit a8aa85835c
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FCL/FineUIPro.Web/Global.asax.cs
View File

@ -58,7 +58,7 @@
} }
//自动填写评价 //自动填写评价
if (DateTime.Now.Day == 16) if (DateTime.Now.Day == 12)
{ {
System.Timers.Timer aTimer = new System.Timers.Timer(); System.Timers.Timer aTimer = new System.Timers.Timer();
aTimer.Elapsed += new System.Timers.ElapsedEventHandler(aTimer_AutoFill); aTimer.Elapsed += new System.Timers.ElapsedEventHandler(aTimer_AutoFill);

6
FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs
View File

@ -102,7 +102,7 @@ namespace FineUIPro.Web.SES
//var u = string.Join(",", sesdata.Where(p => p.User_Representative != null).Select(p => p.User_Representative).Distinct()); //var u = string.Join(",", sesdata.Where(p => p.User_Representative != null).Select(p => p.User_Representative).Distinct());
//var m = string.Join(",", sesdata.Where(p => p.Main_Coordinator != null).Select(p => p.Main_Coordinator).Distinct()); //var m = string.Join(",", sesdata.Where(p => p.Main_Coordinator != null).Select(p => p.Main_Coordinator).Distinct());
string cruUser = CurrUser.UserId; string cruUser = CurrUser.UserId;
string strSql = @"SELECT * from View_FC_SESRelatedData "; string strSql = @"SELECT * from View_FC_SESRelatedData where 1=1";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
@ -4412,11 +4412,11 @@ namespace FineUIPro.Web.SES
var contracts = BLL.ContractManagementService.GetContractManagementById(rowID); var contracts = BLL.ContractManagementService.GetContractManagementById(rowID);
if (contracts != null) if (contracts != null)
{ {
//删除费用增补回写的Contract Budget随之变化 //删除费用增补回写的Contract Budget-费用增补中的Supplemented Budget
var data = BLL.SESRelatedDataService.GetSESRelatedDataById(contracts.FC_ID.ToString()); var data = BLL.SESRelatedDataService.GetSESRelatedDataById(contracts.FC_ID.ToString());
if (data != null) if (data != null)
{ {
data.Actual_Budget = data.Actual_Budget - contracts.TotalBudget; data.Actual_Budget = data.Actual_Budget - contracts.SupplementedBudget;
BLL.SESRelatedDataService.UpdateSESRelatedData(data); BLL.SESRelatedDataService.UpdateSESRelatedData(data);
} }
BLL.ContractManagementService.DeleteContractManagementById(rowID); BLL.ContractManagementService.DeleteContractManagementById(rowID);

3
FCL/FineUIPro.Web/common/Main.aspx.cs
View File

@ -46,7 +46,8 @@ namespace FineUIPro.Web.common
fc.Contract_Admin as Contract_AdminId,CA.UserName AS Contract_Admin, fc.Buyer, fc.Contract_Admin as Contract_AdminId,CA.UserName AS Contract_Admin, fc.Buyer,
mc.UserName AS Main_Coordinator, ur.UserName AS User_Representative, mc.UserName AS Main_Coordinator, ur.UserName AS User_Representative,
fc.Contract_Person, fc.Contract_Tel,fc.Validate_Date, fc.Expire_Date, fc.Contract_Person, fc.Contract_Tel,fc.Validate_Date, fc.Expire_Date,
CONVERT(VARCHAR(10),CONVERT(DECIMAL(18,2),(fc.Actual_Budget-ISNULL(c.CheckedValue,0))/fc.Actual_Budget*100))+'%' AS Remaining_Budget_Rate, (case when fc.Actual_Budget>0 then
CONVERT(VARCHAR(10),CONVERT(DECIMAL(18,2),(fc.Actual_Budget-ISNULL(c.CheckedValue,0))/fc.Actual_Budget*100))+'%' else CONVERT(VARCHAR(10),0)+'%' end) AS Remaining_Budget_Rate,
(CASE WHEN DATEDIFF(DAY,fc.Validate_Date,fc.Expire_Date)>0 (CASE WHEN DATEDIFF(DAY,fc.Validate_Date,fc.Expire_Date)>0
THEN CONVERT(VARCHAR(10),CONVERT(DECIMAL(18,2),CONVERT(DECIMAL(18,2),DATEDIFF(DAY,GETDATE(),fc.Expire_Date))/CONVERT(DECIMAL(18,2),DATEDIFF(DAY,fc.Validate_Date,fc.Expire_Date))*100))+'%' THEN CONVERT(VARCHAR(10),CONVERT(DECIMAL(18,2),CONVERT(DECIMAL(18,2),DATEDIFF(DAY,GETDATE(),fc.Expire_Date))/CONVERT(DECIMAL(18,2),DATEDIFF(DAY,fc.Validate_Date,fc.Expire_Date))*100))+'%'
ELSE ''END) AS Remaining_Duration_Rate ELSE ''END) AS Remaining_Duration_Rate