lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20241028

This commit is contained in:
毕文静 2024-10-28 14:20:56 +08:00
parent abb15b53fc
commit 379b8ede4d
5 changed files with 52 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx
View File

@ -18,7 +18,7 @@
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar1" runat="server"> <f:Toolbar ID="Toolbar1" runat="server">
<Items> <Items>
<f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程名称" LabelWidth="120px" LabelAlign="Right" EnableEdit="true"></f:DropDownList> <f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程名称" LabelWidth="120px" LabelAlign="Right" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpUnitWork_SelectedIndexChanged"></f:DropDownList>
<f:DropDownList ID="drpBranchEngineering" runat="server" Label="分部工程名称" LabelWidth="120px" LabelAlign="Right" EnableEdit="true"></f:DropDownList> <f:DropDownList ID="drpBranchEngineering" runat="server" Label="分部工程名称" LabelWidth="120px" LabelAlign="Right" EnableEdit="true"></f:DropDownList>
<f:Button ID="btnSearch" runat="server" Text="查询" Icon="SystemSearch" OnClick="btnSearch_Click"></f:Button> <f:Button ID="btnSearch" runat="server" Text="查询" Icon="SystemSearch" OnClick="btnSearch_Click"></f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill> <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>

42
SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx.cs
View File

@ -25,11 +25,11 @@ namespace FineUIPro.Web.CQMS.WBS.Control
{ {
BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWork, this.CurrUser.LoginProjectId, true); BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWork, this.CurrUser.LoginProjectId, true);
var subProjectLists = from x in Funs.DB.Division_SubProjects where x.ProjectId==this.CurrUser.LoginProjectId && x.ParentId==null select x; //var subProjectLists = from x in Funs.DB.Division_SubProjects where x.ProjectId==this.CurrUser.LoginProjectId && x.ParentId==null select x;
this.drpBranchEngineering.DataTextField = "BranchEngineeringName"; //this.drpBranchEngineering.DataTextField = "BranchEngineeringName";
this.drpBranchEngineering.DataValueField = "DivisionId"; //this.drpBranchEngineering.DataValueField = "DivisionId";
this.drpBranchEngineering.DataSource = subProjectLists; //this.drpBranchEngineering.DataSource = subProjectLists;
this.drpBranchEngineering.DataBind(); //this.drpBranchEngineering.DataBind();
Funs.FineUIPleaseSelect(this.drpBranchEngineering); Funs.FineUIPleaseSelect(this.drpBranchEngineering);
BindGrid(); BindGrid();
@ -49,7 +49,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
strSql += " AND (UnitWorkId =@unitWorkId or SuperUnitWork=@unitWorkId) "; strSql += " AND (UnitWorkId =@unitWorkId or SuperUnitWork=@unitWorkId) ";
listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWork.SelectedValue)); listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWork.SelectedValue));
} }
if (this.drpBranchEngineering.SelectedValue!=BLL.Const._Null) if (this.drpBranchEngineering.SelectedValue != BLL.Const._Null)
{ {
strSql += " AND (DivisionId = @divisionId or ParentId=@divisionId) "; strSql += " AND (DivisionId = @divisionId or ParentId=@divisionId) ";
listStr.Add(new SqlParameter("@divisionId", this.drpBranchEngineering.SelectedValue)); listStr.Add(new SqlParameter("@divisionId", this.drpBranchEngineering.SelectedValue));
@ -100,7 +100,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
} }
if (this.drpBranchEngineering.SelectedValue != BLL.Const._Null) if (this.drpBranchEngineering.SelectedValue != BLL.Const._Null)
{ {
lists = lists.Where(x => x.DivisionId == this.drpBranchEngineering.SelectedValue || x.ParentId==this.drpBranchEngineering.SelectedValue); lists = lists.Where(x => x.DivisionId == this.drpBranchEngineering.SelectedValue || x.ParentId == this.drpBranchEngineering.SelectedValue);
} }
lists = lists.OrderBy(x => x.SupUnitWorkCode).ThenBy(x => x.ChildUnitWorkCode).ThenBy(x => x.Sort).ThenBy(x => x.DivisionLevel); lists = lists.OrderBy(x => x.SupUnitWorkCode).ThenBy(x => x.ChildUnitWorkCode).ThenBy(x => x.Sort).ThenBy(x => x.DivisionLevel);
@ -208,5 +208,33 @@ namespace FineUIPro.Web.CQMS.WBS.Control
} }
} }
#endregion #endregion
/// <summary>
/// 单位工程下拉选择
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void drpUnitWork_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpBranchEngineering.Items.Clear();
if (this.drpUnitWork.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpUnitWork.SelectedValue))
{
var q = (from x in Funs.DB.View_WBS_DivisionDivide
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.UnitWorkId == this.drpUnitWork.SelectedValue
&& x.ParentId==null
select new
{
x.DivisionId,
x.BranchEngineeringName
}).Distinct().ToList();
this.drpBranchEngineering.DataTextField = "BranchEngineeringName";
this.drpBranchEngineering.DataValueField = "DivisionId";
this.drpBranchEngineering.DataSource = q;
this.drpBranchEngineering.DataBind();
Funs.FineUIPleaseSelect(this.drpBranchEngineering);
this.drpBranchEngineering.SelectedIndex = 0;
}
}
} }
} }

24
SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNewEdit.aspx.cs
View File

@ -235,11 +235,11 @@ namespace FineUIPro.Web.CQMS.WBS.Control
} }
else else
{ {
var sub = BLL.SubProjectsService.GetSubProjectsById(this.ParentId); //var sub = BLL.SubProjectsService.GetSubProjectsById(this.ParentId);
if (sub.DivisionLevel == 1) //if (sub.DivisionLevel == 1)
{ //{
newSubProjects.DivisionLevel = 2; newSubProjects.DivisionLevel = 2;
} //}
newSubProjects.ProEngineeringName = this.txtProEngineeringName.Text.Trim(); newSubProjects.ProEngineeringName = this.txtProEngineeringName.Text.Trim();
newSubProjects.DivisionId = SQLHelper.GetNewID(typeof(Model.Division_SubProjects)); newSubProjects.DivisionId = SQLHelper.GetNewID(typeof(Model.Division_SubProjects));
this.DivisionId = newSubProjects.DivisionId; this.DivisionId = newSubProjects.DivisionId;
@ -264,15 +264,15 @@ namespace FineUIPro.Web.CQMS.WBS.Control
} }
else else
{ {
var sub = BLL.SubProjectsService.GetSubProjectsById(this.ParentId); //var sub = BLL.SubProjectsService.GetSubProjectsById(this.ParentId);
if (sub.DivisionLevel == 1) //if (sub.DivisionLevel == 1)
{ //{
newSubProjects.DivisionLevel = 2; // newSubProjects.DivisionLevel = 2;
} //}
else if (sub.DivisionLevel==2) //else if (sub.DivisionLevel==2)
{ //{
newSubProjects.DivisionLevel = 3; newSubProjects.DivisionLevel = 3;
} //}
newSubProjects.DivisionId = SQLHelper.GetNewID(typeof(Model.Division_SubProjects)); newSubProjects.DivisionId = SQLHelper.GetNewID(typeof(Model.Division_SubProjects));
this.DivisionId = newSubProjects.DivisionId; this.DivisionId = newSubProjects.DivisionId;
BLL.SubProjectsService.AddSubProjects(newSubProjects); BLL.SubProjectsService.AddSubProjects(newSubProjects);

3
SGGL/FineUIPro.Web/common/Menu_CQMS.xml
View File

@ -8,9 +8,10 @@
<TreeNode id="6769098A-53D7-4585-87CC-2DADBCBC2C74" Text="类似项目施工经验总结清单" NavigateUrl="CQMS/QualityPlanning/ConExperienceSummary.aspx"></TreeNode> <TreeNode id="6769098A-53D7-4585-87CC-2DADBCBC2C74" Text="类似项目施工经验总结清单" NavigateUrl="CQMS/QualityPlanning/ConExperienceSummary.aspx"></TreeNode>
</TreeNode> </TreeNode>
<TreeNode id="3B322232-38A1-4291-9832-CD4A01C2A975" Text="检验试验计划/单位分部分项工程划分" NavigateUrl=""><TreeNode id="1025D812-2325-4FE9-A1E9-D53F2CAACDC6" Text="现场控制点裁剪(新)" NavigateUrl="CQMS/WBS/Control/PointCropping.aspx"></TreeNode> <TreeNode id="3B322232-38A1-4291-9832-CD4A01C2A975" Text="检验试验计划/单位分部分项工程划分" NavigateUrl=""><TreeNode id="1025D812-2325-4FE9-A1E9-D53F2CAACDC6" Text="现场控制点裁剪(新)" NavigateUrl="CQMS/WBS/Control/PointCropping.aspx"></TreeNode>
<TreeNode id="17E206A1-E06B-40C0-8DCB-E3AAA2E3B339" Text="分部分项工程(新)" NavigateUrl="CQMS/WBS/Control/DivisionSubProjects.aspx"></TreeNode> <TreeNode id="0E1CCE60-6F9D-419D-B763-E9E0AF5621E6" Text="单位分部分项工程划分、裁剪" NavigateUrl=""><TreeNode id="17E206A1-E06B-40C0-8DCB-E3AAA2E3B339" Text="分部分项工程数据库" NavigateUrl="CQMS/WBS/Control/DivisionSubProjectsNew.aspx"></TreeNode>
<TreeNode id="FB94A120-921B-4AAB-B54F-EC11B6F561FD" Text="单位分部分项工程划分、裁剪" NavigateUrl="CQMS/WBS/Control/DivisionDivideAndCrop.aspx"></TreeNode> <TreeNode id="FB94A120-921B-4AAB-B54F-EC11B6F561FD" Text="单位分部分项工程划分、裁剪" NavigateUrl="CQMS/WBS/Control/DivisionDivideAndCrop.aspx"></TreeNode>
<TreeNode id="BA250432-492B-49A3-8BB6-D04BF74D2EDD" Text="单位分部分项工程划分表" NavigateUrl="CQMS/WBS/Control/DivisionDivideList.aspx"></TreeNode> <TreeNode id="BA250432-492B-49A3-8BB6-D04BF74D2EDD" Text="单位分部分项工程划分表" NavigateUrl="CQMS/WBS/Control/DivisionDivideList.aspx"></TreeNode>
</TreeNode>
<TreeNode id="5AA08233-9E04-4808-AC43-DD411C5F9D31" Text="现场控制点裁剪" NavigateUrl="CQMS/WBS/ProjectControlPoint.aspx"></TreeNode> <TreeNode id="5AA08233-9E04-4808-AC43-DD411C5F9D31" Text="现场控制点裁剪" NavigateUrl="CQMS/WBS/ProjectControlPoint.aspx"></TreeNode>
<TreeNode id="88F115C3-D193-4455-8E8D-76F2EAF56291" Text="现场控制点资料柜" NavigateUrl="CQMS/WBS/ProjectControlPointFile.aspx"></TreeNode> <TreeNode id="88F115C3-D193-4455-8E8D-76F2EAF56291" Text="现场控制点资料柜" NavigateUrl="CQMS/WBS/ProjectControlPointFile.aspx"></TreeNode>
</TreeNode> </TreeNode>

69
SGGL/Model/Model.cs
View File

@ -19101,8 +19101,6 @@ namespace Model
private EntitySet<JDGL_QuantityList> _JDGL_QuantityList; private EntitySet<JDGL_QuantityList> _JDGL_QuantityList;
private EntitySet<ProcessControl_InspectionManagement> _ProcessControl_InspectionManagement;
private EntitySet<WBS_Division> _WBS_Division; private EntitySet<WBS_Division> _WBS_Division;
#region 可扩展性方法定义 #region 可扩展性方法定义
@ -19137,7 +19135,6 @@ namespace Model
this._DataBase_StartWorkReport = new EntitySet<DataBase_StartWorkReport>(new Action<DataBase_StartWorkReport>(this.attach_DataBase_StartWorkReport), new Action<DataBase_StartWorkReport>(this.detach_DataBase_StartWorkReport)); this._DataBase_StartWorkReport = new EntitySet<DataBase_StartWorkReport>(new Action<DataBase_StartWorkReport>(this.attach_DataBase_StartWorkReport), new Action<DataBase_StartWorkReport>(this.detach_DataBase_StartWorkReport));
this._Doc_DocManage = new EntitySet<Doc_DocManage>(new Action<Doc_DocManage>(this.attach_Doc_DocManage), new Action<Doc_DocManage>(this.detach_Doc_DocManage)); this._Doc_DocManage = new EntitySet<Doc_DocManage>(new Action<Doc_DocManage>(this.attach_Doc_DocManage), new Action<Doc_DocManage>(this.detach_Doc_DocManage));
this._JDGL_QuantityList = new EntitySet<JDGL_QuantityList>(new Action<JDGL_QuantityList>(this.attach_JDGL_QuantityList), new Action<JDGL_QuantityList>(this.detach_JDGL_QuantityList)); this._JDGL_QuantityList = new EntitySet<JDGL_QuantityList>(new Action<JDGL_QuantityList>(this.attach_JDGL_QuantityList), new Action<JDGL_QuantityList>(this.detach_JDGL_QuantityList));
this._ProcessControl_InspectionManagement = new EntitySet<ProcessControl_InspectionManagement>(new Action<ProcessControl_InspectionManagement>(this.attach_ProcessControl_InspectionManagement), new Action<ProcessControl_InspectionManagement>(this.detach_ProcessControl_InspectionManagement));
this._WBS_Division = new EntitySet<WBS_Division>(new Action<WBS_Division>(this.attach_WBS_Division), new Action<WBS_Division>(this.detach_WBS_Division)); this._WBS_Division = new EntitySet<WBS_Division>(new Action<WBS_Division>(this.attach_WBS_Division), new Action<WBS_Division>(this.detach_WBS_Division));
OnCreated(); OnCreated();
} }
@ -19430,19 +19427,6 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ProcessControl_InspectionManagement_Base_CNProfessional", Storage="_ProcessControl_InspectionManagement", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", DeleteRule="NO ACTION")]
public EntitySet<ProcessControl_InspectionManagement> ProcessControl_InspectionManagement
{
get
{
return this._ProcessControl_InspectionManagement;
}
set
{
this._ProcessControl_InspectionManagement.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_Division_Base_CNProfessional", Storage="_WBS_Division", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", DeleteRule="NO ACTION")] [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_Division_Base_CNProfessional", Storage="_WBS_Division", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", DeleteRule="NO ACTION")]
public EntitySet<WBS_Division> WBS_Division public EntitySet<WBS_Division> WBS_Division
{ {
@ -19668,18 +19652,6 @@ namespace Model
entity.Base_CNProfessional = null; entity.Base_CNProfessional = null;
} }
private void attach_ProcessControl_InspectionManagement(ProcessControl_InspectionManagement entity)
{
this.SendPropertyChanging();
entity.Base_CNProfessional = this;
}
private void detach_ProcessControl_InspectionManagement(ProcessControl_InspectionManagement entity)
{
this.SendPropertyChanging();
entity.Base_CNProfessional = null;
}
private void attach_WBS_Division(WBS_Division entity) private void attach_WBS_Division(WBS_Division entity)
{ {
this.SendPropertyChanging(); this.SendPropertyChanging();
@ -286737,8 +286709,6 @@ namespace Model
private string _ChildBranch; private string _ChildBranch;
private EntityRef<Base_CNProfessional> _Base_CNProfessional;
private EntityRef<Base_Project> _Base_Project; private EntityRef<Base_Project> _Base_Project;
private EntityRef<Base_Unit> _Base_Unit; private EntityRef<Base_Unit> _Base_Unit;
@ -286805,7 +286775,6 @@ namespace Model
public ProcessControl_InspectionManagement() public ProcessControl_InspectionManagement()
{ {
this._Base_CNProfessional = default(EntityRef<Base_CNProfessional>);
this._Base_Project = default(EntityRef<Base_Project>); this._Base_Project = default(EntityRef<Base_Project>);
this._Base_Unit = default(EntityRef<Base_Unit>); this._Base_Unit = default(EntityRef<Base_Unit>);
this._Sys_User = default(EntityRef<Sys_User>); this._Sys_User = default(EntityRef<Sys_User>);
@ -286893,10 +286862,6 @@ namespace Model
{ {
if ((this._CNProfessionalId != value)) if ((this._CNProfessionalId != value))
{ {
if (this._Base_CNProfessional.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnCNProfessionalIdChanging(value); this.OnCNProfessionalIdChanging(value);
this.SendPropertyChanging(); this.SendPropertyChanging();
this._CNProfessionalId = value; this._CNProfessionalId = value;
@ -287314,40 +287279,6 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ProcessControl_InspectionManagement_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)]
public Base_CNProfessional Base_CNProfessional
{
get
{
return this._Base_CNProfessional.Entity;
}
set
{
Base_CNProfessional previousValue = this._Base_CNProfessional.Entity;
if (((previousValue != value)
|| (this._Base_CNProfessional.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Base_CNProfessional.Entity = null;
previousValue.ProcessControl_InspectionManagement.Remove(this);
}
this._Base_CNProfessional.Entity = value;
if ((value != null))
{
value.ProcessControl_InspectionManagement.Add(this);
this._CNProfessionalId = value.CNProfessionalId;
}
else
{
this._CNProfessionalId = default(string);
}
this.SendPropertyChanged("Base_CNProfessional");
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ProcessControl_InspectionManagement_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ProcessControl_InspectionManagement_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project public Base_Project Base_Project
{ {