zhanghj
/
ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

无法删除错误录入的装置/单元 做一个 删除装置提示有对应工区、单位工程如果挂着就提示一下 

本部用户信息维护 部门不必填
This commit is contained in:
李超 2023-02-20 16:26:00 +08:00
parent cab3443c9f
commit e688f6ec45
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SGGL/FineUIPro.Web/ProjectData/Installation.aspx.cs
View File

@ -8,6 +8,7 @@ using System.Web.UI;
using System.Web.UI.WebControls; using System.Web.UI.WebControls;
using BLL; using BLL;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Model;
namespace FineUIPro.Web.ProjectData namespace FineUIPro.Web.ProjectData
{ {
@ -382,6 +383,13 @@ namespace FineUIPro.Web.ProjectData
BLL.WbsDetailService.DeleteWbsDetailByToWbs(wbsSet.WbsSetId); //删除进度记录 BLL.WbsDetailService.DeleteWbsDetailByToWbs(wbsSet.WbsSetId); //删除进度记录
BLL.WbsSetService.DeleteWbsSet(wbsSet.WbsSetId); BLL.WbsSetService.DeleteWbsSet(wbsSet.WbsSetId);
} }
var unitWorks = (from x in Funs.DB.WBS_UnitWork where x.InstallationId == installationId select x).ToList();
foreach (var unitWork in unitWorks)
{
BLL.BreakdownProjectService.DeleteAllBreakdownByUnitWorkId(unitWork.UnitWorkId);
BLL.DivisionProjectService.DeleteDivisionProjectByUnitWorkId(unitWork.UnitWorkId);
BLL.UnitWorkService.DeleteUnitWorkById(unitWork.UnitWorkId);
}
//删除单位工程及子单位工程 //删除单位工程及子单位工程
var unitProjects = from x in Funs.DB.Wbs_UnitProject join y in Funs.DB.WBS_CnProfession on x.CnProfessionId equals y.CnProfessionId where y.InstallationId == installationId && x.CnProfessionId != null select x; var unitProjects = from x in Funs.DB.Wbs_UnitProject join y in Funs.DB.WBS_CnProfession on x.CnProfessionId equals y.CnProfessionId where y.InstallationId == installationId && x.CnProfessionId != null select x;

2
SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx
View File

@ -38,7 +38,7 @@
</f:FormRow> </f:FormRow>
<f:FormRow runat="server" ID="trServer"> <f:FormRow runat="server" ID="trServer">
<Items> <Items>
<f:DropDownList ID="drpDepart" runat="server" Label="部门" ShowRedStar="true" Required="true" <f:DropDownList ID="drpDepart" runat="server" Label="部门"
EnableEdit="true" ForceSelection="false" LabelWidth="90px"> EnableEdit="true" ForceSelection="false" LabelWidth="90px">
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="drpIsOffice" runat="server" Label="本部人员" <f:DropDownList ID="drpIsOffice" runat="server" Label="本部人员"

10
SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs
View File

@ -163,11 +163,11 @@ namespace FineUIPro.Web.SysManage
Alert.ShowInParent("请选择单位！", MessageBoxIcon.Warning); Alert.ShowInParent("请选择单位！", MessageBoxIcon.Warning);
return; return;
} }
if (this.drpDepart.SelectedValue == Const._Null && !this.trServer.Hidden) //if (this.drpDepart.SelectedValue == Const._Null && !this.trServer.Hidden)
{ //{
Alert.ShowInParent("请选择部门！", MessageBoxIcon.Warning); // Alert.ShowInParent("请选择部门！", MessageBoxIcon.Warning);
return; // return;
} //}
var q = Funs.DB.Sys_User.FirstOrDefault(x => x.Account == this.txtAccount.Text.Trim() && (x.UserId != this.UserId || (this.UserId == null && x.UserId != null))); var q = Funs.DB.Sys_User.FirstOrDefault(x => x.Account == this.txtAccount.Text.Trim() && (x.UserId != this.UserId || (this.UserId == null && x.UserId != null)));
if (q != null) if (q != null)
{ {