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

20250310 total budget回填

Browse Source
This commit is contained in:
毕文静
2025-03-10 11:35:22 +08:00
parent 3d62a6b335
commit f6b3af99f6
6 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs
+1 -1
View File
@@ -45,7 +45,7 @@ namespace FineUIPro.Web.SES
private void BindGrid()
{
string strSql = @"SELECT * FROM dbo.View_EMC_Punishment WHERE Flag='1' and DATEADD(year,1,PunishDate) >= GETDATE() ";
string strSql = @"SELECT * FROM dbo.View_EMC_Punishment WHERE Flag='1' ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtFO_NO.Text.Trim()))
FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs
+8 -1
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 m = string.Join(",", sesdata.Where(p => p.Main_Coordinator != null).Select(p => p.Main_Coordinator).Distinct());
string cruUser = CurrUser.UserId;
string strSql = @"SELECT * from View_FC_SESRelatedData WHERE DATEADD(year,1,Expire_Date) >=GETDATE() ";
string strSql = @"SELECT * from View_FC_SESRelatedData ";
List<SqlParameter> listStr = new List<SqlParameter>();
@@ -4412,6 +4412,13 @@ namespace FineUIPro.Web.SES
var contracts = BLL.ContractManagementService.GetContractManagementById(rowID);
if (contracts != null)
{
//删除费用增补回写的Contract Budget随之变化
var data = BLL.SESRelatedDataService.GetSESRelatedDataById(contracts.FC_ID.ToString());
if (data != null)
{
data.Actual_Budget = data.Actual_Budget - contracts.TotalBudget;
BLL.SESRelatedDataService.UpdateSESRelatedData(data);
}
BLL.ContractManagementService.DeleteContractManagementById(rowID);
}
}
FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs
+12 -1
View File
@@ -52,12 +52,23 @@ namespace FineUIPro.Web.SES
BLL.DisciplineService.InitDropDownList(this.drpDiscispline, true); //专业
BLL.DisciplineCategoryService.InitDropDownList(this.drpOriginal_WC, true);//专业类别
BLL.ContractorService.InitDropDownList(this.drpContractor, true);//承包商
//BLL.ContractorService.InitDropDownList(this.drpContractor, true);//承包商
BLL.PriceSchemeService.InitDropDownList(this.drpPricing_Scheme, true);//价格方案
BLL.ItemService.InitDropDownList(this.drpItem, true);
BLL.CurrencyService.InitDropDownList(this.drpCurrency, true); //币种
BLL.FOTypeService.InitDropDownList(this.drpFOTypeId, true);
BLL.TypeService.InitDropDownList(this.drpType, true);
var contractorLists = from x in Funs.DB.FC_SESRelatedData
join y in Funs.DB.Base_Contractor on x.Contractor equals y.ContractorId
where x.Expire_Date.Value.AddYears(1) >= DateTime.Now
select new { y.ContractorId, Contractor = y.Contractor + y.ContractorCN };
this.drpContractor.DataTextField = "Contractor";
this.drpContractor.DataValueField = "ContractorId";
this.drpContractor.DataSource = contractorLists.Distinct();
this.drpContractor.DataBind();
Funs.FineUIPleaseSelect(this.drpContractor);
//合同员
this.drpContract_Admin.DataTextField = "UserName";
this.drpContract_Admin.DataValueField = "UserId";