diff --git a/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user b/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user index fcf3204..accb770 100644 --- a/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ ShowAllFiles - Debug|Any CPU + Release|Any CPU true diff --git a/FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs b/FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs index a36dc40..f46c3d7 100644 --- a/FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs +++ b/FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs @@ -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 listStr = new List(); if (!string.IsNullOrEmpty(this.txtFO_NO.Text.Trim())) diff --git a/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs index c343180..afb5fb3 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs @@ -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 listStr = new List(); @@ -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); } } diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs index 68b0fc0..9dec380 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs @@ -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"; diff --git a/FCL/FineUIPro.Web/Web.config b/FCL/FineUIPro.Web/Web.config index 4a08f09..c97a2b2 100644 --- a/FCL/FineUIPro.Web/Web.config +++ b/FCL/FineUIPro.Web/Web.config @@ -55,7 +55,7 @@ - + diff --git a/FCL/WebApi/WebApi.csproj.user b/FCL/WebApi/WebApi.csproj.user index ca0d73e..643f3e5 100644 --- a/FCL/WebApi/WebApi.csproj.user +++ b/FCL/WebApi/WebApi.csproj.user @@ -8,7 +8,7 @@ - Debug|Any CPU + Release|Any CPU