diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx index 380318f7..d46d9476 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx @@ -114,6 +114,10 @@ + diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs index 1555c4c8..2fecaf88 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs @@ -190,6 +190,15 @@ namespace FineUIPro.Web.CQMS.WBS } #endregion + /// + /// 关闭窗口 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + } + /// /// 发起设计交底(树节点) /// @@ -213,21 +222,12 @@ namespace FineUIPro.Web.CQMS.WBS join y in Funs.DB.WBS_WorkPackage on x.UnitWorkId equals y.UnitWorkId where y.WorkPackageId == this.trWBS.SelectedNodeID select x).FirstOrDefault(); - Model.Technical_TechnicalDisclose technicalDisclose = new Model.Technical_TechnicalDisclose(); - technicalDisclose.TechnicalDiscloseId = SQLHelper.GetNewID(); - technicalDisclose.ProjectId = this.CurrUser.LoginProjectId; + string unitWorkId = string.Empty; if (unitWork != null) { - technicalDisclose.UnitId = unitWork.UnitId; - technicalDisclose.UnitWorkId = unitWork.UnitWorkId; + unitWorkId = unitWork.UnitWorkId; } - technicalDisclose.DataId = this.trWBS.SelectedNodeID; - technicalDisclose.DiscloseName = this.trWBS.SelectedNode.Text; - technicalDisclose.State = "0"; //未交底 - technicalDisclose.CompileMan = this.CurrUser.PersonId; - technicalDisclose.CompileDate = DateTime.Now; - BLL.CQMS_TechnicalDiscloseService.AddTechnicalDisclose(technicalDisclose); - ShowNotify("发起成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SelectUnit.aspx?UnitWorkId={0}&DataId={1}", unitWorkId, this.trWBS.SelectedNodeID, "导入 - "))); } else { @@ -279,22 +279,12 @@ namespace FineUIPro.Web.CQMS.WBS join y in Funs.DB.WBS_WorkPackage on x.UnitWorkId equals y.UnitWorkId where y.WorkPackageId == this.trWBS.SelectedNodeID select x).FirstOrDefault(); - var controlItemAndCycle = BLL.ControlItemAndCycleService.GetControlItemAndCycleById(id); - Model.Technical_TechnicalDisclose technicalDisclose = new Model.Technical_TechnicalDisclose(); - technicalDisclose.TechnicalDiscloseId = SQLHelper.GetNewID(); - technicalDisclose.ProjectId = this.CurrUser.LoginProjectId; + string unitWorkId = string.Empty; if (unitWork != null) { - technicalDisclose.UnitId = unitWork.UnitId; - technicalDisclose.UnitWorkId = unitWork.UnitWorkId; + unitWorkId = unitWork.UnitWorkId; } - technicalDisclose.DataId = id; - technicalDisclose.DiscloseName = controlItemAndCycle.ControlItemContent; - technicalDisclose.State = "0"; //未交底 - technicalDisclose.CompileMan = this.CurrUser.PersonId; - technicalDisclose.CompileDate = DateTime.Now; - BLL.CQMS_TechnicalDiscloseService.AddTechnicalDisclose(technicalDisclose); - ShowNotify("发起成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SelectUnit.aspx?UnitWorkId={0}&DataId={1}", unitWorkId, id, "导入 - "))); } else { diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.designer.cs index 4c7b00ed..feee5dac 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.designer.cs @@ -165,6 +165,15 @@ namespace FineUIPro.Web.CQMS.WBS { /// protected global::FineUIPro.DropDownList ddlPageSize; + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + /// /// Menu1 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/SelectUnit.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/SelectUnit.aspx new file mode 100644 index 00000000..cc2e562a --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/WBS/SelectUnit.aspx @@ -0,0 +1,38 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SelectUnit.aspx.cs" Inherits="FineUIPro.Web.CQMS.WBS.SelectUnit" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/SelectUnit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/SelectUnit.aspx.cs new file mode 100644 index 00000000..94b05c28 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/WBS/SelectUnit.aspx.cs @@ -0,0 +1,67 @@ +using BLL; +using System; +using System.Linq; +using System.Web.UI.WebControls; +using Model; + +namespace FineUIPro.Web.CQMS.WBS +{ + public partial class SelectUnit : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + string UnitWorkId = Request.Params["UnitWorkId"]; + Model.WBS_UnitWork unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(UnitWorkId); + if (unitWork != null) + { + BLL.UnitService.InitUnitDropDownListByUnitIds(this.drpUnit, unitWork.UnitId, true);//单位 + } + } + } + + protected void btnSave_Click(object sender, EventArgs e) + { + SaveData(true); + } + + private void SaveData(bool b) + { + if (this.drpUnit.SelectedValue == BLL.Const._Null) + { + ShowNotify("请选择单位名称！", MessageBoxIcon.Warning); + return; + } + Model.Technical_TechnicalDisclose technicalDisclose = new Model.Technical_TechnicalDisclose(); + technicalDisclose.TechnicalDiscloseId = SQLHelper.GetNewID(); + technicalDisclose.ProjectId = this.CurrUser.LoginProjectId; + technicalDisclose.UnitId = this.drpUnit.SelectedValue; + technicalDisclose.UnitWorkId = Request.Params["UnitWorkId"]; + string dataId = Request.Params["DataId"]; + technicalDisclose.DataId = dataId; + string discloseName = string.Empty; + Model.WBS_WorkPackage workPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(dataId); + if (workPackage != null) + { + discloseName = workPackage.PackageContent; + } + else + { + var controlItemAndCycle = BLL.ControlItemAndCycleService.GetControlItemAndCycleById(dataId); + if (controlItemAndCycle != null) + { + discloseName= controlItemAndCycle.ControlItemContent; + } + } + technicalDisclose.DiscloseName = discloseName; + technicalDisclose.State = "0"; //未交底 + technicalDisclose.CompileMan = this.CurrUser.PersonId; + technicalDisclose.CompileDate = DateTime.Now; + BLL.CQMS_TechnicalDiscloseService.AddTechnicalDisclose(technicalDisclose); + ShowNotify("发起成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHideReference()); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/SelectUnit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/SelectUnit.aspx.designer.cs new file mode 100644 index 00000000..306a7581 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/WBS/SelectUnit.aspx.designer.cs @@ -0,0 +1,87 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.CQMS.WBS { + + + public partial class SelectUnit { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// drpUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnit; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// hdCheckerId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdCheckerId; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + } +} diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index b8b3c369..bf1404e0 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -485,6 +485,7 @@ + @@ -7346,6 +7347,13 @@ ProjectControlItemInitSet.aspx + + SelectUnit.aspx + ASPXCodeBehind + + + SelectUnit.aspx + WorkPackageInitEdit.aspx ASPXCodeBehind diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 9af3ae6e..6fc48bee 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -33137,8 +33137,6 @@ namespace Model private EntitySet _HJGL_PC_PurgingCleaning; - private EntitySet _HJGL_Pipeline; - private EntitySet _HJGL_RepairRecord; private EntitySet _HJGL_HotProess_Trust; @@ -33297,8 +33295,6 @@ namespace Model private EntitySet _WBS_UnitWork_Base_Unit_SupervisorUnit; - private EntitySet _WBS_UnitWork_Base_Unit_Unit; - private EntitySet _ZHGL_ConstructionMonthReportSubCost; #region 可扩展性方法定义 @@ -33398,7 +33394,6 @@ namespace Model this._HJGL_LV_LeakVacuum = new EntitySet(new Action(this.attach_HJGL_LV_LeakVacuum), new Action(this.detach_HJGL_LV_LeakVacuum)); this._HJGL_MaterialManage = new EntitySet(new Action(this.attach_HJGL_MaterialManage), new Action(this.detach_HJGL_MaterialManage)); this._HJGL_PC_PurgingCleaning = new EntitySet(new Action(this.attach_HJGL_PC_PurgingCleaning), new Action(this.detach_HJGL_PC_PurgingCleaning)); - this._HJGL_Pipeline = new EntitySet(new Action(this.attach_HJGL_Pipeline), new Action(this.detach_HJGL_Pipeline)); this._HJGL_RepairRecord = new EntitySet(new Action(this.attach_HJGL_RepairRecord), new Action(this.detach_HJGL_RepairRecord)); this._HJGL_HotProess_Trust = new EntitySet(new Action(this.attach_HJGL_HotProess_Trust), new Action(this.detach_HJGL_HotProess_Trust)); this._HSSE_Hazard_HazardRegister = new EntitySet(new Action(this.attach_HSSE_Hazard_HazardRegister), new Action(this.detach_HSSE_Hazard_HazardRegister)); @@ -33478,7 +33473,6 @@ namespace Model this._Unqualified_WorkContact = new EntitySet(new Action(this.attach_Unqualified_WorkContact), new Action(this.detach_Unqualified_WorkContact)); this._WBS_UnitWork = new EntitySet(new Action(this.attach_WBS_UnitWork), new Action(this.detach_WBS_UnitWork)); this._WBS_UnitWork_Base_Unit_SupervisorUnit = new EntitySet(new Action(this.attach_WBS_UnitWork_Base_Unit_SupervisorUnit), new Action(this.detach_WBS_UnitWork_Base_Unit_SupervisorUnit)); - this._WBS_UnitWork_Base_Unit_Unit = new EntitySet(new Action(this.attach_WBS_UnitWork_Base_Unit_Unit), new Action(this.detach_WBS_UnitWork_Base_Unit_Unit)); this._ZHGL_ConstructionMonthReportSubCost = new EntitySet(new Action(this.attach_ZHGL_ConstructionMonthReportSubCost), new Action(this.detach_ZHGL_ConstructionMonthReportSubCost)); OnCreated(); } @@ -34496,19 +34490,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Pipeline_Base_Unit", Storage="_HJGL_Pipeline", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")] - public EntitySet HJGL_Pipeline - { - get - { - return this._HJGL_Pipeline; - } - set - { - this._HJGL_Pipeline.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_RepairRecord_Base_Unit", Storage="_HJGL_RepairRecord", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")] public EntitySet HJGL_RepairRecord { @@ -35536,19 +35517,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_UnitWork_Base_Unit_Unit", Storage="_WBS_UnitWork_Base_Unit_Unit", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")] - public EntitySet WBS_UnitWork_Base_Unit_Unit - { - get - { - return this._WBS_UnitWork_Base_Unit_Unit; - } - set - { - this._WBS_UnitWork_Base_Unit_Unit.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ZHGL_ConstructionMonthReportSubCost_Base_Unit", Storage="_ZHGL_ConstructionMonthReportSubCost", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")] public EntitySet ZHGL_ConstructionMonthReportSubCost { @@ -36074,18 +36042,6 @@ namespace Model entity.Base_Unit = null; } - private void attach_HJGL_Pipeline(HJGL_Pipeline entity) - { - this.SendPropertyChanging(); - entity.Base_Unit = this; - } - - private void detach_HJGL_Pipeline(HJGL_Pipeline entity) - { - this.SendPropertyChanging(); - entity.Base_Unit = null; - } - private void attach_HJGL_RepairRecord(HJGL_RepairRecord entity) { this.SendPropertyChanging(); @@ -37034,18 +36990,6 @@ namespace Model entity.SupervisorUnit = null; } - private void attach_WBS_UnitWork_Base_Unit_Unit(WBS_UnitWork entity) - { - this.SendPropertyChanging(); - entity.Unit = this; - } - - private void detach_WBS_UnitWork_Base_Unit_Unit(WBS_UnitWork entity) - { - this.SendPropertyChanging(); - entity.Unit = null; - } - private void attach_ZHGL_ConstructionMonthReportSubCost(ZHGL_ConstructionMonthReportSubCost entity) { this.SendPropertyChanging(); @@ -93296,8 +93240,6 @@ namespace Model private EntityRef _Base_Project; - private EntityRef _Base_Unit; - private EntitySet _HJGL_Pipeline_Component; private EntityRef _WBS_UnitWork; @@ -93396,7 +93338,6 @@ namespace Model this._Base_PipingClass = default(EntityRef); this._Base_PressurePipingClass = default(EntityRef); this._Base_Project = default(EntityRef); - this._Base_Unit = default(EntityRef); this._HJGL_Pipeline_Component = new EntitySet(new Action(this.attach_HJGL_Pipeline_Component), new Action(this.detach_HJGL_Pipeline_Component)); this._WBS_UnitWork = default(EntityRef); this._HJGL_PipeLineMat = new EntitySet(new Action(this.attach_HJGL_PipeLineMat), new Action(this.detach_HJGL_PipeLineMat)); @@ -93495,7 +93436,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(300)")] public string UnitId { get @@ -93506,10 +93447,6 @@ namespace Model { if ((this._UnitId != value)) { - if (this._Base_Unit.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnUnitIdChanging(value); this.SendPropertyChanging(); this._UnitId = value; @@ -94380,40 +94317,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Pipeline_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)] - public Base_Unit Base_Unit - { - get - { - return this._Base_Unit.Entity; - } - set - { - Base_Unit previousValue = this._Base_Unit.Entity; - if (((previousValue != value) - || (this._Base_Unit.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Base_Unit.Entity = null; - previousValue.HJGL_Pipeline.Remove(this); - } - this._Base_Unit.Entity = value; - if ((value != null)) - { - value.HJGL_Pipeline.Add(this); - this._UnitId = value.UnitId; - } - else - { - this._UnitId = default(string); - } - this.SendPropertyChanged("Base_Unit"); - } - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Pipeline_Component_HJGL_Pipeline", Storage="_HJGL_Pipeline_Component", ThisKey="PipelineId", OtherKey="PipelineId", DeleteRule="NO ACTION")] public EntitySet HJGL_Pipeline_Component { @@ -271716,7 +271619,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(300)")] public string UnitId { get @@ -273246,7 +273149,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(300)")] public string UnitId { get @@ -275011,7 +274914,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(300)")] public string UnitId { get @@ -297084,8 +296987,6 @@ namespace Model private EntityRef _SupervisorUnit; - private EntityRef _Unit; - private EntitySet _WBS_WorkPackage; #region 可扩展性方法定义 @@ -297162,7 +297063,6 @@ namespace Model this._Solution_LargerHazardListItem = new EntitySet(new Action(this.attach_Solution_LargerHazardListItem), new Action(this.detach_Solution_LargerHazardListItem)); this._Base_Unit = default(EntityRef); this._SupervisorUnit = default(EntityRef); - this._Unit = default(EntityRef); this._WBS_WorkPackage = new EntitySet(new Action(this.attach_WBS_WorkPackage), new Action(this.detach_WBS_WorkPackage)); OnCreated(); } @@ -297247,7 +297147,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(300)")] public string UnitId { get @@ -297258,10 +297158,6 @@ namespace Model { if ((this._UnitId != value)) { - if (this._Unit.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnUnitIdChanging(value); this.SendPropertyChanging(); this._UnitId = value; @@ -297947,40 +297843,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_UnitWork_Base_Unit_Unit", Storage="_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)] - public Base_Unit Unit - { - get - { - return this._Unit.Entity; - } - set - { - Base_Unit previousValue = this._Unit.Entity; - if (((previousValue != value) - || (this._Unit.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Unit.Entity = null; - previousValue.WBS_UnitWork_Base_Unit_Unit.Remove(this); - } - this._Unit.Entity = value; - if ((value != null)) - { - value.WBS_UnitWork_Base_Unit_Unit.Add(this); - this._UnitId = value.UnitId; - } - else - { - this._UnitId = default(string); - } - this.SendPropertyChanged("Unit"); - } - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_WorkPackage_WBS_UnitWork", Storage="_WBS_WorkPackage", ThisKey="UnitWorkId", OtherKey="UnitWorkId", DeleteRule="NO ACTION")] public EntitySet WBS_WorkPackage {