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

20240929 修改RP超时不允许编辑

This commit is contained in:
毕文静 2024-09-29 15:48:12 +08:00
parent 17ac63f758
commit d6c2b68ebc
13 changed files with 129 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
EProject/BLL/bin/Debug/Newtonsoft.Json.pdb Normal file
View File

Binary file not shown.

BIN
EProject/BLL/bin/Release/Newtonsoft.Json.pdb Normal file
View File

Binary file not shown.

2
EProject/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -2014,7 +2014,7 @@
<WCFMetadata Include="Connected Services\" /> <WCFMetadata Include="Connected Services\" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}"> <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

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

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

11
EProject/FineUIPro.Web/Global.asax.cs
View File

@ -330,6 +330,7 @@
#region 1、填写第二张资源时，第一张资源预留一个月的时候填写人工时 2、Cancelled或Hold也预留一个月 #region 1、填写第二张资源时，第一张资源预留一个月的时候填写人工时 2、Cancelled或Hold也预留一个月
/// <summary> /// <summary>
/// 填写第二张资源时，第一张资源预留一个月的时候填写人工时 /// 填写第二张资源时，第一张资源预留一个月的时候填写人工时
/// MOC和Projects项目
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
@ -340,12 +341,16 @@
{ {
foreach (var epr in eprojects) foreach (var epr in eprojects)
{ {
var planLists = (from x in Funs.DB.Resource_Plan where x.EProjectId == epr.Key orderby x.CreateDate descending select x).ToList(); var planLists = (from x in Funs.DB.Resource_Plan
join y in Funs.DB.Editor_EProject on x.EProjectId equals y.EProjectId
where x.EProjectId == epr.Key && (y.ProjectControl_JobType == "Projects" || y.ProjectControl_JobType == "MOC")
orderby x.CreateDate ascending
select new { x.ResourcePlanId, y.PM_MA_ProjectApproval }).ToList();
if (planLists.Count() == 2) if (planLists.Count() == 2)
{ {
if (planLists[0].CreateDate.Value.AddMonths(1).ToShortDateString() == DateTime.Now.ToShortDateString()) if (planLists[0].PM_MA_ProjectApproval.HasValue && planLists[0].PM_MA_ProjectApproval.Value.AddMonths(1) <= DateTime.Now)
{ {
var manHours_Plan = Funs.DB.ManHours_Plan.FirstOrDefault(x => x.ResourcePlanId == planLists[1].ResourcePlanId); var manHours_Plan = Funs.DB.ManHours_Plan.FirstOrDefault(x => x.ResourcePlanId == planLists[0].ResourcePlanId);
if (manHours_Plan != null) if (manHours_Plan != null)
{ {
manHours_Plan.AccountDisabled = 1; manHours_Plan.AccountDisabled = 1;

133
EProject/FineUIPro.Web/ResourcePlan/ResourcePlan.aspx.cs
View File

@ -369,26 +369,35 @@ namespace FineUIPro.Web.ResourcePlan
var role = BLL.Sys_RoleService.GetRole(user.RoleId); var role = BLL.Sys_RoleService.GetRole(user.RoleId);
string projectManager = epro.ProjectControl_ProjectManager; string projectManager = epro.ProjectControl_ProjectManager;
string leadByName = epro.ProjectControl_LeadByName; string leadByName = epro.ProjectControl_LeadByName;
// 权限已特殊处理
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "编辑 - ")));
//if (!string.IsNullOrEmpty(projectManager) && !string.IsNullOrEmpty(leadByName) && epro.ProjectControl_LeadByName.Contains("CTE") && (epro.ProjectControl_ProjectManager == this.CurrUser.UserName || user.DepartId != BLL.Const.CTEM_DepartId)) var manHours = (from x in Funs.DB.ManHours_Plan where x.ResourcePlanId == Id select x).FirstOrDefault();
//{ if (manHours.AccountDisabled == 0)
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "新增 - "))); {
//} // 权限已特殊处理
////lead by不是CTE的项目，需CTE做设计支持的项目的RP授权给Project Control PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "编辑 - ")));
//else if (!string.IsNullOrEmpty(leadByName) && !epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName == "PPE")
//{ //if (!string.IsNullOrEmpty(projectManager) && !string.IsNullOrEmpty(leadByName) && epro.ProjectControl_LeadByName.Contains("CTE") && (epro.ProjectControl_ProjectManager == this.CurrUser.UserName || user.DepartId != BLL.Const.CTEM_DepartId))
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "新增 - "))); //{
//} // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "新增 - ")));
//else if (this.CurrUser.UserId == BLL.Const.GlyId) //}
//{ ////lead by不是CTE的项目，需CTE做设计支持的项目的RP授权给Project Control
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "新增 - "))); //else if (!string.IsNullOrEmpty(leadByName) && !epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName == "PPE")
//} //{
//else // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "新增 - ")));
//{ //}
// Alert.Show("您不是PM、非CTE/M用户或PPE，不能填报资源", MessageBoxIcon.Warning); //else if (this.CurrUser.UserId == BLL.Const.GlyId)
//} //{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&&eProjectId={1}", Id, eProjectId, "新增 - ")));
//}
//else
//{
// Alert.Show("您不是PM、非CTE/M用户或PPE，不能填报资源", MessageBoxIcon.Warning);
//}
}
else
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanView.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
}
} }
} }
} }
@ -426,45 +435,53 @@ namespace FineUIPro.Web.ResourcePlan
object[] keys = Grid2.DataKeys[e.RowIndex]; object[] keys = Grid2.DataKeys[e.RowIndex];
string eProjectId = keys[1].ToString(); string eProjectId = keys[1].ToString();
//var epro = BLL.EProjectService.GeteProjectById(eProjectId); var manHours = (from x in Funs.DB.ManHours_Plan where x.ResourcePlanId == Id select x).FirstOrDefault();
//if (epro != null) if (manHours.AccountDisabled == 0)
//{ {
// var user = BLL.Sys_UserService.GetUsersByUserId(this.CurrUser.UserId); //var epro = BLL.EProjectService.GeteProjectById(eProjectId);
// if (user != null) //if (epro != null)
// { //{
//if (!string.IsNullOrEmpty(user.RoleId)) // var user = BLL.Sys_UserService.GetUsersByUserId(this.CurrUser.UserId);
//{ // if (user != null)
//var role = BLL.Sys_RoleService.GetRole(user.RoleId); // {
//if (role != null) //if (!string.IsNullOrEmpty(user.RoleId))
//{ //{
//if (epro.ProjectControl_LeadByName.Contains("CTE") && user.DepartId == BLL.Const.CTEM_DepartId) //var role = BLL.Sys_RoleService.GetRole(user.RoleId);
//{ //if (role != null)
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - "))); //{
//} //if (epro.ProjectControl_LeadByName.Contains("CTE") && user.DepartId == BLL.Const.CTEM_DepartId)
//else if (epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName != "PM") //{
//{ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
// ShowAlert("您不是PM，不能填报Lead by是CTE的项目资源", MessageBoxIcon.Warning); //}
//} //else if (epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName != "PM")
//else if (!epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName == "PPE") //{
//{ // ShowAlert("您不是PM，不能填报Lead by是CTE的项目资源", MessageBoxIcon.Warning);
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - "))); //}
//} //else if (!epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName == "PPE")
//else if (!epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName != "PPE") //{
//{ // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
// ShowAlert("您不是PPE，不能填报Lead by不是CTE的项目资源", MessageBoxIcon.Warning); //}
//} //else if (!epro.ProjectControl_LeadByName.Contains("CTE") && role.RoleName != "PPE")
//else //{
//{ // ShowAlert("您不是PPE，不能填报Lead by不是CTE的项目资源", MessageBoxIcon.Warning);
// Alert.Show("您不是PM或PPE，不能填报资源", MessageBoxIcon.Warning); //}
//} //else
//} //{
//} // Alert.Show("您不是PM或PPE，不能填报资源", MessageBoxIcon.Warning);
//else if (this.CurrUser.UserId == BLL.Const.GlyId) //}
//{ //}
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - "))); //}
//} //else if (this.CurrUser.UserId == BLL.Const.GlyId)
// } //{
//} // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanEdit.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
//}
// }
//}
}
else
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ResourcePlanView.aspx?ResourcePlanId={0}&eProjectId={1}", Id, eProjectId, "编辑 - ")));
}
} }
protected void Grid2_RowCommand(object sender, GridCommandEventArgs e) protected void Grid2_RowCommand(object sender, GridCommandEventArgs e)

6
EProject/FineUIPro.Web/ResourcePlan/ResourcePlanAdd.aspx.cs
View File

@ -2,13 +2,9 @@
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Specialized;
using System.Data; using System.Data;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Linq; using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.ResourcePlan namespace FineUIPro.Web.ResourcePlan
{ {
@ -144,6 +140,8 @@ namespace FineUIPro.Web.ResourcePlan
} }
//绑定 //绑定
BindGrid(); BindGrid();
} }
} }
} }

73
EProject/FineUIPro.Web/ResourcePlan/ResourcePlanEdit.aspx.cs
View File

@ -62,51 +62,54 @@ namespace FineUIPro.Web.ResourcePlan
if (!string.IsNullOrEmpty(resourcePlanId)) if (!string.IsNullOrEmpty(resourcePlanId))
{ {
var rp = BLL.ResourcePlanService.GetModelsResourcePlans(resourcePlanId); var rp = BLL.ResourcePlanService.GetModelsResourcePlans(resourcePlanId);
var eProject = BLL.EProjectService.GeteProjectById(rp.EProjectId); if (rp != null)
if (eProject != null)
{ {
this.txtJobNo.Text = eProject.ProjectControl_JobNo;
this.txtJobTitle.Text = eProject.ProjectControl_JobTitle; var eProject = BLL.EProjectService.GeteProjectById(rp.EProjectId);
this.txtMOCNo.Text = eProject.ProjectControl_MOCFormNo; if (eProject != null)
{
this.txtJobNo.Text = eProject.ProjectControl_JobNo;
this.txtJobTitle.Text = eProject.ProjectControl_JobTitle;
this.txtMOCNo.Text = eProject.ProjectControl_MOCFormNo;
foreach (CheckItem lst in this.checkJobType.Items)//项目类型 foreach (CheckItem lst in this.checkJobType.Items)//项目类型
{
if (!string.IsNullOrEmpty(eProject.ProjectControl_JobType))
{ {
if (eProject.ProjectControl_JobType.Equals(lst.Value)) if (!string.IsNullOrEmpty(eProject.ProjectControl_JobType))
lst.Selected = true; {
if (eProject.ProjectControl_JobType.Equals(lst.Value))
lst.Selected = true;
}
} }
} //foreach (CheckItem lsts in this.checkPriority.Items)//优先级
//foreach (CheckItem lsts in this.checkPriority.Items)//优先级 //{
//{ // if (!string.IsNullOrEmpty(eProject.PM_General_Priority))
// if (!string.IsNullOrEmpty(eProject.PM_General_Priority)) // {
// { // if (eProject.PM_General_Priority.Equals(lsts.Value))
// if (eProject.PM_General_Priority.Equals(lsts.Value)) // lsts.Selected = true;
// lsts.Selected = true; // }
// } //}
//} var wbs = BLL.DisciplinesWBSService.GetDisciplinesWBSListByType("4"); //"4"表示项目经理
var wbs = BLL.DisciplinesWBSService.GetDisciplinesWBSListByType("4"); //"4"表示项目经理 if (wbs != null)
if (wbs != null)
{
Model.ManHours_Plan p = BLL.PlanService.GetPlanByIds(resourcePlanId, wbs.FirstOrDefault().DisciplinesWBSId);
if (p != null)
{ {
this.DropDownList7.SelectedValue = p.EngineerId; Model.ManHours_Plan p = BLL.PlanService.GetPlanByIds(resourcePlanId, wbs.FirstOrDefault().DisciplinesWBSId);
this.NumberBox15.Text = p.ManHours.ToString(); if (p != null)
{
this.DropDownList7.SelectedValue = p.EngineerId;
this.NumberBox15.Text = p.ManHours.ToString();
}
else if (!string.IsNullOrEmpty(eProject.ProjectControl_ProjectManagerId))
{
this.DropDownList7.SelectedValue = eProject.ProjectControl_ProjectManagerId;
}
} }
else if (!string.IsNullOrEmpty(eProject.ProjectControl_ProjectManagerId)) if (!string.IsNullOrEmpty(rp.Phase))
{ {
this.DropDownList7.SelectedValue = eProject.ProjectControl_ProjectManagerId; checkPhase.SelectedValueArray = rp.Phase.Split(',');
} }
//绑定
BindGrid();
} }
if (!string.IsNullOrEmpty(rp.Phase))
{
checkPhase.SelectedValueArray = rp.Phase.Split(',');
}
//绑定
BindGrid();
} }
//foreach (CheckItem item in checkPhase.Items) //foreach (CheckItem item in checkPhase.Items)
//{ //{
// if (!string.IsNullOrEmpty(rp.Phase)) // if (!string.IsNullOrEmpty(rp.Phase))

2
EProject/FineUIPro.Web/SysManage/LogList.aspx
View File

@ -59,7 +59,7 @@
<f:RenderField Width="150px" ColumnID="HostName" DataField="HostName" SortField="HostName" <f:RenderField Width="150px" ColumnID="HostName" DataField="HostName" SortField="HostName"
HeaderTextAlign="Center" TextAlign="Left" FieldType="String" HeaderText="Host name"> HeaderTextAlign="Center" TextAlign="Left" FieldType="String" HeaderText="Host name">
</f:RenderField> </f:RenderField>
<f:RenderField Width="250px" ColumnID="OperationLog" DataField="OperationLog" SortField="OperationLog" ShowToolTip="true" <f:RenderField Width="250px" ColumnID="OperationLog" DataField="OperationLog" SortField="OperationLog"
HeaderTextAlign="Center" TextAlign="Left" FieldType="String" HeaderText="Operation log" ExpandUnusedSpace="true"> HeaderTextAlign="Center" TextAlign="Left" FieldType="String" HeaderText="Operation log" ExpandUnusedSpace="true">
</f:RenderField> </f:RenderField>
</Columns> </Columns>

4
EProject/FineUIPro.Web/Web.config
View File

@ -9,7 +9,7 @@
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false" /> <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false" />
</configSections> </configSections>
<connectionStrings> <connectionStrings>
<add name="EProjectDBConnectionString" connectionString="Data Source=.;Initial Catalog=EProjectDB;uid=sa;pwd=Sh@nghai9;" /> <add name="EProjectDBConnectionString" connectionString="Data Source=.\SQL2016;Initial Catalog=EProjectDB;uid=sa;pwd=1111;" />
<!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=EProjectDB;Integrated Security=True" <!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=EProjectDB;Integrated Security=True"
providerName="System.Data.SqlClient" />--> providerName="System.Data.SqlClient" />-->
</connectionStrings> </connectionStrings>
@ -53,7 +53,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="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" /> <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> </httpHandlers>
<compilation debug="true" targetFramework="4.8"> <compilation debug="false" targetFramework="4.8">
<assemblies> <assemblies>
<!--<add assembly="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" /> <!--<add assembly="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
<add assembly="System.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />--> <add assembly="System.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />-->

BIN
EProject/Model/bin/Debug/Newtonsoft.Json.pdb Normal file
View File

Binary file not shown.

BIN
EProject/Model/bin/Release/Newtonsoft.Json.pdb Normal file
View File

Binary file not shown.

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

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