移交尾项，修改列
This commit is contained in:
parent
2c1cd6b767
commit
49dfe083bd
|
|
@ -0,0 +1,46 @@
|
|||
alter table sys_menu
|
||||
alter COLUMN menuname nvarchar(200);
|
||||
|
||||
UPDATE SYS_MENU set MenuName='工艺系统清单<br> Process System List'
|
||||
WHERE MENUID='197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB';
|
||||
|
||||
|
||||
UPDATE SYS_MENU set MenuName='非工艺系统清单<br> Non-Process System List'
|
||||
WHERE MENUID='022428DC-FC99-4916-B8AF-6A9DC885DFAF';
|
||||
|
||||
UPDATE SYS_MENU set MenuName='管道<br> Piping'
|
||||
WHERE MENUID='D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B';
|
||||
|
||||
UPDATE SYS_MENU set MenuName='静设备<br> Static Equipment'
|
||||
WHERE MENUID='982F746C-084C-445C-9AE8-8C37BDFE7994';
|
||||
|
||||
UPDATE SYS_MENU set MenuName='动设备<br> Rotating Equipment'
|
||||
WHERE MENUID='7E2FB5F9-FB99-4455-B68F-460F1F9A2676';
|
||||
|
||||
UPDATE SYS_MENU set MenuName='仪表<br> Instrumentation'
|
||||
WHERE MENUID='88F51059-55B4-4CD5-A38C-36404E5029F6';
|
||||
|
||||
UPDATE SYS_MENU set MenuName='电气<br> Electrical'
|
||||
WHERE MENUID='296E75D2-192A-4D1F-8471-DD34263F8691';
|
||||
|
||||
UPDATE SYS_MENU set MenuName='消防<br> Firefighting'
|
||||
WHERE MENUID='794E64E2-FDD2-4B7D-8408-F7FB06F9C92A';
|
||||
|
||||
UPDATE SYS_MENU set MenuName='土建/建筑/结构<br> Civil Structure'
|
||||
WHERE MENUID='95C39F86-C060-452E-BA37-D891C466A39B';
|
||||
|
||||
UPDATE SYS_MENU set MenuName='电信<br> Telecom'
|
||||
WHERE MENUID='58FFBD80-ACB9-4830-A18A-E025D9600D94';
|
||||
|
||||
UPDATE SYS_MENU set MenuName='地管<br> Plumbing'
|
||||
WHERE MENUID='95295BF7-FB51-480D-9902-6ADA4E8427FC';
|
||||
|
||||
UPDATE SYS_MENU set MenuName='尾项管理<br> Punch List Form'
|
||||
WHERE MENUID='016903B1-3B86-4CF5-AFF8-FF8BE389BEE5';
|
||||
|
||||
|
||||
alter table Transfer_PunchlistFrom
|
||||
alter COLUMN Num_No nvarchar(50);
|
||||
|
||||
alter table Transfer_PunchlistFrom
|
||||
alter COLUMN IsMatI nvarchar(50);
|
||||
Binary file not shown.
|
|
@ -2021,6 +2021,9 @@
|
|||
<Content Include="Transfer\Chart\Instrumentation.aspx" />
|
||||
<Content Include="Transfer\Chart\PunchlistFrom.aspx" />
|
||||
<Content Include="Transfer\Chart\PunchlistFromChart.aspx" />
|
||||
<Content Include="Transfer\Chart\PunchlistFromChartNew.aspx" />
|
||||
<Content Include="Transfer\Chart\PunchlistFromProgress.aspx" />
|
||||
<Content Include="Transfer\Chart\PunchlistFromSort.aspx" />
|
||||
<Content Include="Transfer\Chart\TransferChart.aspx" />
|
||||
<Content Include="Transfer\CivilStructure.aspx" />
|
||||
<Content Include="Transfer\CivilStructureDataIn.aspx" />
|
||||
|
|
@ -17587,6 +17590,27 @@
|
|||
<Compile Include="Transfer\Chart\PunchlistFromChart.aspx.designer.cs">
|
||||
<DependentUpon>PunchlistFromChart.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Transfer\Chart\PunchlistFromChartNew.aspx.cs">
|
||||
<DependentUpon>PunchlistFromChartNew.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Transfer\Chart\PunchlistFromChartNew.aspx.designer.cs">
|
||||
<DependentUpon>PunchlistFromChartNew.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Transfer\Chart\PunchlistFromProgress.aspx.cs">
|
||||
<DependentUpon>PunchlistFromProgress.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Transfer\Chart\PunchlistFromProgress.aspx.designer.cs">
|
||||
<DependentUpon>PunchlistFromProgress.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Transfer\Chart\PunchlistFromSort.aspx.cs">
|
||||
<DependentUpon>PunchlistFromSort.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Transfer\Chart\PunchlistFromSort.aspx.designer.cs">
|
||||
<DependentUpon>PunchlistFromSort.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Transfer\Chart\TransferChart.aspx.cs">
|
||||
<DependentUpon>TransferChart.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
|
|
@ -19072,7 +19096,7 @@
|
|||
</FlavorProperties>
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||
<UseIISExpress>true</UseIISExpress>
|
||||
<Use64BitIISExpress>false</Use64BitIISExpress>
|
||||
<IISExpressSSLPort />
|
||||
|
|
|
|||
|
|
@ -123,11 +123,11 @@
|
|||
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="Num_NO" DataField="Num_NO" HeaderText="No." />
|
||||
|
||||
<f:BoundField Width="150px" TextAlign="Center" ColumnID="System_No" DataField="System_No" HeaderText="System No." />
|
||||
<f:BoundField Width="120px" TextAlign="Center" ColumnID="System_No" DataField="System_No" HeaderText="系统号<br>System No." />
|
||||
|
||||
<f:BoundField Width="150px" TextAlign="Center" ColumnID="Sub_Sys_No" DataField="Sub_Sys_No" HeaderText="Sub-sys. No." />
|
||||
<f:BoundField Width="120px" TextAlign="Center" ColumnID="Sub_Sys_No" DataField="Sub_Sys_No" HeaderText="子系统号<br>Sub-sys. No." />
|
||||
|
||||
<f:BoundField Width="150px" TextAlign="Center" ColumnID="DESCRIPTION" DataField="DESCRIPTION" HeaderText="Description" />
|
||||
<f:BoundField Width="220px" TextAlign="left" ColumnID="DESCRIPTION" DataField="DESCRIPTION" HeaderText="尾项内容<br>Description" />
|
||||
|
||||
<f:TemplateField ColumnID="ImagePhotoes" Width="120px" HeaderText="Photoes" HeaderTextAlign="Center"
|
||||
TextAlign="Left">
|
||||
|
|
@ -137,29 +137,29 @@
|
|||
</f:TemplateField>
|
||||
<%--<f:BoundField Width="150px" TextAlign="Center" ColumnID="Photoes" DataField="Photoes" HeaderText="Photoes" />--%>
|
||||
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="Cat" DataField="Cat" HeaderText="Cat." />
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="Cat" DataField="Cat" HeaderText="尾项等级<br>Cat." />
|
||||
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="Raised_By" DataField="Raised_By" HeaderText="Raised By" />
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="Raised_By" DataField="Raised_By" HeaderText="提出人<br>Raised By" />
|
||||
|
||||
<f:RenderField Width="100px" TextAlign="Center" ColumnID="Date_Raised" DataField="Date_Raised" HeaderText="Date Raised" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
|
||||
<f:RenderField Width="100px" TextAlign="Center" ColumnID="Date_Raised" DataField="Date_Raised" HeaderText="提出时间<br>Date Raised" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
|
||||
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="Disc" DataField="Disc" HeaderText="Disc." />
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="Disc" DataField="Disc" HeaderText="专业<br>Disc." />
|
||||
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="IsEng" DataField="IsEngStr" HeaderText="Eng(Y/N)" />
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="IsEng" DataField="IsEngStr" HeaderText="设计需求<br>Eng(Y/N)" />
|
||||
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="IsMatI" DataField="IsMatIStr" HeaderText="Mat’l(Y/N)" />
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="IsMatI" DataField="IsMatIStr" HeaderText="材料需求<br>Mat’l(Y/N)" />
|
||||
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="Punch_Type" DataField="Punch_Type" HeaderText="Punch Type" />
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="Punch_Type" DataField="Punch_Type" HeaderText="尾项类别<br>Punch Type" />
|
||||
|
||||
<f:RenderField Width="150px" TextAlign="Center" ColumnID="Required_Date" DataField="Required_Date" HeaderText="Required Date" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
|
||||
<f:RenderField Width="150px" TextAlign="Center" ColumnID="Required_Date" DataField="Required_Date" HeaderText="要求完成时间<br>Required Date" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
|
||||
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="Action_By" DataField="Action_By" HeaderText="Action By" />
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="Action_By" DataField="Action_By" HeaderText="责任单位<br>Action By" />
|
||||
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="PIC" DataField="PIC" HeaderText="PIC" />
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="PIC" DataField="PIC" HeaderText="责任人PIC" />
|
||||
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="PIC_WUH" DataField="PIC_WUH" HeaderText="PIC-WUH" />
|
||||
<f:BoundField Width="100px" TextAlign="Center" ColumnID="PIC_WUH" DataField="PIC_WUH" HeaderText="责任人-五环<br>PIC-WUH" />
|
||||
|
||||
<f:BoundField Width="150px" TextAlign="Center" ColumnID="Correction_Action" DataField="Correction_Action" HeaderText="Correction Action" />
|
||||
<f:BoundField Width="220px" TextAlign="left" ColumnID="Correction_Action" DataField="Correction_Action" HeaderText="整改措施<br>Correction Action" />
|
||||
|
||||
<f:TemplateField ColumnID="ImageCorrected_Photos" Width="150px" HeaderText="Corrected Photos" HeaderTextAlign="Center"
|
||||
TextAlign="Left">
|
||||
|
|
@ -170,9 +170,9 @@
|
|||
<%--<f:BoundField Width="150px" TextAlign="Center" ColumnID="Corrected_Photos" DataField="Corrected_Photos" HeaderText="Corrected Photos" />--%>
|
||||
|
||||
|
||||
<f:RenderField Width="150px" TextAlign="Center" ColumnID="Actual_Date" DataField="Actual_Date" HeaderText="Actual Date" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
|
||||
<f:RenderField Width="150px" TextAlign="Center" ColumnID="Actual_Date" DataField="Actual_Date" HeaderText="实际完成时间<br>Actual Date" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
|
||||
|
||||
<f:GroupField HeaderText="Cleared(PIC）" TextAlign="Center" MinWidth="200px">
|
||||
<f:GroupField HeaderText="Cleared(PIC）监理核查" TextAlign="Center" MinWidth="200px">
|
||||
<Columns>
|
||||
<f:RenderField Width="100px" ColumnID="Cleared_By" DataField="Cleared_By" HeaderText="By" TextAlign="Center" />
|
||||
<f:RenderField Width="100px" ColumnID="Cleared_Date" DataField="Cleared_Date" HeaderText="Date" TextAlign="Center"
|
||||
|
|
@ -180,7 +180,7 @@
|
|||
</Columns>
|
||||
</f:GroupField>
|
||||
|
||||
<f:GroupField HeaderText="Confirmed(WUH)" TextAlign="Center" MinWidth="200px">
|
||||
<f:GroupField HeaderText="Confirmed(WUH)确认（五环）" TextAlign="Center" MinWidth="200px">
|
||||
<Columns>
|
||||
<f:RenderField Width="100px" ColumnID="Confirmed_By" DataField="Confirmed_By" HeaderText="By" TextAlign="Center" />
|
||||
<f:RenderField Width="100px" ColumnID="Confirmed_Date" DataField="Confirmed_Date" HeaderText="Date" TextAlign="Center"
|
||||
|
|
@ -188,7 +188,7 @@
|
|||
</Columns>
|
||||
</f:GroupField>
|
||||
|
||||
<f:GroupField HeaderText="Verified(BASF)" TextAlign="Center" MinWidth="200px">
|
||||
<f:GroupField HeaderText="Verified(BASF)验收" TextAlign="Center" MinWidth="200px">
|
||||
<Columns>
|
||||
<f:RenderField Width="100px" ColumnID="Verified_By" DataField="Verified_By" HeaderText="By" TextAlign="Center" />
|
||||
<f:RenderField Width="100px" ColumnID="Verified_Date" DataField="Verified_Date" HeaderText="Date" TextAlign="Center"
|
||||
|
|
@ -196,9 +196,9 @@
|
|||
</Columns>
|
||||
</f:GroupField>
|
||||
|
||||
<f:BoundField Width="80px" TextAlign="Center" ColumnID="Status" DataField="Status" HeaderText="Status" />
|
||||
<f:BoundField Width="80px" TextAlign="Center" ColumnID="Status" DataField="Status" HeaderText="状态<br>Status" />
|
||||
|
||||
<f:BoundField Width="80px" TextAlign="Center" ColumnID="Remark" DataField="Remark" HeaderText="Remark" />
|
||||
<f:BoundField Width="80px" TextAlign="Center" ColumnID="Remark" DataField="Remark" HeaderText="备注<br>Remark" />
|
||||
</Columns>
|
||||
<Listeners>
|
||||
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ namespace FineUIPro.Web.Transfer
|
|||
{
|
||||
string strSql = @"select *
|
||||
,(CASE isnull(IsEng,0) WHEN 1 THEN 'Y' ELSE 'N' END) IsEngStr
|
||||
,(CASE isnull(IsMatI,0) WHEN 1 THEN 'Y' ELSE 'N' END) IsMatIStr
|
||||
,IsMatI IsMatIStr
|
||||
from Transfer_PunchlistFrom
|
||||
where ProjectId = @ProjectId";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
|
|
|
|||
|
|
@ -393,7 +393,7 @@ namespace FineUIPro.Web.Transfer
|
|||
}
|
||||
string result = string.Empty;
|
||||
ir = pds.Rows.Count;
|
||||
long? maxNumNO = -1;
|
||||
var maxNumNO = 0;
|
||||
if (pds != null && ir > 0)
|
||||
{
|
||||
List<Model.Transfer_PunchlistFrom> list = new List<Model.Transfer_PunchlistFrom>();
|
||||
|
|
@ -402,10 +402,12 @@ namespace FineUIPro.Web.Transfer
|
|||
if (!string.IsNullOrEmpty(pds.Rows[i][1].ToString().Trim()))
|
||||
{
|
||||
//查询第一列，没查到的情况下作导入处理
|
||||
if (maxNumNO == -1) {
|
||||
maxNumNO = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == CurrUser.LoginProjectId).Max(p => p.Num_NO);
|
||||
if (maxNumNO == null)
|
||||
maxNumNO = 1001;
|
||||
if (maxNumNO == 0) {
|
||||
var modelTp = Funs.DB.Transfer_PunchlistFrom.OrderByDescending(x=>x.Num_NO).FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId);
|
||||
if (modelTp == null)
|
||||
maxNumNO = 1;
|
||||
else
|
||||
maxNumNO = Convert.ToInt32(modelTp.Num_NO) + 1;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -414,7 +416,7 @@ namespace FineUIPro.Web.Transfer
|
|||
model.Id = Guid.NewGuid().ToString();
|
||||
model.ProjectId = CurrUser.LoginProjectId;
|
||||
|
||||
model.Num_NO = maxNumNO;
|
||||
model.Num_NO = maxNumNO.ToString("0000");
|
||||
model.System_No = pds.Rows[i][0].ToString().Trim();
|
||||
model.Sub_Sys_No = pds.Rows[i][1].ToString().Trim();
|
||||
model.DESCRIPTION = pds.Rows[i][2].ToString().Trim();
|
||||
|
|
@ -431,10 +433,8 @@ namespace FineUIPro.Web.Transfer
|
|||
else
|
||||
model.IsEng = false;
|
||||
|
||||
if (pds.Rows[i][8].ToString().Trim().Contains("Y"))
|
||||
model.IsMatI = true;
|
||||
else
|
||||
model.IsMatI = false;
|
||||
model.IsMatI = pds.Rows[i][8].ToString().Trim();
|
||||
|
||||
model.Punch_Type = pds.Rows[i][9].ToString().Trim();
|
||||
DateTime t10;
|
||||
if (DateTime.TryParse(pds.Rows[i][10].ToString(), out t10) && !string.IsNullOrEmpty(pds.Rows[i][10].ToString()))
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@
|
|||
<add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
|
||||
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
|
||||
</httpHandlers>
|
||||
<compilation debug="false" targetFramework="4.6.1"/>
|
||||
<compilation debug="true" targetFramework="4.6.1"/>
|
||||
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
|
||||
<authentication mode="Forms">
|
||||
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Tree>
|
||||
<TreeNode id="197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB" Text="LHC System List(Process)" NavigateUrl="Transfer/LHCSystemList.aspx?Type=0">
|
||||
<TreeNode id="197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB" Text="工艺系统清单<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Process System List" NavigateUrl="Transfer/LHCSystemList.aspx?Type=0">
|
||||
</TreeNode>
|
||||
<TreeNode id="022428DC-FC99-4916-B8AF-6A9DC885DFAF" Text="LHC System List(Non-Process)" NavigateUrl="Transfer/LHCSystemList.aspx?Type=1"></TreeNode>
|
||||
<TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="Piping" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
|
||||
<TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="Static Equipment" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
|
||||
<TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="Rotating Equipment" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
|
||||
<TreeNode id="88F51059-55B4-4CD5-A38C-36404E5029F6" Text="Instrumentation" NavigateUrl="Transfer/Instrumentation.aspx"></TreeNode>
|
||||
<TreeNode id="296E75D2-192A-4D1F-8471-DD34263F8691" Text="Electrical" NavigateUrl="Transfer/Electrical.aspx"></TreeNode>
|
||||
<TreeNode id="95C39F86-C060-452E-BA37-D891C466A39B" Text="Civil Structure" NavigateUrl="Transfer/CivilStructure.aspx"></TreeNode>
|
||||
<TreeNode id="794E64E2-FDD2-4B7D-8408-F7FB06F9C92A" Text="Firefighting" NavigateUrl="Transfer/Firefighting.aspx"></TreeNode>
|
||||
<TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="Telecom" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
|
||||
<TreeNode id="95295BF7-FB51-480D-9902-6ADA4E8427FC" Text="Plumbing" NavigateUrl="Transfer/Plumbing.aspx"></TreeNode>
|
||||
<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="Punchlist from" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
|
||||
<TreeNode id="022428DC-FC99-4916-B8AF-6A9DC885DFAF" Text="非工艺系统清单<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Non-Process System List" NavigateUrl="Transfer/LHCSystemList.aspx?Type=1"></TreeNode>
|
||||
<TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="管道<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Piping" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
|
||||
<TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="静设备<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Static Equipment" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
|
||||
<TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="动设备<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Rotating Equipment" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
|
||||
<TreeNode id="88F51059-55B4-4CD5-A38C-36404E5029F6" Text="仪表<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Instrumentation" NavigateUrl="Transfer/Instrumentation.aspx"></TreeNode>
|
||||
<TreeNode id="296E75D2-192A-4D1F-8471-DD34263F8691" Text="电气<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Electrical" NavigateUrl="Transfer/Electrical.aspx"></TreeNode>
|
||||
<TreeNode id="95C39F86-C060-452E-BA37-D891C466A39B" Text="土建/建筑/结构<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Civil Structure" NavigateUrl="Transfer/CivilStructure.aspx"></TreeNode>
|
||||
<TreeNode id="794E64E2-FDD2-4B7D-8408-F7FB06F9C92A" Text="消防<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Firefighting" NavigateUrl="Transfer/Firefighting.aspx"></TreeNode>
|
||||
<TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="电信<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Telecom" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
|
||||
<TreeNode id="95295BF7-FB51-480D-9902-6ADA4E8427FC" Text="地管<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Plumbing" NavigateUrl="Transfer/Plumbing.aspx"></TreeNode>
|
||||
<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="尾项管理<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Punch List Form" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
|
||||
<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="2352E44F-BE12-4012-B43F-AAF649EDAC32" Text="Punchlist from完成统计表" NavigateUrl="Transfer/Chart/PunchlistFromChartNew.aspx"></TreeNode>
|
||||
<TreeNode id="CB76462E-9444-4946-B787-ECB33C21E6D0" Text="Punchlist from分类表" NavigateUrl="Transfer/Chart/PunchlistFromSort.aspx"></TreeNode>
|
||||
<TreeNode id="549DD0B6-05CB-4C75-B8F5-9AADDEDF399F" Text="Punchlist from进度跟踪表" NavigateUrl="Transfer/Chart/PunchlistFromProgress.aspx"></TreeNode>
|
||||
|
|
|
|||
|
|
@ -62027,8 +62027,6 @@ namespace Model
|
|||
|
||||
private EntityRef<Base_Project> _Base_Project;
|
||||
|
||||
private EntityRef<Technique_CheckItemSet> _Technique_CheckItemSet;
|
||||
|
||||
#region 可扩展性方法定义
|
||||
partial void OnLoaded();
|
||||
partial void OnValidate(System.Data.Linq.ChangeAction action);
|
||||
|
|
@ -62080,7 +62078,6 @@ namespace Model
|
|||
public Check_CheckSpecial()
|
||||
{
|
||||
this._Base_Project = default(EntityRef<Base_Project>);
|
||||
this._Technique_CheckItemSet = default(EntityRef<Technique_CheckItemSet>);
|
||||
OnCreated();
|
||||
}
|
||||
|
||||
|
|
@ -62399,10 +62396,6 @@ namespace Model
|
|||
{
|
||||
if ((this._CheckItemSetId != value))
|
||||
{
|
||||
if (this._Technique_CheckItemSet.HasLoadedOrAssignedValue)
|
||||
{
|
||||
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
|
||||
}
|
||||
this.OnCheckItemSetIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._CheckItemSetId = value;
|
||||
|
|
@ -62546,40 +62539,6 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Technique_CheckItemSet", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", IsForeignKey=true)]
|
||||
public Technique_CheckItemSet Technique_CheckItemSet
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Technique_CheckItemSet.Entity;
|
||||
}
|
||||
set
|
||||
{
|
||||
Technique_CheckItemSet previousValue = this._Technique_CheckItemSet.Entity;
|
||||
if (((previousValue != value)
|
||||
|| (this._Technique_CheckItemSet.HasLoadedOrAssignedValue == false)))
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
if ((previousValue != null))
|
||||
{
|
||||
this._Technique_CheckItemSet.Entity = null;
|
||||
previousValue.Check_CheckSpecial.Remove(this);
|
||||
}
|
||||
this._Technique_CheckItemSet.Entity = value;
|
||||
if ((value != null))
|
||||
{
|
||||
value.Check_CheckSpecial.Add(this);
|
||||
this._CheckItemSetId = value.CheckItemSetId;
|
||||
}
|
||||
else
|
||||
{
|
||||
this._CheckItemSetId = default(string);
|
||||
}
|
||||
this.SendPropertyChanged("Technique_CheckItemSet");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public event PropertyChangingEventHandler PropertyChanging;
|
||||
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
|
|
@ -353474,7 +353433,7 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuName", DbType="NVarChar(50)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuName", DbType="NVarChar(200)")]
|
||||
public string MenuName
|
||||
{
|
||||
get
|
||||
|
|
@ -370540,8 +370499,6 @@ namespace Model
|
|||
|
||||
private System.Nullable<bool> _IsBuiltIn;
|
||||
|
||||
private EntitySet<Check_CheckSpecial> _Check_CheckSpecial;
|
||||
|
||||
private EntitySet<Technique_CheckItemDetail> _Technique_CheckItemDetail;
|
||||
|
||||
#region 可扩展性方法定义
|
||||
|
|
@ -370568,7 +370525,6 @@ namespace Model
|
|||
|
||||
public Technique_CheckItemSet()
|
||||
{
|
||||
this._Check_CheckSpecial = new EntitySet<Check_CheckSpecial>(new Action<Check_CheckSpecial>(this.attach_Check_CheckSpecial), new Action<Check_CheckSpecial>(this.detach_Check_CheckSpecial));
|
||||
this._Technique_CheckItemDetail = new EntitySet<Technique_CheckItemDetail>(new Action<Technique_CheckItemDetail>(this.attach_Technique_CheckItemDetail), new Action<Technique_CheckItemDetail>(this.detach_Technique_CheckItemDetail));
|
||||
OnCreated();
|
||||
}
|
||||
|
|
@ -370733,19 +370689,6 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Check_CheckSpecial", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")]
|
||||
public EntitySet<Check_CheckSpecial> Check_CheckSpecial
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Check_CheckSpecial;
|
||||
}
|
||||
set
|
||||
{
|
||||
this._Check_CheckSpecial.Assign(value);
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Technique_CheckItemDetail_Technique_CheckItemSet", Storage="_Technique_CheckItemDetail", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")]
|
||||
public EntitySet<Technique_CheckItemDetail> Technique_CheckItemDetail
|
||||
{
|
||||
|
|
@ -370779,18 +370722,6 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
private void attach_Check_CheckSpecial(Check_CheckSpecial entity)
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
entity.Technique_CheckItemSet = this;
|
||||
}
|
||||
|
||||
private void detach_Check_CheckSpecial(Check_CheckSpecial entity)
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
entity.Technique_CheckItemSet = null;
|
||||
}
|
||||
|
||||
private void attach_Technique_CheckItemDetail(Technique_CheckItemDetail entity)
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
|
|
@ -394352,12 +394283,8 @@ namespace Model
|
|||
|
||||
private string _Comments;
|
||||
|
||||
private System.Nullable<long> _Num_NO;
|
||||
|
||||
private string _System_No;
|
||||
|
||||
private string _Sub_Sys_No;
|
||||
|
||||
private string _Cat;
|
||||
|
||||
private string _Raised_By;
|
||||
|
|
@ -394368,7 +394295,7 @@ namespace Model
|
|||
|
||||
private System.Nullable<bool> _IsEng;
|
||||
|
||||
private System.Nullable<bool> _IsMatI;
|
||||
private string _IsMatI;
|
||||
|
||||
private string _Punch_Type;
|
||||
|
||||
|
|
@ -394378,8 +394305,6 @@ namespace Model
|
|||
|
||||
private string _PIC_WUH;
|
||||
|
||||
private string _Correction_Action;
|
||||
|
||||
private System.Nullable<System.DateTime> _Actual_Date;
|
||||
|
||||
private string _Cleared_By;
|
||||
|
|
@ -394398,6 +394323,12 @@ namespace Model
|
|||
|
||||
private string _Remark;
|
||||
|
||||
private string _Sub_Sys_No;
|
||||
|
||||
private string _Num_NO;
|
||||
|
||||
private string _Correction_Action;
|
||||
|
||||
#region 可扩展性方法定义
|
||||
partial void OnLoaded();
|
||||
partial void OnValidate(System.Data.Linq.ChangeAction action);
|
||||
|
|
@ -394434,12 +394365,8 @@ namespace Model
|
|||
partial void OnPUNCH_ITEM_STATUSChanged();
|
||||
partial void OnCommentsChanging(string value);
|
||||
partial void OnCommentsChanged();
|
||||
partial void OnNum_NOChanging(System.Nullable<long> value);
|
||||
partial void OnNum_NOChanged();
|
||||
partial void OnSystem_NoChanging(string value);
|
||||
partial void OnSystem_NoChanged();
|
||||
partial void OnSub_Sys_NoChanging(string value);
|
||||
partial void OnSub_Sys_NoChanged();
|
||||
partial void OnCatChanging(string value);
|
||||
partial void OnCatChanged();
|
||||
partial void OnRaised_ByChanging(string value);
|
||||
|
|
@ -394450,7 +394377,7 @@ namespace Model
|
|||
partial void OnDiscChanged();
|
||||
partial void OnIsEngChanging(System.Nullable<bool> value);
|
||||
partial void OnIsEngChanged();
|
||||
partial void OnIsMatIChanging(System.Nullable<bool> value);
|
||||
partial void OnIsMatIChanging(string value);
|
||||
partial void OnIsMatIChanged();
|
||||
partial void OnPunch_TypeChanging(string value);
|
||||
partial void OnPunch_TypeChanged();
|
||||
|
|
@ -394460,8 +394387,6 @@ namespace Model
|
|||
partial void OnPICChanged();
|
||||
partial void OnPIC_WUHChanging(string value);
|
||||
partial void OnPIC_WUHChanged();
|
||||
partial void OnCorrection_ActionChanging(string value);
|
||||
partial void OnCorrection_ActionChanged();
|
||||
partial void OnActual_DateChanging(System.Nullable<System.DateTime> value);
|
||||
partial void OnActual_DateChanged();
|
||||
partial void OnCleared_ByChanging(string value);
|
||||
|
|
@ -394480,6 +394405,12 @@ namespace Model
|
|||
partial void OnStatusChanged();
|
||||
partial void OnRemarkChanging(string value);
|
||||
partial void OnRemarkChanged();
|
||||
partial void OnSub_Sys_NoChanging(string value);
|
||||
partial void OnSub_Sys_NoChanged();
|
||||
partial void OnNum_NOChanging(string value);
|
||||
partial void OnNum_NOChanged();
|
||||
partial void OnCorrection_ActionChanging(string value);
|
||||
partial void OnCorrection_ActionChanged();
|
||||
#endregion
|
||||
|
||||
public Transfer_PunchlistFrom()
|
||||
|
|
@ -394807,26 +394738,6 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Num_NO", DbType="BigInt")]
|
||||
public System.Nullable<long> Num_NO
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Num_NO;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._Num_NO != value))
|
||||
{
|
||||
this.OnNum_NOChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._Num_NO = value;
|
||||
this.SendPropertyChanged("Num_NO");
|
||||
this.OnNum_NOChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_System_No", DbType="NVarChar(50)")]
|
||||
public string System_No
|
||||
{
|
||||
|
|
@ -394847,26 +394758,6 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sub_Sys_No", DbType="NVarChar(50)")]
|
||||
public string Sub_Sys_No
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Sub_Sys_No;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._Sub_Sys_No != value))
|
||||
{
|
||||
this.OnSub_Sys_NoChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._Sub_Sys_No = value;
|
||||
this.SendPropertyChanged("Sub_Sys_No");
|
||||
this.OnSub_Sys_NoChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Cat", DbType="NVarChar(50)")]
|
||||
public string Cat
|
||||
{
|
||||
|
|
@ -394967,8 +394858,8 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsMatI", DbType="Bit")]
|
||||
public System.Nullable<bool> IsMatI
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsMatI", DbType="NVarChar(50)")]
|
||||
public string IsMatI
|
||||
{
|
||||
get
|
||||
{
|
||||
|
|
@ -395067,26 +394958,6 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Correction_Action", DbType="NVarChar(500)")]
|
||||
public string Correction_Action
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Correction_Action;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._Correction_Action != value))
|
||||
{
|
||||
this.OnCorrection_ActionChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._Correction_Action = value;
|
||||
this.SendPropertyChanged("Correction_Action");
|
||||
this.OnCorrection_ActionChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Actual_Date", DbType="DateTime")]
|
||||
public System.Nullable<System.DateTime> Actual_Date
|
||||
{
|
||||
|
|
@ -395267,6 +395138,66 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sub_Sys_No", DbType="NVarChar(50)")]
|
||||
public string Sub_Sys_No
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Sub_Sys_No;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._Sub_Sys_No != value))
|
||||
{
|
||||
this.OnSub_Sys_NoChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._Sub_Sys_No = value;
|
||||
this.SendPropertyChanged("Sub_Sys_No");
|
||||
this.OnSub_Sys_NoChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Num_NO", DbType="NVarChar(50)")]
|
||||
public string Num_NO
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Num_NO;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._Num_NO != value))
|
||||
{
|
||||
this.OnNum_NOChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._Num_NO = value;
|
||||
this.SendPropertyChanged("Num_NO");
|
||||
this.OnNum_NOChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Correction_Action", DbType="NVarChar(500)")]
|
||||
public string Correction_Action
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Correction_Action;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._Correction_Action != value))
|
||||
{
|
||||
this.OnCorrection_ActionChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._Correction_Action = value;
|
||||
this.SendPropertyChanged("Correction_Action");
|
||||
this.OnCorrection_ActionChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public event PropertyChangingEventHandler PropertyChanging;
|
||||
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
|
|
@ -430890,7 +430821,7 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuName", DbType="NVarChar(50)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuName", DbType="NVarChar(200)")]
|
||||
public string MenuName
|
||||
{
|
||||
get
|
||||
|
|
|
|||
Loading…
Reference in New Issue