lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20231023危大工程清单分部分项修改为基础信息中分部分项设置

Browse Source
This commit is contained in:
杨红卫
2023-10-23 16:05:02 +08:00
parent 33d515c36a
commit f409a4cca2
9 changed files with 162 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_V2023-10-23.sql
+42
View File
@@ -0,0 +1,42 @@
ALTER VIEW [dbo].[View_Solution_LargerHazardListItem]
AS
/*危大工程清单明细列表视图*/
SELECT Project.ProjectCode
,ISNULL(Project.ShortName,Project.ProjectName) AS ProjectName
,Project.ProjectId
,list.HazardCode
,list.RecordTime
,list.RecardManId
,list.Remark
,list.States
,list.VersionNo
,Item.LargerHazardListItemId
,Item.SortIndex
,Item.LargerHazardListId
,Item.UnitWorkId
,(UnitWork.UnitWorkName+'('+(CASE WHEN UnitWork.ProjectType='1' THEN '建筑' ELSE '安装' END)+')') AS UnitWorkName
,Item.WorkPackageId
,Type.SpecialSchemeTypeName
,WorkPackageName AS PackageContent
,Item.WorkPackageSize
,Item.ExpectedStartTime
,Item.ExpectedEndTime
,Item.IsArgument
,(CASE WHEN Item.IsArgument=1 THEN '是' ELSE '否' END) AS IsArgumentName
,Item.WorkStates
,constw.ConstText AS WorkStatesName
,Item.UnitId
,Unit.UnitName
,((CASE WHEN Item.ExpectedStartTime IS NULL THEN '' ELSE CONVERT(varchar(100), Item.ExpectedStartTime,23) END)
+ '至'+ (CASE WHEN Item.ExpectedEndTime IS NULL THEN '' ELSE CONVERT(varchar(100), Item.ExpectedEndTime,23) END)) AS ExpectedTime
FROM dbo.Solution_LargerHazardListItem AS Item
LEFT JOIN Solution_LargerHazardList AS list ON Item.LargerHazardListId=list.LargerHazardListId
LEFT JOIN Base_Project AS Project ON Project.ProjectId=list.ProjectId
LEFT JOIN WBS_UnitWork AS UnitWork ON Item.UnitWorkId=UnitWork.UnitWorkId
LEFT JOIN Base_SpecialSchemeType AS Type ON Item.WorkPackageId=Type.SpecialSchemeTypeId
LEFT JOIN Base_Unit AS Unit ON Item.UnitId=Unit.UnitId
LEFT JOIN Sys_Const AS constw ON Item.WorkStates=constw.ConstValue AND constw.GroupId='WorkStates'
GO
SGGL/BLL/API/APIGetHttpService.cs
+2
View File
@@ -18,6 +18,8 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static string Http(string url, string method = "GET", string contenttype = "application/json;charset=utf-8", Hashtable header = null, string data = null) public static string Http(string url, string method = "GET", string contenttype = "application/json;charset=utf-8", Hashtable header = null, string data = null)
{ {
ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3 | SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12 ;
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
request.Method = string.IsNullOrEmpty(method) ? "GET" : method; request.Method = string.IsNullOrEmpty(method) ? "GET" : method;
request.ContentType = string.IsNullOrEmpty(contenttype) ? "application/json;charset=utf-8" : contenttype; request.ContentType = string.IsNullOrEmpty(contenttype) ? "application/json;charset=utf-8" : contenttype;
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx
+1 -1
View File
@@ -85,7 +85,7 @@
</f:Panel> </f:Panel>
<f:Window ID="Window1" Title="危大工程清单" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window1" Title="危大工程清单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window1_Close" Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1200px" Height="650px"> Width="1300px" Height="650px" Maximized="true">
</f:Window> </f:Window>
<f:Menu ID="Menu1" runat="server"> <f:Menu ID="Menu1" runat="server">
<Items> <Items>
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEdit.aspx
+8 -8
View File
@@ -37,7 +37,7 @@
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" ClicksToEdit="1" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" ClicksToEdit="1"
DataIDField="LargerHazardListItemId" DataKeyNames="LargerHazardListItemId" DataIDField="LargerHazardListItemId" DataKeyNames="LargerHazardListItemId"
SortDirection="ASC" AllowSorting="true" SortField="SortIndex" ForceFit="true" SortDirection="ASC" AllowSorting="true" SortField="SortIndex" ForceFit="true"
Height="400px" EnableColumnLines="true" EnableRowDoubleClickEvent="true" EnableColumnLines="true" EnableRowDoubleClickEvent="true" Height="600px"
OnRowDoubleClick="Grid1_RowDoubleClick"> OnRowDoubleClick="Grid1_RowDoubleClick">
<Columns> <Columns>
<f:RenderField Width="50px" ColumnID="SortIndex" DataField="SortIndex" <f:RenderField Width="50px" ColumnID="SortIndex" DataField="SortIndex"
@@ -49,17 +49,17 @@
<f:RenderField Width="150px" ColumnID="UnitWorkName" DataField="UnitWorkName" <f:RenderField Width="150px" ColumnID="UnitWorkName" DataField="UnitWorkName"
FieldType="String" HeaderText="单位工程" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="单位工程" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="150px" ColumnID="PackageContent" DataField="PackageContent" <f:RenderField Width="150px" ColumnID="SpecialSchemeTypeName" DataField="SpecialSchemeTypeName"
FieldType="String" HeaderText="分部分项</br>工程名称" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="分部分项工程名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="150px" ColumnID="WorkPackageSize" DataField="WorkPackageSize" <f:RenderField Width="150px" ColumnID="WorkPackageSize" DataField="WorkPackageSize"
FieldType="String" HeaderText="分部分项</br>工程规模" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="分部分项工程规模" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="200px" ColumnID="ExpectedTime" DataField="ExpectedTime" <f:RenderField Width="200px" ColumnID="ExpectedTime" DataField="ExpectedTime"
FieldType="String" HeaderText="预计施工起止时间" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="预计施工起止时间" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="80px" ColumnID="IsArgumentName" DataField="IsArgumentName" <f:RenderField Width="120px" ColumnID="IsArgumentName" DataField="IsArgumentName"
FieldType="String" HeaderText="是否需要</br>专家论证" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="是否需要专家论证" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="80px" ColumnID="WorkStatesName" DataField="WorkStatesName" <f:RenderField Width="80px" ColumnID="WorkStatesName" DataField="WorkStatesName"
FieldType="String" HeaderText="作业状态" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="作业状态" TextAlign="Left" HeaderTextAlign="Center">
@@ -96,8 +96,8 @@
</Toolbars> </Toolbars>
</f:Form> </f:Form>
<f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1024px" OnClose="Window1_Close" Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1200px" OnClose="Window1_Close"
Height="600px"> Height="500px">
</f:Window> </f:Window>
<f:Menu ID="Menu1" runat="server"> <f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server"
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx
+6 -6
View File
@@ -21,19 +21,19 @@
</f:DropDownList> </f:DropDownList>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow ColumnWidths="90% 10%"> <%-- <f:FormRow ColumnWidths="90% 10%">
<Items> <Items>
<f:Label runat="server" ID="txtWorkPackageId" Label="分部分项工程名称" ShowRedStar="true"></f:Label> <f:Label runat="server" ID="txtWorkPackageId" Label="分部分项工程名称" ShowRedStar="true"></f:Label>
<f:TextBox runat="server" ID="hdWorkPackageId" Hidden="true"></f:TextBox> <f:TextBox runat="server" ID="hdWorkPackageId" Hidden="true"></f:TextBox>
<f:Button ID="btSearch" ToolTip="选择" Icon="SystemSearch" runat="server" OnClick="btSearch_Click"> <f:Button ID="btSearch" ToolTip="选择" Icon="SystemSearch" runat="server" OnClick="btSearch_Click">
</f:Button> </f:Button>
</Items> </Items>
</f:FormRow> </f:FormRow>--%>
<f:FormRow> <f:FormRow>
<Items> <Items>
<%-- <f:DropDownList ID="drpWorkPackageId" runat="server" Label="分部分项</br>工程名称" EnableEdit="true" <f:DropDownList ID="drpWorkPackageId" runat="server" Label="分部分项工程名称" EnableEdit="true"
Required="true" ShowRedStar="true"> Required="true" ShowRedStar="true">
</f:DropDownList>--%> </f:DropDownList>
<f:TextBox ID="txtWorkPackageSize" runat="server" Label="分部分项工程规模" MaxLength="500"> <f:TextBox ID="txtWorkPackageSize" runat="server" Label="分部分项工程规模" MaxLength="500">
</f:TextBox> </f:TextBox>
</Items> </Items>
@@ -80,10 +80,10 @@
</f:Toolbar> </f:Toolbar>
</Toolbars> </Toolbars>
</f:Form> </f:Form>
<f:Window ID="Window1" Title="WBS" Hidden="true" EnableIFrame="true" EnableMaximize="true" <%-- <f:Window ID="Window1" Title="WBS" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Self" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close" Target="Self" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="800px" Height="650px"> Width="800px" Height="650px">
</f:Window> </f:Window>--%>
</form> </form>
</body> </body>
</html> </html>
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.cs
+27 -27
View File
@@ -51,7 +51,7 @@ namespace FineUIPro.Web.HSSE.Solution
//单位工程 //单位工程
BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
//分部分项 //分部分项
// BLL.SpecialSchemeTypeService.InitSpecialSchemeTypeDropDownList(this.drpWorkPackageId, true); BLL.SpecialSchemeTypeService.InitSpecialSchemeTypeDropDownList(this.drpWorkPackageId, true);
//是否需要专家论证 //是否需要专家论证
BLL.ConstValue.InitConstValueRadioButtonList(this.rblIsArgument, ConstValue.Group_0001, "False"); BLL.ConstValue.InitConstValueRadioButtonList(this.rblIsArgument, ConstValue.Group_0001, "False");
//作业状态 //作业状态
@@ -70,14 +70,14 @@ namespace FineUIPro.Web.HSSE.Solution
{ {
this.drpUnitWorkId.SelectedValue = getItem.UnitWorkId; this.drpUnitWorkId.SelectedValue = getItem.UnitWorkId;
} }
//if (!string.IsNullOrEmpty(getItem.WorkPackageId)) if (!string.IsNullOrEmpty(getItem.WorkPackageId))
//{ {
// this.drpWorkPackageId.SelectedValue = getItem.WorkPackageId; this.drpWorkPackageId.SelectedValue = getItem.WorkPackageId;
//} }
this.txtWorkPackageSize.Text = getItem.WorkPackageSize; this.txtWorkPackageSize.Text = getItem.WorkPackageSize;
this.hdWorkPackageId.Text = getItem.WorkPackageId; //this.hdWorkPackageId.Text = getItem.WorkPackageId;
this.txtWorkPackageId.Text = getItem.PackageContent; //this.txtWorkPackageId.Text = getItem.PackageContent;
this.txtExpectedStartTime.Text = string.Format("{0:yyyy-MM-dd}", getItem.ExpectedStartTime); this.txtExpectedStartTime.Text = string.Format("{0:yyyy-MM-dd}", getItem.ExpectedStartTime);
this.txtExpectedEndTime.Text = string.Format("{0:yyyy-MM-dd}", getItem.ExpectedEndTime); this.txtExpectedEndTime.Text = string.Format("{0:yyyy-MM-dd}", getItem.ExpectedEndTime);
@@ -125,13 +125,13 @@ namespace FineUIPro.Web.HSSE.Solution
ExpectedEndTime = Funs.GetNewDateTime(this.txtExpectedEndTime.Text), ExpectedEndTime = Funs.GetNewDateTime(this.txtExpectedEndTime.Text),
IsArgument = Convert.ToBoolean(this.rblIsArgument.SelectedValue), IsArgument = Convert.ToBoolean(this.rblIsArgument.SelectedValue),
WorkStates = this.rbWorkStates.SelectedValue ?? "1", WorkStates = this.rbWorkStates.SelectedValue ?? "1",
WorkPackageId = this.hdWorkPackageId.Text, //WorkPackageId = this.hdWorkPackageId.Text,
WorkPackageName = this.txtWorkPackageId.Text, //WorkPackageName = this.txtWorkPackageId.Text,
}; };
//if (this.drpWorkPackageId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpWorkPackageId.SelectedValue)) if (this.drpWorkPackageId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpWorkPackageId.SelectedValue))
//{ {
// newItem.WorkPackageId = this.drpWorkPackageId.SelectedValue; newItem.WorkPackageId = this.drpWorkPackageId.SelectedValue;
//} }
if (this.drpUnitWorkId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue)) if (this.drpUnitWorkId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue))
{ {
newItem.UnitWorkId = this.drpUnitWorkId.SelectedValue; newItem.UnitWorkId = this.drpUnitWorkId.SelectedValue;
@@ -157,20 +157,20 @@ namespace FineUIPro.Web.HSSE.Solution
} }
#endregion #endregion
protected void btSearch_Click(object sender, EventArgs e) //protected void btSearch_Click(object sender, EventArgs e)
{ //{
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdWorkPackageId.ClientID) // PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdWorkPackageId.ClientID)
+ Window1.GetShowReference(String.Format("~/DigData/ShowProjectWBS.aspx?levle={0}", 3, "选择WBS - "))); // + Window1.GetShowReference(String.Format("~/DigData/ShowProjectWBS.aspx?levle={0}", 3, "选择WBS - ")));
} //}
protected void Window1_Close(object sender, WindowCloseEventArgs e) //protected void Window1_Close(object sender, WindowCloseEventArgs e)
{ //{
var getReturnValues = Funs.GetStrListByStr(this.hdWorkPackageId.Text,'&'); // var getReturnValues = Funs.GetStrListByStr(this.hdWorkPackageId.Text,'&');
if (getReturnValues.Count() > 1) // if (getReturnValues.Count() > 1)
{ // {
this.hdWorkPackageId.Text = getReturnValues[0].ToString(); // this.hdWorkPackageId.Text = getReturnValues[0].ToString();
this.txtWorkPackageId.Text = getReturnValues[1].ToString(); // this.txtWorkPackageId.Text = getReturnValues[1].ToString();
} // }
} //}
} }
} }
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.designer.cs
Generated
+2 -29
View File
@@ -60,31 +60,13 @@ namespace FineUIPro.Web.HSSE.Solution
protected global::FineUIPro.DropDownList drpUnitWorkId; protected global::FineUIPro.DropDownList drpUnitWorkId;
/// <summary> /// <summary>
/// txtWorkPackageId 控件。 /// drpWorkPackageId 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Label txtWorkPackageId; protected global::FineUIPro.DropDownList drpWorkPackageId;
/// <summary>
/// hdWorkPackageId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox hdWorkPackageId;
/// <summary>
/// btSearch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btSearch;
/// <summary> /// <summary>
/// txtWorkPackageSize 控件。 /// txtWorkPackageSize 控件。
@@ -184,14 +166,5 @@ namespace FineUIPro.Web.HSSE.Solution
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnClose; protected global::FineUIPro.Button btnClose;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
} }
} }
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListView.aspx
+8 -8
View File
@@ -35,28 +35,28 @@
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" ClicksToEdit="1" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" ClicksToEdit="1"
DataIDField="LargerHazardListItemId" DataKeyNames="LargerHazardListItemId" DataIDField="LargerHazardListItemId" DataKeyNames="LargerHazardListItemId"
SortDirection="ASC" AllowSorting="true" SortField="SortIndex" ForceFit="true" SortDirection="ASC" AllowSorting="true" SortField="SortIndex" ForceFit="true"
Height="400px" EnableColumnLines="true"> Height="600px" EnableColumnLines="true">
<Columns> <Columns>
<f:RenderField Width="50px" ColumnID="SortIndex" DataField="SortIndex" <f:RenderField Width="50px" ColumnID="SortIndex" DataField="SortIndex"
FieldType="String" HeaderText="序号" TextAlign="Center" HeaderTextAlign="Center"> FieldType="String" HeaderText="序号" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="110px" ColumnID="ProjectName" DataField="ProjectName" <f:RenderField Width="100px" ColumnID="ProjectName" DataField="ProjectName"
FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="145px" ColumnID="UnitWorkName" DataField="UnitWorkName" <f:RenderField Width="150px" ColumnID="UnitWorkName" DataField="UnitWorkName"
FieldType="String" HeaderText="单位工程" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="单位工程" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="145px" ColumnID="PackageContent" DataField="PackageContent" <f:RenderField Width="150px" ColumnID="SpecialSchemeTypeName" DataField="SpecialSchemeTypeName"
FieldType="String" HeaderText="分部分项</br>工程名称" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="分部分项工程名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="150px" ColumnID="WorkPackageSize" DataField="WorkPackageSize" <f:RenderField Width="150px" ColumnID="WorkPackageSize" DataField="WorkPackageSize"
FieldType="String" HeaderText="分部分项</br>工程规模" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="分部分项工程规模" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="200px" ColumnID="ExpectedTime" DataField="ExpectedTime" <f:RenderField Width="200px" ColumnID="ExpectedTime" DataField="ExpectedTime"
FieldType="String" HeaderText="预计施工起止时间" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="预计施工起止时间" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="80px" ColumnID="IsArgumentName" DataField="IsArgumentName" <f:RenderField Width="120px" ColumnID="IsArgumentName" DataField="IsArgumentName"
FieldType="String" HeaderText="是否需要</br>专家论证" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="是否需要专家论证" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="80px" ColumnID="WorkStatesName" DataField="WorkStatesName" <f:RenderField Width="80px" ColumnID="WorkStatesName" DataField="WorkStatesName"
FieldType="String" HeaderText="作业状态" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="作业状态" TextAlign="Left" HeaderTextAlign="Center">
SGGL/Model/Model.cs
+66 -48
View File
@@ -39516,10 +39516,10 @@ namespace Model
private string _SaveHandleMan; private string _SaveHandleMan;
private string _WorkPackageId;
private string _WorkPackageName; private string _WorkPackageName;
private string _WorkPackageId;
private EntityRef<Base_Project> _Base_Project; private EntityRef<Base_Project> _Base_Project;
private EntityRef<Person_Persons> _Person_Persons; private EntityRef<Person_Persons> _Person_Persons;
@@ -39576,10 +39576,10 @@ namespace Model
partial void OnProposeUnitIdChanged(); partial void OnProposeUnitIdChanged();
partial void OnSaveHandleManChanging(string value); partial void OnSaveHandleManChanging(string value);
partial void OnSaveHandleManChanged(); partial void OnSaveHandleManChanged();
partial void OnWorkPackageIdChanging(string value);
partial void OnWorkPackageIdChanged();
partial void OnWorkPackageNameChanging(string value); partial void OnWorkPackageNameChanging(string value);
partial void OnWorkPackageNameChanged(); partial void OnWorkPackageNameChanged();
partial void OnWorkPackageIdChanging(string value);
partial void OnWorkPackageIdChanged();
#endregion #endregion
public Check_CheckControl() public Check_CheckControl()
@@ -40058,26 +40058,6 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
public string WorkPackageId
{
get
{
return this._WorkPackageId;
}
set
{
if ((this._WorkPackageId != value))
{
this.OnWorkPackageIdChanging(value);
this.SendPropertyChanging();
this._WorkPackageId = value;
this.SendPropertyChanged("WorkPackageId");
this.OnWorkPackageIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")]
public string WorkPackageName public string WorkPackageName
{ {
@@ -40098,6 +40078,26 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
public string WorkPackageId
{
get
{
return this._WorkPackageId;
}
set
{
if ((this._WorkPackageId != value))
{
this.OnWorkPackageIdChanging(value);
this.SendPropertyChanging();
this._WorkPackageId = value;
this.SendPropertyChanged("WorkPackageId");
this.OnWorkPackageIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckControl_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckControl_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project public Base_Project Base_Project
{ {
@@ -100765,10 +100765,10 @@ namespace Model
private string _HazardValue; private string _HazardValue;
private string _WorkPackageId;
private string _WorkPackageName; private string _WorkPackageName;
private string _WorkPackageId;
private EntityRef<Base_Unit> _Base_Unit; private EntityRef<Base_Unit> _Base_Unit;
private EntityRef<HSSE_Hazard_HazardRegisterTypes> _HSSE_Hazard_HazardRegisterTypes; private EntityRef<HSSE_Hazard_HazardRegisterTypes> _HSSE_Hazard_HazardRegisterTypes;
@@ -100869,10 +100869,10 @@ namespace Model
partial void OnRegisterTypes4IdChanged(); partial void OnRegisterTypes4IdChanged();
partial void OnHazardValueChanging(string value); partial void OnHazardValueChanging(string value);
partial void OnHazardValueChanged(); partial void OnHazardValueChanged();
partial void OnWorkPackageIdChanging(string value);
partial void OnWorkPackageIdChanged();
partial void OnWorkPackageNameChanging(string value); partial void OnWorkPackageNameChanging(string value);
partial void OnWorkPackageNameChanged(); partial void OnWorkPackageNameChanged();
partial void OnWorkPackageIdChanging(string value);
partial void OnWorkPackageIdChanged();
#endregion #endregion
public HSSE_Hazard_HazardRegister() public HSSE_Hazard_HazardRegister()
@@ -101810,26 +101810,6 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
public string WorkPackageId
{
get
{
return this._WorkPackageId;
}
set
{
if ((this._WorkPackageId != value))
{
this.OnWorkPackageIdChanging(value);
this.SendPropertyChanging();
this._WorkPackageId = value;
this.SendPropertyChanged("WorkPackageId");
this.OnWorkPackageIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")]
public string WorkPackageName public string WorkPackageName
{ {
@@ -101850,6 +101830,26 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
public string WorkPackageId
{
get
{
return this._WorkPackageId;
}
set
{
if ((this._WorkPackageId != value))
{
this.OnWorkPackageIdChanging(value);
this.SendPropertyChanging();
this._WorkPackageId = value;
this.SendPropertyChanged("WorkPackageId");
this.OnWorkPackageIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HSSE_Hazard_HazardRegister_Base_Unit", Storage="_Base_Unit", ThisKey="ResponsibleUnit", OtherKey="UnitId", IsForeignKey=true)] [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HSSE_Hazard_HazardRegister_Base_Unit", Storage="_Base_Unit", ThisKey="ResponsibleUnit", OtherKey="UnitId", IsForeignKey=true)]
public Base_Unit Base_Unit public Base_Unit Base_Unit
{ {
@@ -289081,6 +289081,8 @@ namespace Model
private string _WorkPackageId; private string _WorkPackageId;
private string _SpecialSchemeTypeName;
private string _PackageContent; private string _PackageContent;
private string _WorkPackageSize; private string _WorkPackageSize;
@@ -289347,6 +289349,22 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecialSchemeTypeName", DbType="NVarChar(500)")]
public string SpecialSchemeTypeName
{
get
{
return this._SpecialSchemeTypeName;
}
set
{
if ((this._SpecialSchemeTypeName != value))
{
this._SpecialSchemeTypeName = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(2000)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(2000)")]
public string PackageContent public string PackageContent
{ {