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

20250310 total budget回填

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FCL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress>
</Use64BitIISExpress>

2
FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs
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()))

9
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 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);
}
}

13
FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs
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";

2
FCL/FineUIPro.Web/Web.config
View File

@ -55,7 +55,7 @@
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
<add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" validate="false"/>
</httpHandlers>
<compilation debug="true" targetFramework="4.6.1">
<compilation debug="false" targetFramework="4.6.1">
<buildProviders>
<add extension=".rdlc" type="Microsoft.Reporting.RdlBuildProvider, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91"/>
</buildProviders>

2
FCL/WebApi/WebApi.csproj.user
View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>