Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New
This commit is contained in:
@@ -1,3 +1,45 @@
|
||||
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
|
||||
|
||||
|
||||
INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
|
||||
VALUES ( N'34037636-4BEC-44A9-8267-7830F021AF02',N'公司平均工效统计',N'PZHGL/InformationProject/CompanyConstructionLogWorkEfficiencySum.aspx',70,N'0',N'Menu_HTGL',1,0,1)
|
||||
GO
|
||||
|
||||
@@ -18,6 +18,8 @@ namespace BLL
|
||||
/// <returns></returns>
|
||||
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);
|
||||
request.Method = string.IsNullOrEmpty(method) ? "GET" : method;
|
||||
request.ContentType = string.IsNullOrEmpty(contenttype) ? "application/json;charset=utf-8" : contenttype;
|
||||
|
||||
@@ -85,7 +85,7 @@
|
||||
</f:Panel>
|
||||
<f:Window ID="Window1" Title="危大工程清单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
||||
Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window1_Close"
|
||||
Width="1200px" Height="650px">
|
||||
Width="1300px" Height="650px" Maximized="true">
|
||||
</f:Window>
|
||||
<f:Menu ID="Menu1" runat="server">
|
||||
<Items>
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" ClicksToEdit="1"
|
||||
DataIDField="LargerHazardListItemId" DataKeyNames="LargerHazardListItemId"
|
||||
SortDirection="ASC" AllowSorting="true" SortField="SortIndex" ForceFit="true"
|
||||
Height="400px" EnableColumnLines="true" EnableRowDoubleClickEvent="true"
|
||||
EnableColumnLines="true" EnableRowDoubleClickEvent="true" Height="600px"
|
||||
OnRowDoubleClick="Grid1_RowDoubleClick">
|
||||
<Columns>
|
||||
<f:RenderField Width="50px" ColumnID="SortIndex" DataField="SortIndex"
|
||||
@@ -49,17 +49,17 @@
|
||||
<f:RenderField Width="150px" ColumnID="UnitWorkName" DataField="UnitWorkName"
|
||||
FieldType="String" HeaderText="单位工程" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="150px" ColumnID="PackageContent" DataField="PackageContent"
|
||||
FieldType="String" HeaderText="分部分项</br>工程名称" TextAlign="Left" HeaderTextAlign="Center">
|
||||
<f:RenderField Width="150px" ColumnID="SpecialSchemeTypeName" DataField="SpecialSchemeTypeName"
|
||||
FieldType="String" HeaderText="分部分项工程名称" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<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 Width="200px" ColumnID="ExpectedTime" DataField="ExpectedTime"
|
||||
FieldType="String" HeaderText="预计施工起止时间" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="80px" ColumnID="IsArgumentName" DataField="IsArgumentName"
|
||||
FieldType="String" HeaderText="是否需要</br>专家论证" TextAlign="Left" HeaderTextAlign="Center">
|
||||
<f:RenderField Width="120px" ColumnID="IsArgumentName" DataField="IsArgumentName"
|
||||
FieldType="String" HeaderText="是否需要专家论证" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="80px" ColumnID="WorkStatesName" DataField="WorkStatesName"
|
||||
FieldType="String" HeaderText="作业状态" TextAlign="Left" HeaderTextAlign="Center">
|
||||
@@ -96,8 +96,8 @@
|
||||
</Toolbars>
|
||||
</f:Form>
|
||||
<f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
||||
Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1024px" OnClose="Window1_Close"
|
||||
Height="600px">
|
||||
Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1200px" OnClose="Window1_Close"
|
||||
Height="500px">
|
||||
</f:Window>
|
||||
<f:Menu ID="Menu1" runat="server">
|
||||
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server"
|
||||
|
||||
@@ -21,19 +21,19 @@
|
||||
</f:DropDownList>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow ColumnWidths="90% 10%">
|
||||
<%-- <f:FormRow ColumnWidths="90% 10%">
|
||||
<Items>
|
||||
<f:Label runat="server" ID="txtWorkPackageId" Label="分部分项工程名称" ShowRedStar="true"></f:Label>
|
||||
<f:TextBox runat="server" ID="hdWorkPackageId" Hidden="true"></f:TextBox>
|
||||
<f:Button ID="btSearch" ToolTip="选择" Icon="SystemSearch" runat="server" OnClick="btSearch_Click">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
</f:FormRow>--%>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<%-- <f:DropDownList ID="drpWorkPackageId" runat="server" Label="分部分项</br>工程名称" EnableEdit="true"
|
||||
<f:DropDownList ID="drpWorkPackageId" runat="server" Label="分部分项工程名称" EnableEdit="true"
|
||||
Required="true" ShowRedStar="true">
|
||||
</f:DropDownList>--%>
|
||||
</f:DropDownList>
|
||||
<f:TextBox ID="txtWorkPackageSize" runat="server" Label="分部分项工程规模" MaxLength="500">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
@@ -80,10 +80,10 @@
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
</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"
|
||||
Width="800px" Height="650px">
|
||||
</f:Window>
|
||||
</f:Window>--%>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -51,7 +51,7 @@ namespace FineUIPro.Web.HSSE.Solution
|
||||
//单位工程
|
||||
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");
|
||||
//作业状态
|
||||
@@ -70,14 +70,14 @@ namespace FineUIPro.Web.HSSE.Solution
|
||||
{
|
||||
this.drpUnitWorkId.SelectedValue = getItem.UnitWorkId;
|
||||
}
|
||||
//if (!string.IsNullOrEmpty(getItem.WorkPackageId))
|
||||
//{
|
||||
// this.drpWorkPackageId.SelectedValue = getItem.WorkPackageId;
|
||||
//}
|
||||
if (!string.IsNullOrEmpty(getItem.WorkPackageId))
|
||||
{
|
||||
this.drpWorkPackageId.SelectedValue = getItem.WorkPackageId;
|
||||
}
|
||||
this.txtWorkPackageSize.Text = getItem.WorkPackageSize;
|
||||
|
||||
this.hdWorkPackageId.Text = getItem.WorkPackageId;
|
||||
this.txtWorkPackageId.Text = getItem.PackageContent;
|
||||
//this.hdWorkPackageId.Text = getItem.WorkPackageId;
|
||||
//this.txtWorkPackageId.Text = getItem.PackageContent;
|
||||
|
||||
this.txtExpectedStartTime.Text = string.Format("{0:yyyy-MM-dd}", getItem.ExpectedStartTime);
|
||||
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),
|
||||
IsArgument = Convert.ToBoolean(this.rblIsArgument.SelectedValue),
|
||||
WorkStates = this.rbWorkStates.SelectedValue ?? "1",
|
||||
WorkPackageId = this.hdWorkPackageId.Text,
|
||||
WorkPackageName = this.txtWorkPackageId.Text,
|
||||
//WorkPackageId = this.hdWorkPackageId.Text,
|
||||
//WorkPackageName = this.txtWorkPackageId.Text,
|
||||
};
|
||||
//if (this.drpWorkPackageId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpWorkPackageId.SelectedValue))
|
||||
//{
|
||||
// newItem.WorkPackageId = this.drpWorkPackageId.SelectedValue;
|
||||
//}
|
||||
if (this.drpWorkPackageId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpWorkPackageId.SelectedValue))
|
||||
{
|
||||
newItem.WorkPackageId = this.drpWorkPackageId.SelectedValue;
|
||||
}
|
||||
if (this.drpUnitWorkId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue))
|
||||
{
|
||||
newItem.UnitWorkId = this.drpUnitWorkId.SelectedValue;
|
||||
@@ -157,20 +157,20 @@ namespace FineUIPro.Web.HSSE.Solution
|
||||
}
|
||||
#endregion
|
||||
|
||||
protected void btSearch_Click(object sender, EventArgs e)
|
||||
{
|
||||
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdWorkPackageId.ClientID)
|
||||
+ Window1.GetShowReference(String.Format("~/DigData/ShowProjectWBS.aspx?levle={0}", 3, "选择WBS - ")));
|
||||
}
|
||||
//protected void btSearch_Click(object sender, EventArgs e)
|
||||
//{
|
||||
// PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdWorkPackageId.ClientID)
|
||||
// + Window1.GetShowReference(String.Format("~/DigData/ShowProjectWBS.aspx?levle={0}", 3, "选择WBS - ")));
|
||||
//}
|
||||
|
||||
protected void Window1_Close(object sender, WindowCloseEventArgs e)
|
||||
{
|
||||
var getReturnValues = Funs.GetStrListByStr(this.hdWorkPackageId.Text,'&');
|
||||
if (getReturnValues.Count() > 1)
|
||||
{
|
||||
this.hdWorkPackageId.Text = getReturnValues[0].ToString();
|
||||
this.txtWorkPackageId.Text = getReturnValues[1].ToString();
|
||||
}
|
||||
}
|
||||
//protected void Window1_Close(object sender, WindowCloseEventArgs e)
|
||||
//{
|
||||
// var getReturnValues = Funs.GetStrListByStr(this.hdWorkPackageId.Text,'&');
|
||||
// if (getReturnValues.Count() > 1)
|
||||
// {
|
||||
// this.hdWorkPackageId.Text = getReturnValues[0].ToString();
|
||||
// this.txtWorkPackageId.Text = getReturnValues[1].ToString();
|
||||
// }
|
||||
//}
|
||||
}
|
||||
}
|
||||
+2
-29
@@ -60,31 +60,13 @@ namespace FineUIPro.Web.HSSE.Solution
|
||||
protected global::FineUIPro.DropDownList drpUnitWorkId;
|
||||
|
||||
/// <summary>
|
||||
/// txtWorkPackageId 控件。
|
||||
/// drpWorkPackageId 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtWorkPackageId;
|
||||
|
||||
/// <summary>
|
||||
/// hdWorkPackageId 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox hdWorkPackageId;
|
||||
|
||||
/// <summary>
|
||||
/// btSearch 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btSearch;
|
||||
protected global::FineUIPro.DropDownList drpWorkPackageId;
|
||||
|
||||
/// <summary>
|
||||
/// txtWorkPackageSize 控件。
|
||||
@@ -184,14 +166,5 @@ namespace FineUIPro.Web.HSSE.Solution
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnClose;
|
||||
|
||||
/// <summary>
|
||||
/// Window1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window1;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,28 +35,28 @@
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" ClicksToEdit="1"
|
||||
DataIDField="LargerHazardListItemId" DataKeyNames="LargerHazardListItemId"
|
||||
SortDirection="ASC" AllowSorting="true" SortField="SortIndex" ForceFit="true"
|
||||
Height="400px" EnableColumnLines="true">
|
||||
Height="600px" EnableColumnLines="true">
|
||||
<Columns>
|
||||
<f:RenderField Width="50px" ColumnID="SortIndex" DataField="SortIndex"
|
||||
FieldType="String" HeaderText="序号" TextAlign="Center" HeaderTextAlign="Center">
|
||||
</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">
|
||||
</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">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="145px" ColumnID="PackageContent" DataField="PackageContent"
|
||||
FieldType="String" HeaderText="分部分项</br>工程名称" TextAlign="Left" HeaderTextAlign="Center">
|
||||
<f:RenderField Width="150px" ColumnID="SpecialSchemeTypeName" DataField="SpecialSchemeTypeName"
|
||||
FieldType="String" HeaderText="分部分项工程名称" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<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 Width="200px" ColumnID="ExpectedTime" DataField="ExpectedTime"
|
||||
FieldType="String" HeaderText="预计施工起止时间" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="80px" ColumnID="IsArgumentName" DataField="IsArgumentName"
|
||||
FieldType="String" HeaderText="是否需要</br>专家论证" TextAlign="Left" HeaderTextAlign="Center">
|
||||
<f:RenderField Width="120px" ColumnID="IsArgumentName" DataField="IsArgumentName"
|
||||
FieldType="String" HeaderText="是否需要专家论证" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="80px" ColumnID="WorkStatesName" DataField="WorkStatesName"
|
||||
FieldType="String" HeaderText="作业状态" TextAlign="Left" HeaderTextAlign="Center">
|
||||
|
||||
@@ -20,5 +20,4 @@
|
||||
<TreeNode id="A5A31FE8-0643-4396-99E3-A4A31A947789" Text="无损检测工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=8"></TreeNode>
|
||||
<TreeNode id="481E6B1E-A3D5-4012-B828-FE62EB6BA861" Text="消防工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=9"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="34037636-4BEC-44A9-8267-7830F021AF02" Text="公司平均工效统计" NavigateUrl="PZHGL/InformationProject/CompanyConstructionLogWorkEfficiencySum.aspx"></TreeNode>
|
||||
</Tree>
|
||||
+66
-48
@@ -39527,10 +39527,10 @@ namespace Model
|
||||
|
||||
private string _SaveHandleMan;
|
||||
|
||||
private string _WorkPackageId;
|
||||
|
||||
private string _WorkPackageName;
|
||||
|
||||
private string _WorkPackageId;
|
||||
|
||||
private EntityRef<Base_Project> _Base_Project;
|
||||
|
||||
private EntityRef<Person_Persons> _Person_Persons;
|
||||
@@ -39587,10 +39587,10 @@ namespace Model
|
||||
partial void OnProposeUnitIdChanged();
|
||||
partial void OnSaveHandleManChanging(string value);
|
||||
partial void OnSaveHandleManChanged();
|
||||
partial void OnWorkPackageIdChanging(string value);
|
||||
partial void OnWorkPackageIdChanged();
|
||||
partial void OnWorkPackageNameChanging(string value);
|
||||
partial void OnWorkPackageNameChanged();
|
||||
partial void OnWorkPackageIdChanging(string value);
|
||||
partial void OnWorkPackageIdChanged();
|
||||
#endregion
|
||||
|
||||
public Check_CheckControl()
|
||||
@@ -40069,26 +40069,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)")]
|
||||
public string WorkPackageName
|
||||
{
|
||||
@@ -40109,6 +40089,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)]
|
||||
public Base_Project Base_Project
|
||||
{
|
||||
@@ -100776,10 +100776,10 @@ namespace Model
|
||||
|
||||
private string _HazardValue;
|
||||
|
||||
private string _WorkPackageId;
|
||||
|
||||
private string _WorkPackageName;
|
||||
|
||||
private string _WorkPackageId;
|
||||
|
||||
private EntityRef<Base_Unit> _Base_Unit;
|
||||
|
||||
private EntityRef<HSSE_Hazard_HazardRegisterTypes> _HSSE_Hazard_HazardRegisterTypes;
|
||||
@@ -100880,10 +100880,10 @@ namespace Model
|
||||
partial void OnRegisterTypes4IdChanged();
|
||||
partial void OnHazardValueChanging(string value);
|
||||
partial void OnHazardValueChanged();
|
||||
partial void OnWorkPackageIdChanging(string value);
|
||||
partial void OnWorkPackageIdChanged();
|
||||
partial void OnWorkPackageNameChanging(string value);
|
||||
partial void OnWorkPackageNameChanged();
|
||||
partial void OnWorkPackageIdChanging(string value);
|
||||
partial void OnWorkPackageIdChanged();
|
||||
#endregion
|
||||
|
||||
public HSSE_Hazard_HazardRegister()
|
||||
@@ -101821,26 +101821,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)")]
|
||||
public string WorkPackageName
|
||||
{
|
||||
@@ -101861,6 +101841,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)]
|
||||
public Base_Unit Base_Unit
|
||||
{
|
||||
@@ -289092,6 +289092,8 @@ namespace Model
|
||||
|
||||
private string _WorkPackageId;
|
||||
|
||||
private string _SpecialSchemeTypeName;
|
||||
|
||||
private string _PackageContent;
|
||||
|
||||
private string _WorkPackageSize;
|
||||
@@ -289358,6 +289360,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)")]
|
||||
public string PackageContent
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user