shecs
/
Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PMI委托

This commit is contained in:
jackchenyang 2024-05-11 15:22:08 +08:00
parent 81f51e38be
commit 18b11605e1
17 changed files with 1540 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HJGL/.vs/HJGL/config/applicationhost.config
View File

@ -162,7 +162,7 @@
</site>
<site name="WebApi" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\WebApi" />
<virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\WebApi" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:3862:localhost" />

BIN
HJGL/.vs/HJGL/v17/.suo
View File

Binary file not shown.

9
HJGL/BLL/Common/Const.cs
View File

@ -527,12 +527,21 @@ namespace BLL
#endregion
#region PMI 处理
public const string PMIDelegationId = "A6FB44C3-0920-4F77-862F-D814FD5E5D23";
#endregion
#region 热处理/硬度委托
/// <summary>
/// 热处理委托及数据录入
/// </summary>
public const string HotProessTrustMenuId = "90579BE7-E38C-4CD2-A3BC-755169FF3BB2";
/// <summary>
/// 热处理反馈及硬度委托
/// </summary>

1
HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs
View File

@ -145,6 +145,7 @@ namespace BLL
newWeldJoint.PrepareTemp = weldJoint.PrepareTemp;
newWeldJoint.Electricity = weldJoint.Electricity;
newWeldJoint.Voltage = weldJoint.Voltage;
newWeldJoint.IsPMI= weldJoint.IsPMI;
newWeldJoint.TestPackageNo = weldJoint.TestPackageNo;
newWeldJoint.WeldingDailyCode = weldJoint.WeldingDailyCode;
newWeldJoint.BackingWelderId = weldJoint.BackingWelderId;

12
HJGL/DataBase/版本日志/BSFDB_2024-05-10.sql
View File

@ -1,4 +1,6 @@
create table PMI_Detections
use HJGLDB_ZJBSF
go
create table PMI_Delegation
(
Id nvarchar(50) not null primary key,
DelegationNo nvarchar(50) not null,
@ -10,7 +12,7 @@ create table PMI_Detections
CreatedTime datetime default getdate()
)
go
create table PMI_DetectionDetails
create table PMI_DelegationDetails
(
Id nvarchar(50) not null primary key,
PMIId nvarchar(50) not null,
@ -21,8 +23,10 @@ create table PMI_DetectionDetails
)
go
-- 管线焊工 增加是否 PMI处理
alter table Pipeline_WeldJoint add isPMI bit null
update Pipeline_WeldJoint set isPMI=0
-- 插入PMI委托菜单
insert into Sys_Menu values('A6FB44C3-0920-4F77-862F-D814FD5E5D23','PMI¼ì²â¹ÜÀí','PMI detection management','',21,0,3,NUll,1)
insert into Sys_Menu values(NEWID(),'PMIίÍÐ','PMI delegation','/WeldingProcess/PMI/PMIDelegation.aspx',0,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1)
insert into Sys_Menu values(NEWID(),'PMI¼ì²â¼Èë','PMI detection entry','/WeldingProcess/PMI/PMIDetectionEntry.aspx',0,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1)

117
HJGL/DataBase/版本日志/BSFDB_2024.05.11View_Pipeline_WeldJoint.sql Normal file
View File

@ -0,0 +1,117 @@
USE [HJGLDB_ZJBSF]
GO
/****** Object: View [dbo].[View_Pipeline_WeldJoint] Script Date: 2024-5-11 14:44:42 ******/
SET ANSI_NULLS ON
GO
SET QUOTED_IDENTIFIER ON
GO
ALTER VIEW [dbo].[View_Pipeline_WeldJoint]
AS
/************焊口信息视图*****************/
SELECT WeldJoint.WeldJointId,
WeldJoint.ProjectId,
WeldJoint.PipelineId,
WeldJoint.WeldJointCode,
dbo.Fun_GetParseInt(WeldJoint.WeldJointCode) AS ConvertWeldJoint,
WeldJoint.WeldTypeId,
WeldJoint.Material1Id,
WeldJoint.Material2Id,
WeldJoint.ANSISCH,
WeldJoint.Thickness,
WeldJoint.Dia,
WeldJoint.Size,
WeldJoint.JointAttribute,
WeldJoint.JointArea,
WeldJoint.WeldingMethodId,
WeldJoint.IsHotProess,
WeldJoint.WeldingLocationId,
WeldJoint.WeldMatId,
WeldJoint.WeldSilkId,
WeldJoint.GrooveTypeId,
WeldJoint.PipeSegment,
WeldJoint.PipeAssembly1Id,
WeldJoint.PipeAssembly2Id,
WeldJoint.PipeAssemblyCount,
WeldJoint.HeartNo1,
WeldJoint.HeartNo2,
WeldJoint.LastTemp,
WeldJoint.CellTemp,
WeldJoint.PrepareTemp,
WeldJoint.Electricity,
WeldJoint.SystemNumber,
WeldJoint.Remark,
WeldJoint.DoneDin,
WeldJoint.Voltage,
WeldJoint.TestPackageNo,
WeldJoint.WeldingDailyCode,
WeldJoint.WeldingDailyId,
WeldJoint.BackingWelderId,
WeldJoint.CoverWelderId,
WeldJoint.PipingClassId,
WeldJoint.Specification,
WeldJoint.CancelResult,
Project.ProjectCode,
Project.ProjectName,
Pipeline.PipelineCode,
Pipeline.InstallationId,
Pipeline.UnitId,
Pipeline.SingleNumber,
Pipeline.WorkAreaId,
WeldType.WeldTypeCode,
Material1.MaterialCode AS Material1Code,
Material2.MaterialCode AS Material2Code,
WeldingMethod.WeldingMethodCode,
WeldingLocation.WeldingLocationCode,
WeldMat.ConsumablesCode AS WeldMatCode,
--WeldSilk.ConsumablesCode AS WeldSilkCode,
'' AS WeldSilkCode,
GrooveType.GrooveTypeCode,
CASE WHEN WeldJoint.WeldingDailyId IS NULL THEN '否' ELSE '是' END AS Is_hjName,
CASE WHEN WeldJoint.IsHotProess=1 THEN '是' ELSE '否' END AS IsHotProessStr,
Components1.ComponentsCode AS ComponentsCode1,
Components2.ComponentsCode AS ComponentsCode2,
BackingWelder.WelderCode AS BackingWelderCode,
BackingWelder.WelderName AS BackingWelderName,
CoverWelder.WelderCode AS CoverWelderCode,
CoverWelder.WelderName AS CoverWelderName,
(CASE WHEN CoverWelder.WelderCode IS NOT NULL AND BackingWelder.WelderCode IS NOT NULL
THEN CoverWelder.WelderCode + '/' + BackingWelder.WelderCode
ELSE (ISNULL(CoverWelder.WelderCode,'') + ISNULL(BackingWelder.WelderCode,'')) END) AS WelderCode, --焊工
(CASE WHEN Material1.MaterialCode IS NOT NULL AND Material2.MaterialCode IS NOT NULL
THEN Material1.MaterialCode + '/' + Material2.MaterialCode
ELSE (ISNULL(Material1.MaterialCode,'') + ISNULL(Material2.MaterialCode,'')) END) AS MaterialCode, --材质
pipingClass.PipingClassCode,
CONVERT(VARCHAR(100), WeldingDaily.WeldingDate, 23) AS WeldingDate,
WeldJoint.IsCancel,
WeldJoint.IsPMI,
WeldJoint.IsGoldJoint,
WeldJoint.WPQId,wps.WPQCode,
WeldJoint.DetectionType,
WeldJoint.PageNum
FROM Pipeline_WeldJoint AS WeldJoint
LEFT JOIN Base_Project AS Project ON Project.ProjectId=WeldJoint.ProjectId
LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId = WeldJoint.PipelineId
LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=WeldJoint.WeldTypeId
LEFT JOIN Base_Material AS Material1 ON Material1.MaterialId = WeldJoint.Material1Id
LEFT JOIN Base_Material AS Material2 ON Material2.MaterialId = WeldJoint.Material2Id
LEFT JOIN Base_WeldingMethod AS WeldingMethod ON WeldingMethod.WeldingMethodId=WeldJoint.WeldingMethodId
LEFT JOIN Base_WeldingLocation AS WeldingLocation ON WeldingLocation.WeldingLocationId=WeldJoint.WeldingLocationId
LEFT JOIN Base_Consumables AS WeldMat ON WeldMat.ConsumablesId=WeldJoint.WeldMatId
--LEFT JOIN Base_Consumables AS WeldSilk ON WeldSilk.ConsumablesId=WeldJoint.WeldSilkId
LEFT JOIN Base_GrooveType AS GrooveType ON GrooveType.GrooveTypeId=WeldJoint.GrooveTypeId
LEFT JOIN Base_Components AS Components1 ON Components1.ComponentsId = WeldJoint.PipeAssembly1Id
LEFT JOIN Base_Components AS Components2 ON Components2.ComponentsId = WeldJoint.PipeAssembly2Id
LEFT JOIN Welder_Welder AS BackingWelder ON BackingWelder.WelderId=WeldJoint.BackingWelderId
LEFT JOIN Welder_Welder AS CoverWelder ON CoverWelder.WelderId=WeldJoint.CoverWelderId
LEFT JOIN Pipeline_WeldingDaily AS WeldingDaily ON WeldingDaily.WeldingDailyId=WeldJoint.WeldingDailyId
LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId=WeldJoint.PipingClassId
LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId=WeldJoint.WPQId
GO

27
HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs generated
View File

@ -1221,6 +1221,15 @@ namespace Resources {
}
}
/// <summary>
/// 查找类似 检测日期 的本地化字符串。
/// </summary>
internal static string DelegationDate {
get {
return ResourceManager.GetString("DelegationDate", resourceCulture);
}
}
/// <summary>
/// 查找类似 删除 的本地化字符串。
/// </summary>
@ -1419,6 +1428,24 @@ namespace Resources {
}
}
/// <summary>
/// 查找类似 检测方法 的本地化字符串。
/// </summary>
internal static string DetectionMethod {
get {
return ResourceManager.GetString("DetectionMethod", resourceCulture);
}
}
/// <summary>
/// 查找类似 检测标准 的本地化字符串。
/// </summary>
internal static string DetectionStandard {
get {
return ResourceManager.GetString("DetectionStandard", resourceCulture);
}
}
/// <summary>
/// 查找类似 寸径 的本地化字符串。
/// </summary>

9
HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx
View File

@ -2106,4 +2106,13 @@
<data name="HomePage" xml:space="preserve">
<value>首页</value>
</data>
<data name="DelegationDate" xml:space="preserve">
<value>检测日期</value>
</data>
<data name="DetectionMethod" xml:space="preserve">
<value>检测方法</value>
</data>
<data name="DetectionStandard" xml:space="preserve">
<value>检测标准</value>
</data>
</root>

9
HJGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -395,6 +395,7 @@
<Content Include="WeldingProcess\CheckManage\SeeFilm.aspx" />
<Content Include="WeldingProcess\DataIn\DataIn.aspx" />
<Content Include="WeldingProcess\DataIn\DataInEdit.aspx" />
<Content Include="WeldingProcess\PMI\PMIDelegation.aspx" />
<Content Include="WeldingProcess\TestPackageManage\AItemEndCheck.aspx" />
<Content Include="WeldingProcess\TestPackageManage\BItemEndCheck.aspx" />
<Content Include="WeldingProcess\TestPackageManage\TestPackageManageAudit.aspx" />
@ -4445,6 +4446,13 @@
<Compile Include="WeldingProcess\DataIn\DataInEdit.aspx.designer.cs">
<DependentUpon>DataInEdit.aspx</DependentUpon>
</Compile>
<Compile Include="WeldingProcess\PMI\PMIDelegation.aspx.cs">
<DependentUpon>PMIDelegation.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WeldingProcess\PMI\PMIDelegation.aspx.designer.cs">
<DependentUpon>PMIDelegation.aspx</DependentUpon>
</Compile>
<Compile Include="WeldingProcess\TestPackageManage\AItemEndCheck.aspx.cs">
<DependentUpon>AItemEndCheck.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -4856,7 +4864,6 @@
<Folder Include="File\" />
<Folder Include="res\js\" />
<Folder Include="upload\" />
<Folder Include="WeldingProcess\PMI\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BLL\BLL.csproj">

34
HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -11,5 +11,37 @@
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
</PropertyGroup>
<ProjectExtensions />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>Login.aspx</StartPageUrl>
<StartAction>SpecificPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>
<StartExternalURL>
</StartExternalURL>
<StartCmdLineArguments>
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>True</EnableENC>
<AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
<UseIIS>True</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:57613/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
</CustomServerUrl>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>

195
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx Normal file
View File

@ -0,0 +1,195 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PMIDelegation.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.PMI.PMIDelegation" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>热处理委托及数据录入</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="320px" Title="<%$ Resources:Lan,HotProessTrust %>"
ShowBorder="true" Layout="VBox" ShowHeader="false" AutoScroll="true" BodyPadding="5px"
IconFont="ArrowCircleLeft">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtSearchNo" runat="server" EmptyText="<%$ Resources:Lan,EnterQueryConditions %>"
AutoPostBack="true" Label="<%$ Resources:Lan,RequestSheetNumber %>" LabelWidth="100px"
OnTextChanged="Tree_TextChanged" Width="300px" LabelAlign="Right">
</f:TextBox>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Title="PMI委托节点树" OnNodeCommand="tvControlItem_NodeCommand"
Height="470px" runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true"
AutoLeafIdentification="true" EnableSingleExpand="true" EnableTextSelection="true">
</f:Tree>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="<%$ Resources:Lan,HotProessTrust %>"
TitleToolTip="<%$ Resources:Lan,HotProessTrust %>" AutoScroll="true">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:HiddenField runat="server" ID="Id">
</f:HiddenField>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnNew" Text="<%$ Resources:Lan,Add %>" ToolTip="<%$ Resources:Lan,Add %>"
Icon="Add" runat="server" OnClick="btnNew_Click">
</f:Button>
<f:Button ID="btnEdit" Text="<%$ Resources:Lan,Edit %>" ToolTip="<%$ Resources:Lan,Edit %>"
Icon="TableEdit" runat="server" OnClick="btnEdit_Click">
</f:Button>
<f:Button ID="btnDelete" Text="<%$ Resources:Lan,Delete %>" ToolTip="<%$ Resources:Lan,Delete %>"
ConfirmText="<%$ Resources:Lan,DeleteHotProessTrust %>" ConfirmTarget="Top" Icon="Delete"
runat="server" OnClick="btnDelete_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Form ID="SimpleForm1" ShowBorder="true" ShowHeader="false" AutoScroll="true" BodyPadding="10px"
runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:Label ID="txtDelegationNo" Label="<%$ Resources:Lan,RequestSheetNumber %>"
runat="server" LabelAlign="Right" LabelWidth="170px">
</f:Label>
<f:Label ID="txtDelegationDate" Label="<%$ Resources:Lan,DelegationDate %>" runat="server"
LabelAlign="Right" LabelWidth="170px">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="txtInstallationName" Label="<%$ Resources:Lan,InstallationName %>" runat="server"
LabelAlign="Right" LabelWidth="170px">
</f:Label>
<f:Label ID="txtUnitName" Label="<%$ Resources:Lan,UnitName %>" runat="server" LabelAlign="Right"
LabelWidth="170px">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="txtDetectionMethod" Label="<%$ Resources:Lan,DetectionMethod %>" runat="server"
LabelAlign="Right" LabelWidth="170px">
</f:Label>
<f:Label ID="txtDetectionStandard" Label="<%$ Resources:Lan,DetectionStandard %>" runat="server"
LabelAlign="Right" LabelWidth="170px">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="txtTabler" Label="<%$ Resources:Lan,Lister %>" runat="server" LabelAlign="Right"
LabelWidth="170px">
</f:Label>
<f:Label ID="txtRemark" Label="<%$ Resources:Lan,Remark %>" runat="server" LabelAlign="Right"
LabelWidth="170px">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="<%$ Resources:Lan,HotProessTrust %>"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="HotProessTrustItemId"
AllowCellEditing="true" AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2"
DataIDField="HotProessTrustItemId" AllowSorting="true" SortField="PipelineCode,WeldJointCode"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" ToolbarAlign="Right" runat="server">
<Items>
<f:TextBox ID="txtIsoNo" Label="<%$ Resources:Lan,PipelineCode %>" runat="server"
LabelWidth="120px" LabelAlign="Right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
</f:TextBox>
<f:ToolbarFill ID="ToolbarFill2" runat="server">
</f:ToolbarFill>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="<%$ Resources:Lan,SerialNumber %>"
Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="<%$ Resources:Lan,PipelineCode %>" ColumnID="PipelineCode"
DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="220px" Locked="true">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,WeldingJointNumber %>" ColumnID="WeldJointCode"
DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="90px" Locked="true">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,Specifications %>" ColumnID="Specification"
DataField="Specification" SortField="Specification" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="170px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,MaterialSpecificationCode %>" ColumnID="MaterialCode"
DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,TrustDate %>" ColumnID="ProessDate"
DataField="ProessDate" SortField="ProessDate" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
<f:Listener Event="dataload" Handler="onGridDataLoad" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="<%$ Resources:Lan,NumberOfRecordsPerPage %>">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="<%$ Resources:Lan,PopForm %>" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Top" EnableResize="true" runat="server" OnClose="Window1_Close"
IsModal="true" Width="1090px" Height="660px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuHotProessReport" OnClick="btnMenuHotProessReport_Click"
EnablePostBack="true" Icon="Pencil" ConfirmTarget="Top" runat="server" Text="<%$ Resources:Lan,PWHTReport %>">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
// 返回false，来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
function onGridDataLoad(event) {
this.mergeColumns(['PipelineCode']);
this.mergeColumns(['WeldJointCode']);
}
</script>
</body>
</html>

406
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs Normal file
View File

@ -0,0 +1,406 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Data;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.WeldingProcess.PMI
{
public partial class PMIDelegation : PageBase
{
#region 定义项
/// <summary>
/// PMI委托主键
/// </summary>
public string PMIDelegationId
{
get
{
return (string)ViewState["PMIDelegationId"];
}
set
{
ViewState["PMIDelegationId"] = value;
}
}
#endregion
#region 加载页面
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.PMIDelegationId = string.Empty;
this.InitTreeMenu();//加载树
}
}
#endregion
#region 加载树
/// <summary>
/// 加载树
/// </summary>
private void InitTreeMenu()
{
string projectName = string.Empty;
var pro = BLL.Base_ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
if (pro != null)
{
this.tvControlItem.Nodes.Clear();
TreeNode rootNode = new TreeNode();
rootNode.Text = "[" + pro.ProjectCode + "]" + pro.ProjectName;
rootNode.NodeID = "0";
rootNode.Expanded = true;
rootNode.EnableClickEvent = true;
this.tvControlItem.Nodes.Add(rootNode);
List<Model.PMI_Delegation> trustLists = new List<Model.PMI_Delegation>(); ///PMI委托单
if (!string.IsNullOrEmpty(this.txtSearchNo.Text.Trim()))
{
trustLists = (from x in Funs.DB.PMI_Delegation where x.ProjectId == CurrUser.LoginProjectId && x.DelegationNo.Contains(this.txtSearchNo.Text.Trim()) orderby x.DelegationNo select x).ToList();
}
else
{
trustLists = (from x in Funs.DB.PMI_Delegation where x.ProjectId == CurrUser.LoginProjectId orderby x.DelegationNo select x).ToList();
}
this.BindNodes(rootNode, trustLists);
}
}
#endregion
#region 绑定树节点
/// <summary>
/// 绑定树节点
/// </summary>
/// <param name="node"></param>
private void BindNodes(TreeNode node, List<Model.PMI_Delegation> trustList)
{
foreach (var item in trustList)
{
TreeNode newNode = new TreeNode();
newNode.Text = item.DelegationNo;
newNode.NodeID = item.Id;
newNode.ToolTip = item.DelegationNo;
newNode.CommandName = Resources.Lan.RequestSheetNumber;
newNode.EnableClickEvent = true;
node.Nodes.Add(newNode);
}
}
#endregion
#region 点击TreeView
/// <summary>
/// 点击TreeView
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
{
if (this.tvControlItem.SelectedNodeID != "0")
{
this.PMIDelegationId = tvControlItem.SelectedNodeID;
this.BindGrid();
}
}
#endregion
#region DropDownList下拉选择事件
/// <summary>
/// 项目下拉选择事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
{
this.InitTreeMenu();
}
#endregion
#region 数据绑定
/// <summary>
/// 数据绑定
/// </summary>
private void BindGrid()
{
string strSql = string.Empty;
List<SqlParameter> listStr = new List<SqlParameter>();
this.SetTextTemp();
this.PageInfoLoad(); ///页面输入提交信息
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
{
var result = Funs.DB.PMI_Delegation.FirstOrDefault(t=>t.Id==this.tvControlItem.SelectedNodeID);
if (result != null)
{
this.PMIDelegationId = result.Id;
strSql = @"SELECT * "
+ @" FROM dbo.View_HotProess_TrustItem AS Trust"
+ @" WHERE Trust.ProjectId= @ProjectId AND Trust.HotProessTrustId=@HotProessTrustId ";
listStr.Add(new SqlParameter("@ProjectId", result != null ? result.ProjectId : this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@HotProessTrustId", this.PMIDelegationId));
if (!string.IsNullOrEmpty(this.txtIsoNo.Text.Trim()))
{
strSql += @" and Trust.PipelineCode like '%'+@PipelineCode+'%' ";
listStr.Add(new SqlParameter("@PipelineCode", this.txtIsoNo.Text.Trim()));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
// 2.获取当前分页数据
//var table = this.GetPagedDataTable(Grid1, tb1);
Grid1.RecordCount = tb.Rows.Count;
//tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
}
}
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void TextBox_TextChanged(object sender, EventArgs e)
{
this.BindGrid();
}
#region 加载页面输入提交信息
/// <summary>
/// 加载页面输入提交信息
/// </summary>
private void PageInfoLoad()
{
var trust =Funs.DB.PMI_Delegation.FirstOrDefault(t=>t.Id==this.PMIDelegationId);
if (trust != null)
{
this.txtDelegationNo.Text = trust.DelegationNo;
if (trust.DelegationDate.HasValue)
{
this.txtDelegationDate.Text = string.Format("{0:yyyy-MM-dd}", trust.DelegationDate);
}
if (!string.IsNullOrEmpty(trust.InstallationId))
{
this.txtInstallationName.Text = BLL.Project_InstallationService.GetProject_InstallationNameByInstallationId(trust.InstallationId);
}
if (!string.IsNullOrEmpty(trust.UnitId))
{
this.txtUnitName.Text = BLL.Base_UnitService.GetUnitNameByUnitId(trust.UnitId);
}
this.txtDetectionMethod.Text = "PMI光谱分析";
this.txtDetectionStandard.Text = trust.DetectionStandard;
if (!string.IsNullOrEmpty(trust.Tabler))
{
this.txtTabler.Text = BLL.Sys_UserService.GetUserNameByUserId(trust.Tabler);
}
this.txtRemark.Text = trust.Remark;
}
}
#endregion
#region 清空文本
/// <summary>
/// 清空文本
/// </summary>
private void SetTextTemp()
{
this.txtDelegationNo.Text = string.Empty;
this.txtDelegationDate.Text = string.Empty;
this.txtInstallationName.Text = string.Empty;
this.txtUnitName.Text = string.Empty;
this.txtDetectionMethod.Text = string.Empty;
this.txtDetectionStandard.Text = string.Empty;
this.txtTabler.Text = string.Empty;
this.txtRemark.Text = string.Empty;
}
#endregion
#endregion
#region 分页排序
#region 页索引改变事件
/// <summary>
/// 页索引改变事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
#endregion
#region 排序
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
BindGrid();
}
#endregion
#region 分页选择下拉改变事件
/// <summary>
/// 分页选择下拉改变事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
#endregion
#endregion
#region PMI委托 维护事件
/// <summary>
/// 增加PMI委托
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnNew_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationId, Const.BtnAdd))
{
this.SetTextTemp();
string window = String.Format("PMIDelegationEdit.aspx?PMIDelegationId={0}", string.Empty, "新增 - ");
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.PMIDelegationId)
+ Window1.GetShowReference(window));
}
else
{
ShowNotify(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning);
}
}
#region 编辑PMI委托
/// <summary>
/// 编辑PMI委托
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnEdit_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HotProessTrustMenuId, Const.BtnSave))
{
var trustManage = Funs.DB.PMI_Delegation.FirstOrDefault (t=>t.Id==this.PMIDelegationId);
if (trustManage != null)
{
string window = String.Format("HotProessTrustEdit.aspx?HotProessTrustId={0}", this.PMIDelegationId, "编辑 - ");
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.PMIDelegationId)
+ Window1.GetShowReference(window));
}
else
{
ShowNotify(Resources.Lan.PleaseSelectModifyHotProessTrust, MessageBoxIcon.Warning);
}
}
else
{
ShowNotify(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning);
}
}
#endregion
#region 删除PMI委托
/// <summary>
/// 删除PMI委托
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnDelete_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationId, Const.BtnDelete))
{
var trustManage =Funs.DB.PMI_Delegation.FirstOrDefault (t=>t.Id==this.PMIDelegationId);
if (trustManage != null)
{
//删除主表数据
Funs.DB.PMI_Delegation.DeleteOnSubmit(trustManage);
//删除 明细表
Funs.DB.SubmitChanges();
Alert.ShowInTop(Resources.Lan.DeletedSuccessfully, MessageBoxIcon.Success);
this.InitTreeMenu();
SetTextTemp();
this.Grid1.DataSource = null;
this.Grid1.DataBind();
}
else
{
ShowNotify(Resources.Lan.PleaseSelectDeleteHotProessTrust, MessageBoxIcon.Warning);
}
}
else
{
ShowNotify(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning);
return;
}
}
#endregion
#endregion
#region 关闭弹出窗口及刷新页面
/// <summary>
/// 关闭弹出窗口
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
this.InitTreeMenu();
this.BindGrid();
}
#region 查询
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Tree_TextChanged(object sender, EventArgs e)
{
this.InitTreeMenu();
}
#endregion
#endregion
#region 右键编辑热处理报告
/// <summary>
/// 热处理报告
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuHotProessReport_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HotProessTrustMenuId, Const.BtnSave))
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HotProessReport.aspx?HotProessTrustItemId={0}", this.Grid1.SelectedRowID, "编辑热处理报告 - ")));
}
else
{
Alert.ShowInTop(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning);
}
}
#endregion
}
}

314
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,314 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.PMI
{
public partial class PMIDelegation
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtSearchNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSearchNo;
/// <summary>
/// tvControlItem 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvControlItem;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// Id 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField Id;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnNew 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnEdit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnEdit;
/// <summary>
/// btnDelete 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDelete;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtDelegationNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtDelegationNo;
/// <summary>
/// txtDelegationDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtDelegationDate;
/// <summary>
/// txtInstallationName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtInstallationName;
/// <summary>
/// txtUnitName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtUnitName;
/// <summary>
/// txtDetectionMethod 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtDetectionMethod;
/// <summary>
/// txtDetectionStandard 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtDetectionStandard;
/// <summary>
/// txtTabler 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTabler;
/// <summary>
/// txtRemark 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtRemark;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// txtIsoNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtIsoNo;
/// <summary>
/// ToolbarFill2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill2;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuHotProessReport 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuHotProessReport;
}
}

6
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx
View File

@ -137,11 +137,13 @@
<f:CheckBox ID="ckbIsGoldJoint" runat="server" Label="是否黄金口" LabelWidth="130px"></f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="25% 25% 50% ">
<f:FormRow ColumnWidths="25% 15% 15% 35% ">
<Items>
<f:DropDownList ID="drpNDTType" runat="server" Label="可能探伤类型" LabelWidth="130px" EnableMultiSelect="true" ShowRedStar="true" Required="true"></f:DropDownList>
<f:CheckBox ID="ckbIsCancel" runat="server" Label="是否取消" LabelWidth="130px" ></f:CheckBox>
<f:CheckBox ID="ckbIsPMI" runat="server" Label="是否PMI处理" LabelWidth="110px" Width="80px" ></f:CheckBox>
<f:CheckBox ID="ckbIsCancel" runat="server" Label="是否取消" LabelWidth="80px" Width="80px" ></f:CheckBox>
<f:TextBox ID="txtCancelResult" runat="server" Label="取消原因" LabelWidth="130px" Width="160px"></f:TextBox>
<f:Button ID="btnCancel" Text="取消" ToolTip="如已发生业务可取消，取消时请说明原因，如未发生业务可直接删除！" runat="server"
OnClick="btnCancel_Click">

4
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs
View File

@ -329,6 +329,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
this.drpIsHotProess.SelectedValue = BLL.Const._False;
}
//是否PMI处理
ckbIsPMI.Checked = (jointInfo.IsPMI.HasValue && jointInfo.IsPMI.Value) ? true : false;
if (jointInfo.IsCancel == true)
{
@ -501,6 +503,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
newJointInfo.IsCancel = true;
}
//是否PMI处理
newJointInfo.IsPMI = ckbIsPMI.Checked;
if (ckbIsGoldJoint.Checked == true)
{

15
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.WeldingManage {
namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
public partial class JointInfoEdit {
public partial class JointInfoEdit
{
/// <summary>
/// form1 控件。
@ -327,6 +329,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// </remarks>
protected global::FineUIPro.DropDownList drpNDTType;
/// <summary>
/// ckbIsPMI 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsPMI;
/// <summary>
/// ckbIsCancel 控件。
/// </summary>

576
HJGL/Model/Model.cs
View File

@ -173,12 +173,12 @@ namespace Model
partial void InsertPipeline_WeldJoint(Pipeline_WeldJoint instance);
partial void UpdatePipeline_WeldJoint(Pipeline_WeldJoint instance);
partial void DeletePipeline_WeldJoint(Pipeline_WeldJoint instance);
partial void InsertPMI_DetectionDetails(PMI_DetectionDetails instance);
partial void UpdatePMI_DetectionDetails(PMI_DetectionDetails instance);
partial void DeletePMI_DetectionDetails(PMI_DetectionDetails instance);
partial void InsertPMI_Detections(PMI_Detections instance);
partial void UpdatePMI_Detections(PMI_Detections instance);
partial void DeletePMI_Detections(PMI_Detections instance);
partial void InsertPMI_Delegation(PMI_Delegation instance);
partial void UpdatePMI_Delegation(PMI_Delegation instance);
partial void DeletePMI_Delegation(PMI_Delegation instance);
partial void InsertPMI_DelegationDetails(PMI_DelegationDetails instance);
partial void UpdatePMI_DelegationDetails(PMI_DelegationDetails instance);
partial void DeletePMI_DelegationDetails(PMI_DelegationDetails instance);
partial void InsertProject_Installation(Project_Installation instance);
partial void UpdateProject_Installation(Project_Installation instance);
partial void DeleteProject_Installation(Project_Installation instance);
@ -670,19 +670,19 @@ namespace Model
}
}
public System.Data.Linq.Table<PMI_DetectionDetails> PMI_DetectionDetails
public System.Data.Linq.Table<PMI_Delegation> PMI_Delegation
{
get
{
return this.GetTable<PMI_DetectionDetails>();
return this.GetTable<PMI_Delegation>();
}
}
public System.Data.Linq.Table<PMI_Detections> PMI_Detections
public System.Data.Linq.Table<PMI_DelegationDetails> PMI_DelegationDetails
{
get
{
return this.GetTable<PMI_Detections>();
return this.GetTable<PMI_DelegationDetails>();
}
}
@ -19375,6 +19375,8 @@ namespace Model
private string _ANSISCH;
private System.Nullable<bool> _IsPMI;
private EntitySet<Batch_BatchTrustItem> _Batch_BatchTrustItem;
private EntitySet<Batch_PointBatchItem> _Batch_PointBatchItem;
@ -19513,6 +19515,8 @@ namespace Model
partial void OnPageNumChanged();
partial void OnANSISCHChanging(string value);
partial void OnANSISCHChanged();
partial void OnIsPMIChanging(System.Nullable<bool> value);
partial void OnIsPMIChanged();
#endregion
public Pipeline_WeldJoint()
@ -20547,6 +20551,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="isPMI", Storage="_IsPMI", DbType="Bit")]
public System.Nullable<bool> IsPMI
{
get
{
return this._IsPMI;
}
set
{
if ((this._IsPMI != value))
{
this.OnIsPMIChanging(value);
this.SendPropertyChanging();
this._IsPMI = value;
this.SendPropertyChanged("IsPMI");
this.OnIsPMIChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Batch_BatchTrustItem_Pipeline_WeldJoint", Storage="_Batch_BatchTrustItem", ThisKey="WeldJointId", OtherKey="WeldJointId", DeleteRule="NO ACTION")]
public EntitySet<Batch_BatchTrustItem> Batch_BatchTrustItem
{
@ -21151,8 +21175,286 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PMI_DetectionDetails")]
public partial class PMI_DetectionDetails : INotifyPropertyChanging, INotifyPropertyChanged
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PMI_Delegation")]
public partial class PMI_Delegation : INotifyPropertyChanging, INotifyPropertyChanged
{
private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
private string _Id;
private string _DelegationNo;
private System.Nullable<System.DateTime> _DelegationDate;
private string _ProjectId;
private string _InstallationId;
private string _UnitId;
private string _DetectionStandard;
private string _Remark;
private System.Nullable<System.DateTime> _CreatedTime;
private string _Tabler;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
partial void OnCreated();
partial void OnIdChanging(string value);
partial void OnIdChanged();
partial void OnDelegationNoChanging(string value);
partial void OnDelegationNoChanged();
partial void OnDelegationDateChanging(System.Nullable<System.DateTime> value);
partial void OnDelegationDateChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
partial void OnInstallationIdChanging(string value);
partial void OnInstallationIdChanged();
partial void OnUnitIdChanging(string value);
partial void OnUnitIdChanged();
partial void OnDetectionStandardChanging(string value);
partial void OnDetectionStandardChanged();
partial void OnRemarkChanging(string value);
partial void OnRemarkChanged();
partial void OnCreatedTimeChanging(System.Nullable<System.DateTime> value);
partial void OnCreatedTimeChanged();
partial void OnTablerChanging(string value);
partial void OnTablerChanged();
#endregion
public PMI_Delegation()
{
OnCreated();
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
public string Id
{
get
{
return this._Id;
}
set
{
if ((this._Id != value))
{
this.OnIdChanging(value);
this.SendPropertyChanging();
this._Id = value;
this.SendPropertyChanged("Id");
this.OnIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DelegationNo", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
public string DelegationNo
{
get
{
return this._DelegationNo;
}
set
{
if ((this._DelegationNo != value))
{
this.OnDelegationNoChanging(value);
this.SendPropertyChanging();
this._DelegationNo = value;
this.SendPropertyChanged("DelegationNo");
this.OnDelegationNoChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DelegationDate", DbType="DateTime")]
public System.Nullable<System.DateTime> DelegationDate
{
get
{
return this._DelegationDate;
}
set
{
if ((this._DelegationDate != value))
{
this.OnDelegationDateChanging(value);
this.SendPropertyChanging();
this._DelegationDate = value;
this.SendPropertyChanged("DelegationDate");
this.OnDelegationDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
public string ProjectId
{
get
{
return this._ProjectId;
}
set
{
if ((this._ProjectId != value))
{
this.OnProjectIdChanging(value);
this.SendPropertyChanging();
this._ProjectId = value;
this.SendPropertyChanged("ProjectId");
this.OnProjectIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="NVarChar(50)")]
public string InstallationId
{
get
{
return this._InstallationId;
}
set
{
if ((this._InstallationId != value))
{
this.OnInstallationIdChanging(value);
this.SendPropertyChanging();
this._InstallationId = value;
this.SendPropertyChanged("InstallationId");
this.OnInstallationIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
public string UnitId
{
get
{
return this._UnitId;
}
set
{
if ((this._UnitId != value))
{
this.OnUnitIdChanging(value);
this.SendPropertyChanging();
this._UnitId = value;
this.SendPropertyChanged("UnitId");
this.OnUnitIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DetectionStandard", DbType="NVarChar(50)")]
public string DetectionStandard
{
get
{
return this._DetectionStandard;
}
set
{
if ((this._DetectionStandard != value))
{
this.OnDetectionStandardChanging(value);
this.SendPropertyChanging();
this._DetectionStandard = value;
this.SendPropertyChanged("DetectionStandard");
this.OnDetectionStandardChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(255)")]
public string Remark
{
get
{
return this._Remark;
}
set
{
if ((this._Remark != value))
{
this.OnRemarkChanging(value);
this.SendPropertyChanging();
this._Remark = value;
this.SendPropertyChanged("Remark");
this.OnRemarkChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")]
public System.Nullable<System.DateTime> CreatedTime
{
get
{
return this._CreatedTime;
}
set
{
if ((this._CreatedTime != value))
{
this.OnCreatedTimeChanging(value);
this.SendPropertyChanging();
this._CreatedTime = value;
this.SendPropertyChanged("CreatedTime");
this.OnCreatedTimeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Tabler", DbType="NVarChar(50)")]
public string Tabler
{
get
{
return this._Tabler;
}
set
{
if ((this._Tabler != value))
{
this.OnTablerChanging(value);
this.SendPropertyChanging();
this._Tabler = value;
this.SendPropertyChanged("Tabler");
this.OnTablerChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
protected virtual void SendPropertyChanging()
{
if ((this.PropertyChanging != null))
{
this.PropertyChanging(this, emptyChangingEventArgs);
}
}
protected virtual void SendPropertyChanged(String propertyName)
{
if ((this.PropertyChanged != null))
{
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PMI_DelegationDetails")]
public partial class PMI_DelegationDetails : INotifyPropertyChanging, INotifyPropertyChanged
{
private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
@ -21187,7 +21489,7 @@ namespace Model
partial void OnCreatedTimeChanged();
#endregion
public PMI_DetectionDetails()
public PMI_DelegationDetails()
{
OnCreated();
}
@ -21333,236 +21635,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PMI_Detections")]
public partial class PMI_Detections : INotifyPropertyChanging, INotifyPropertyChanged
{
private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
private string _Id;
private string _DelegationNo;
private System.Nullable<System.DateTime> _DelegationDate;
private string _InstallationId;
private string _UnitId;
private string _DetectionStandard;
private string _Remark;
private System.Nullable<System.DateTime> _CreatedTime;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
partial void OnCreated();
partial void OnIdChanging(string value);
partial void OnIdChanged();
partial void OnDelegationNoChanging(string value);
partial void OnDelegationNoChanged();
partial void OnDelegationDateChanging(System.Nullable<System.DateTime> value);
partial void OnDelegationDateChanged();
partial void OnInstallationIdChanging(string value);
partial void OnInstallationIdChanged();
partial void OnUnitIdChanging(string value);
partial void OnUnitIdChanged();
partial void OnDetectionStandardChanging(string value);
partial void OnDetectionStandardChanged();
partial void OnRemarkChanging(string value);
partial void OnRemarkChanged();
partial void OnCreatedTimeChanging(System.Nullable<System.DateTime> value);
partial void OnCreatedTimeChanged();
#endregion
public PMI_Detections()
{
OnCreated();
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
public string Id
{
get
{
return this._Id;
}
set
{
if ((this._Id != value))
{
this.OnIdChanging(value);
this.SendPropertyChanging();
this._Id = value;
this.SendPropertyChanged("Id");
this.OnIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DelegationNo", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
public string DelegationNo
{
get
{
return this._DelegationNo;
}
set
{
if ((this._DelegationNo != value))
{
this.OnDelegationNoChanging(value);
this.SendPropertyChanging();
this._DelegationNo = value;
this.SendPropertyChanged("DelegationNo");
this.OnDelegationNoChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DelegationDate", DbType="DateTime")]
public System.Nullable<System.DateTime> DelegationDate
{
get
{
return this._DelegationDate;
}
set
{
if ((this._DelegationDate != value))
{
this.OnDelegationDateChanging(value);
this.SendPropertyChanging();
this._DelegationDate = value;
this.SendPropertyChanged("DelegationDate");
this.OnDelegationDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="NVarChar(50)")]
public string InstallationId
{
get
{
return this._InstallationId;
}
set
{
if ((this._InstallationId != value))
{
this.OnInstallationIdChanging(value);
this.SendPropertyChanging();
this._InstallationId = value;
this.SendPropertyChanged("InstallationId");
this.OnInstallationIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
public string UnitId
{
get
{
return this._UnitId;
}
set
{
if ((this._UnitId != value))
{
this.OnUnitIdChanging(value);
this.SendPropertyChanging();
this._UnitId = value;
this.SendPropertyChanged("UnitId");
this.OnUnitIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DetectionStandard", DbType="NVarChar(50)")]
public string DetectionStandard
{
get
{
return this._DetectionStandard;
}
set
{
if ((this._DetectionStandard != value))
{
this.OnDetectionStandardChanging(value);
this.SendPropertyChanging();
this._DetectionStandard = value;
this.SendPropertyChanged("DetectionStandard");
this.OnDetectionStandardChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(255)")]
public string Remark
{
get
{
return this._Remark;
}
set
{
if ((this._Remark != value))
{
this.OnRemarkChanging(value);
this.SendPropertyChanging();
this._Remark = value;
this.SendPropertyChanged("Remark");
this.OnRemarkChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")]
public System.Nullable<System.DateTime> CreatedTime
{
get
{
return this._CreatedTime;
}
set
{
if ((this._CreatedTime != value))
{
this.OnCreatedTimeChanging(value);
this.SendPropertyChanging();
this._CreatedTime = value;
this.SendPropertyChanged("CreatedTime");
this.OnCreatedTimeChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
protected virtual void SendPropertyChanging()
{
if ((this.PropertyChanging != null))
{
this.PropertyChanging(this, emptyChangingEventArgs);
}
}
protected virtual void SendPropertyChanged(String propertyName)
{
if ((this.PropertyChanged != null))
{
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Project_Installation")]
public partial class Project_Installation : INotifyPropertyChanging, INotifyPropertyChanged
{
@ -39304,6 +39376,8 @@ namespace Model
private System.Nullable<bool> _IsCancel;
private System.Nullable<bool> _IsPMI;
private System.Nullable<bool> _IsGoldJoint;
private string _WPQId;
@ -40438,6 +40512,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsPMI", DbType="Bit")]
public System.Nullable<bool> IsPMI
{
get
{
return this._IsPMI;
}
set
{
if ((this._IsPMI != value))
{
this._IsPMI = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsGoldJoint", DbType="Bit")]
public System.Nullable<bool> IsGoldJoint
{