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

122121

This commit is contained in:
李云虎 2024-05-12 17:07:09 +08:00
parent d345661710 f3fdbebb09
commit a7785913cc
24 changed files with 643 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CreateModel.bat
View File

@ -25,9 +25,9 @@ REM --------------
@echo 设置.net控制台环境
@echo.
@call "%VS150%"
@call "%VS100COMNTOOLS%"vsvars32.bat
SqlMetal /views /server:. /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
SqlMetal /views /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
@ECHO 完成
pause

76
DataBase/版本日志/HJGLDB_2024.05.12.sql
View File

@ -1,3 +1,8 @@
-- 管线焊工 增加是否 PMI处理
alter table Pipeline_WeldJoint add isPMI bit NULL
GO
update Pipeline_WeldJoint set isPMI=0
GO
ALTER VIEW [dbo].[View_Pipeline_WeldJoint]
AS
@ -77,6 +82,7 @@ CoverWelder.WelderName AS CoverWelderName,
pipingClass.PipingClassCode,pip.PIPClassCode,
CONVERT(VARCHAR(100), WeldingDaily.WeldingDate, 23) AS WeldingDate,
WeldJoint.IsCancel,
WeldJoint.IsPMI,
WeldJoint.IsGoldJoint,
WeldJoint.WPQId,wps.WPQCode,
WeldJoint.DetectionType,
@ -201,7 +207,6 @@ FROM Pipeline_WeldJoint AS weldJoint
GO
UPDATE dbo.Template_Files SET title=REPLACE(title,cast(sortindex as nvarchar(50))+'-','')
GO
@ -212,4 +217,73 @@ INSERT INTO [dbo].[Template_Files]([id],[title],[filePath],[SortIndex])
VALUES('95125974-3DD4-4E16-B4F0-A9D9C9A1406D','밗돛보쌈쌈庫PMI쇱꿎궐절횅훰깊','',25)
GO
-- PMI处理委托
create table PMI_Delegation
(
Id nvarchar(50) not null primary key,
DelegationNo nvarchar(50) not null,
DelegationDate datetime,
ProjectId nvarchar(50) not null,
InstallationId nvarchar(50),
UnitId nvarchar(50),
DetectionStandard nvarchar(50),
Tabler nvarchar(50),
Remark nvarchar(255),
CreatedTime datetime default getdate()
)
go
---- PMI处理委托 明细
create table PMI_DelegationDetails
(
Id nvarchar(50) not null primary key,
PMIId nvarchar(50) not null,
JointId nvarchar(50) not null,
QualityNo nvarchar(255),
Acceptance nvarchar(255),
Status int not null,
CreatedTime datetime default getdate()
)
go
-- 插入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',1,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1)
insert into Sys_Menu values(NEWID(),'PMI检测录入','PMI detection entry','/WeldingProcess/PMI/PMIDetectionEntry.aspx',2,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1)
GO
/*******PMI委托明细视图***********/
ALTER VIEW [dbo].[View_PMI_DelegationDetails]
AS
/********热处理明细********/
SELECT
TrustItem.Id,
TrustItem.Acceptance,
TrustItem.CreatedTime,
TrustItem.JointId as WeldJointId,
TrustItem.status,
TrustItem.QualityNo,
TrustItem.PMIId,
Trust.ProjectId,
Trust.DelegationNo,
Trust.DelegationDate,
WeldJoint.WeldJointCode,
Pipeline.PipelineCode,
WeldJoint.Specification,
Material.MaterialCode,
Pipeline.WorkAreaId
FROM PMI_DelegationDetails AS TrustItem
LEFT JOIN PMI_Delegation AS Trust ON Trust.Id=TrustItem.PMIId
LEFT JOIN Pipeline_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=TrustItem.JointId
LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId
LEFT JOIN Base_Material AS Material ON Material.MaterialId=WeldJoint.Material1Id
GO

10
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:\work\project\巴斯夫焊接\Basf_TCC7\HJGL\WebApi" />
<virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\WebApi" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:3862:localhost" />
@ -256,14 +256,6 @@
<binding protocol="http" bindingInformation="*:13960:localhost" />
</bindings>
</site>
<site name="FineUIPro.Web(11)" id="14">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="E:\work\project\巴斯夫焊接\Basf_TCC7\HJGL\FineUIPro.Web" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:57613:localhost" />
</bindings>
</site>
<siteDefaults>
<!-- To enable logging, please change the below attribute "enabled" to "true" -->
<logFile logFormat="W3C" directory="%AppData%\Microsoft\IISExpressLogs" enabled="false" />

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

Binary file not shown.

2
HJGL/BLL/BLL.csproj.user
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
<ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
</Project>

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

@ -252,6 +252,12 @@ namespace BLL
{
newWeldJoint.Electricity = weldJoint.Electricity;
}
if (weldJoint.IsPMI != null)
{
newWeldJoint.IsPMI = weldJoint.IsPMI;
}
if (!string.IsNullOrEmpty(weldJoint.Voltage))
{
newWeldJoint.Voltage = weldJoint.Voltage;

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

@ -1,66 +0,0 @@
use HJGLDB_ZJBSF
go
create table PMI_Delegation
(
Id nvarchar(50) not null primary key,
DelegationNo nvarchar(50) not null,
DelegationDate datetime,
ProjectId nvarchar(50) not null,
InstallationId nvarchar(50),
UnitId nvarchar(50),
DetectionStandard nvarchar(50),
Remark nvarchar(255),
CreatedTime datetime default getdate()
)
go
create table PMI_DelegationDetails
(
Id nvarchar(50) not null primary key,
PMIId nvarchar(50) not null,
JointId nvarchar(50) not null,
QualityNo nvarchar(255),
Acceptance nvarchar(255),
Status int not null,
CreatedTime datetime default getdate()
)
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)
CREATE VIEW [dbo].[View_PMI_DelegationDetails]
AS
/*******硬度委托明细***********/
SELECT
B.PMIId,
B.JointId,
B.QualityNo,
B.Acceptance,
B.CreatedTime,
B.status,
Pipeline.PipelineCode,
WeldJoint.WeldJointCode,
WeldJoint.Specification,
WeldJoint.Remark,
Pipeline.SingleNumber,
(CASE WHEN WeldJoint.CoverWelderCode IS NOT NULL AND WeldJoint.BackingWelderCode IS NOT NULL
THEN WeldJoint.CoverWelderCode + '/' + WeldJoint.BackingWelderCode
ELSE (ISNULL(WeldJoint.CoverWelderCode,'') + ISNULL(WeldJoint.BackingWelderCode,'')) END) AS WelderCode, --焊工
(CASE WHEN WeldJoint.Material1Code IS NOT NULL AND WeldJoint.Material2Code IS NOT NULL
THEN WeldJoint.Material1Code + '/' + WeldJoint.Material2Code
ELSE (ISNULL(WeldJoint.Material1Code,'') + ISNULL(WeldJoint.Material2Code,'')) END) AS MaterialCode --材质
FROM PMI_Delegation AS A INNER JOIN
PMI_DelegationDetails AS B ON A.Id=B.PMIId
LEFT JOIN View_Pipeline_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=B.JointId
LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId
GO

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

@ -1,117 +0,0 @@
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

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

@ -240,6 +240,7 @@
<Content Include="PublicInfo\BaseInfo\PIPClassEdit.aspx" />
<Content Include="res\DataInTable.js" />
<Content Include="res\ProcessBar.js" />
<Content Include="WelderManage\AnalysisEdit.aspx" />
<Content Include="WelderManage\QualificationAnalysis.aspx" />
<Content Include="WelderManage\QualifiedProject.aspx" />
<Content Include="WelderManage\QualifiedProjectEdit.aspx" />
@ -3429,6 +3430,13 @@
<Compile Include="PublicInfo\BaseInfo\PIPClassEdit.aspx.designer.cs">
<DependentUpon>PIPClassEdit.aspx</DependentUpon>
</Compile>
<Compile Include="WelderManage\AnalysisEdit.aspx.cs">
<DependentUpon>AnalysisEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WelderManage\AnalysisEdit.aspx.designer.cs">
<DependentUpon>AnalysisEdit.aspx</DependentUpon>
</Compile>
<Compile Include="WelderManage\QualificationAnalysis.aspx.cs">
<DependentUpon>QualificationAnalysis.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -4903,7 +4911,6 @@
<Content Include="App_GlobalResources\Lan.resx">
<Generator>GlobalResourceProxyGenerator</Generator>
<LastGenOutput>Lan.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</Content>
</ItemGroup>
<ItemGroup>

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

@ -35,7 +35,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:57613/</IISUrl>
<IISUrl>http://localhost:13960/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>

2
HJGL/FineUIPro.Web/Web.config
View File

@ -9,7 +9,7 @@
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
</configSections>
<connectionStrings>
<add name="HJGLDBConnectionString" connectionString="Data Source=192.168.0.105;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
<add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/>
<!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
providerName="System.Data.SqlClient" />-->
</connectionStrings>

93
HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx Normal file
View File

@ -0,0 +1,93 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AnalysisEdit.aspx.cs" Inherits="FineUIPro.Web.WelderManage.AnalysisEdit" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:Label runat="server" ID="lbWedlerName" Label="焊工姓名" LabelWidth="120px"></f:Label>
<f:Label runat="server" ID="lbWedlerCode" Label="焊工代号" LabelWidth="120px"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="txtQualifiedProjectCode" runat="server" Label="合格项目代号" LabelWidth="120px">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" Label="可焊焊接方法" ID="drpWeldingMethod" EnableMultiSelect="true" ShowRedStar="true" Required="true" LabelWidth="120px" EnableCheckBoxSelect="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpMaterialType" runat="server" EnableMultiSelect="true" Label="焊接材质类型范围" MaxLength="50" LabelWidth="120px" EnableCheckBoxSelect="true">
<f:ListItem Value="" Text=""/>
<f:ListItem Value="FeⅠ" Text="FeⅠ"/>
<f:ListItem Value="FeⅡ" Text="FeⅡ"/>
<f:ListItem Value="FeⅢ" Text="FeⅢ"/>
<f:ListItem Value="FeIV" Text="FeIV"/>
<f:ListItem Value="其它" Text="其它"/>
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" Label="焊接位置范围" ID="drpWeldingLocation" LabelWidth="120px" EnableMultiSelect="true" EnableEdit="false" EnableCheckBoxSelect="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="numThicknessMax" runat="server" Label="壁厚范围(<=)" MaxLength="50" LabelWidth="120px" DecimalPrecision="2">
</f:NumberBox>
<f:Label runat="server" Text="0表示不限"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="numSizesMin" runat="server" Label="外径范围(>=)" MaxLength="50" LabelWidth="120px" DecimalPrecision="2">
</f:NumberBox>
<f:Label runat="server" Text="0表示不限"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" Label="可焊焊缝类型" ID="drpWeldType" LabelWidth="120px" EnableMultiSelect="true" EnableEdit="false" EnableCheckBoxSelect="true">
<f:ListItem Value="" Text=""/>
<f:ListItem Value="1" Text="对接"/>
<f:ListItem Value="2" Text="角焊缝"/>
<f:ListItem Value="3" Text="支管连接焊缝"/>
</f:DropDownList>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:Label runat="server" ID="lbTemp"></f:Label>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
</form>
</body>
</html>

135
HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs Normal file
View File

@ -0,0 +1,135 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Header;
namespace FineUIPro.Web.WelderManage
{
public partial class AnalysisEdit : PageBase
{
#region 定义项
/// <summary>
/// 合格项目id
/// </summary>
public string WelderQualifiedProjectId
{
get
{
return (string)ViewState["WelderQualifiedProjectId"];
}
set
{
ViewState["WelderQualifiedProjectId"] = value;
}
}
#endregion
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.WelderQualifiedProjectId = Request.Params["WelderQualifiedProjectId"];
drpWeldingLocation.DataValueField = "WeldingLocationCode";
drpWeldingLocation.DataTextField = "WeldingLocationCode";
drpWeldingLocation.DataSource = (from x in Funs.DB.Base_WeldingLocation orderby x.WeldingLocationCode select x).ToList();
drpWeldingLocation.DataBind();
Funs.FineUIPleaseSelect(drpWeldingLocation, "");
drpWeldingMethod.DataValueField = "WeldingMethodCode";
drpWeldingMethod.DataTextField = "WeldingMethodCode";
drpWeldingMethod.DataSource = (from x in Funs.DB.Base_WeldingMethod orderby x.WeldingMethodCode select x).ToList();
drpWeldingMethod.DataBind();
Funs.FineUIPleaseSelect(drpWeldingMethod, "");
if (!string.IsNullOrEmpty(this.WelderQualifiedProjectId))
{
var welderQualifiedProject = BLL.WelderQualifiedService.GetWelderQualifiedProjectById(this.WelderQualifiedProjectId);
if (welderQualifiedProject != null)
{
string wlederId = welderQualifiedProject.WelderId;
this.txtQualifiedProjectCode.Text = welderQualifiedProject.QualifiedProjectCode;
if (!string.IsNullOrEmpty(welderQualifiedProject.WeldingMethodId))
{
drpWeldingMethod.SelectedValueArray = welderQualifiedProject.WeldingMethodId.Split(',');
}
if (!string.IsNullOrEmpty(welderQualifiedProject.MaterialType))
{
drpMaterialType.SelectedValueArray = welderQualifiedProject.MaterialType.Split(',');
}
if (!string.IsNullOrEmpty(welderQualifiedProject.WeldingLocationId))
{
drpWeldingLocation.SelectedValueArray = welderQualifiedProject.WeldingLocationId.Split(',');
}
if (!string.IsNullOrEmpty(welderQualifiedProject.WeldType))
{
drpWeldType.SelectedValueArray = welderQualifiedProject.WeldType.Split(',');
}
if (welderQualifiedProject.ThicknessMax != null)
{
numThicknessMax.Text = welderQualifiedProject.ThicknessMax.Value.ToString();
}
if (welderQualifiedProject.SizesMin != null)
{
numSizesMin.Text = welderQualifiedProject.SizesMin.Value.ToString();
}
Model.Welder_Welder welder = BLL.WelderService.GetWelderById(wlederId);
if (welder != null)
{
this.lbWedlerName.Text = welder.WelderName;
this.lbWedlerCode.Text = welder.WelderCode;
}
}
}
}
}
protected void btnSave_Click(object sender, EventArgs e)
{
Model.Welder_WelderQualify updateQue = Funs.DB.Welder_WelderQualify.FirstOrDefault(x => x.WelderQualifiedProjectId == this.WelderQualifiedProjectId);
if (!string.IsNullOrEmpty(drpWeldingMethod.SelectedValue))
{
updateQue.WeldingMethodId = String.Join(",", drpWeldingMethod.SelectedValueArray);
}
if (!string.IsNullOrEmpty(drpMaterialType.SelectedValue))
{
updateQue.MaterialType = String.Join(",", drpMaterialType.SelectedValueArray);
}
if (!string.IsNullOrEmpty(drpWeldingLocation.SelectedValue))
{
updateQue.WeldingLocationId = String.Join(",", drpWeldingLocation.SelectedValueArray);
}
if (!string.IsNullOrEmpty(drpWeldType.SelectedValue))
{
updateQue.WeldType = String.Join(",", drpWeldType.SelectedValueArray);
}
if (!string.IsNullOrEmpty(numSizesMin.Text))
{
updateQue.SizesMin = Convert.ToInt32(numSizesMin.Text);
}
else
{
updateQue.SizesMin = 0;
}
if (!string.IsNullOrEmpty(numThicknessMax.Text))
{
updateQue.ThicknessMax = Convert.ToInt32(numThicknessMax.Text);
}
else
{
updateQue.ThicknessMax = 0;
}
Funs.DB.SubmitChanges();
BLL.Sys_LogService.AddLog(Const.System_1, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.Welder_QualifiedProjectMenuId, Const.BtnModify, this.WelderQualifiedProjectId);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
}
}

170
HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,170 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WelderManage
{
public partial class AnalysisEdit
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// lbWedlerName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbWedlerName;
/// <summary>
/// lbWedlerCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbWedlerCode;
/// <summary>
/// txtQualifiedProjectCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtQualifiedProjectCode;
/// <summary>
/// drpWeldingMethod 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWeldingMethod;
/// <summary>
/// drpMaterialType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpMaterialType;
/// <summary>
/// drpWeldingLocation 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWeldingLocation;
/// <summary>
/// numThicknessMax 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox numThicknessMax;
/// <summary>
/// numSizesMin 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox numSizesMin;
/// <summary>
/// drpWeldType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWeldType;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// lbTemp 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbTemp;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnClose 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
}
}

7
HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx
View File

@ -142,10 +142,17 @@
Target="top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="600px" Height="420px">
</f:Window>
<f:Window ID="Window2" Title="手动资质分析" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="600px" Height="480px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
runat="server" Text="编辑" Icon="TableEdit">
</f:MenuButton>
<f:MenuButton ID="btnMenuAnalysis" OnClick="btnMenuAnalysis_Click" EnablePostBack="true"
runat="server" Text="手动资质分析" Icon="ApplicationGet">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server" Text="删除" Icon="Delete">
</f:MenuButton>

10
HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs
View File

@ -207,6 +207,16 @@ namespace FineUIPro.Web.WelderManage
}
}
protected void btnMenuAnalysis_Click(object sender, EventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
return;
}
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("AnalysisEdit.aspx?WelderQualifiedProjectId={0}", Grid1.SelectedRowID, "维护 - ")));
}
/// <summary>
/// 删除
/// </summary>

24
HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WelderManage {
namespace FineUIPro.Web.WelderManage
{
public partial class QualifiedProject {
public partial class QualifiedProject
{
/// <summary>
/// form1 控件。
@ -264,6 +266,15 @@ namespace FineUIPro.Web.WelderManage {
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Menu1 控件。
/// </summary>
@ -282,6 +293,15 @@ namespace FineUIPro.Web.WelderManage {
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuAnalysis 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuAnalysis;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>

2
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
View File

@ -197,7 +197,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
ShowNotify(Resources.Lan.SaveSuccessfully, MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PMIDelegationId)
+ ActiveWindow.GetHideReference());
+ ActiveWindow.GetHidePostBackReference());
}
else
{

17
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx
View File

@ -143,16 +143,25 @@
DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,TrustDate %>" ColumnID="CreatedTime"
DataField="CreatedTime" SortField="CreatedTime" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,QualityNo %>" ColumnID="QualityNo" DataField="QualityNo"
FieldType="String" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,Acceptance %>" ColumnID="Acceptance"
DataField="Acceptance" FieldType="String" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="检测日期" ColumnID="CreatedTime"
DataField="CreatedTime" SortField="CreatedTime" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="报告日期" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="报告编号" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,IsPass %>" ColumnID="StatusText"
DataField="StatusText" SortField="status" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px">

24
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/JointComprehensive.aspx.cs
View File

@ -407,24 +407,24 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
reportModel.GetRow(rowIndex).GetCell(5).CellStyle.SetFont(cs_content_Font);
//焊口号
if (reportModel.GetRow(rowIndex).GetCell(9) == null) reportModel.GetRow(rowIndex).CreateCell(9);
reportModel.GetRow(rowIndex).GetCell(9).SetCellValue(jotNum.Count());
reportModel.GetRow(rowIndex).GetCell(9).CellStyle.SetFont(cs_content_Font);
if (reportModel.GetRow(rowIndex).GetCell(11) == null) reportModel.GetRow(rowIndex).CreateCell(11);
reportModel.GetRow(rowIndex).GetCell(11).SetCellValue(jotNum.Count());
reportModel.GetRow(rowIndex).GetCell(11).CellStyle.SetFont(cs_content_Font);
// 寸径
if (reportModel.GetRow(rowIndex).GetCell(12) == null) reportModel.GetRow(rowIndex).CreateCell(12);
reportModel.GetRow(rowIndex).GetCell(12).SetCellValue(jotNum.Sum(x => Convert.ToDouble(x.Size)));
reportModel.GetRow(rowIndex).GetCell(12).CellStyle.SetFont(cs_content_Font);
if (reportModel.GetRow(rowIndex).GetCell(14) == null) reportModel.GetRow(rowIndex).CreateCell(14);
reportModel.GetRow(rowIndex).GetCell(14).SetCellValue(jotNum.Sum(x => Convert.ToDouble(x.Size)));
reportModel.GetRow(rowIndex).GetCell(14).CellStyle.SetFont(cs_content_Font);
//打底焊工号
if (reportModel.GetRow(rowIndex).GetCell(21) == null) reportModel.GetRow(rowIndex).CreateCell(21);
reportModel.GetRow(rowIndex).GetCell(21).SetCellValue(backingWelder.Count().ToString());
reportModel.GetRow(rowIndex).GetCell(21).CellStyle.SetFont(cs_content_Font);
if (reportModel.GetRow(rowIndex).GetCell(23) == null) reportModel.GetRow(rowIndex).CreateCell(23);
reportModel.GetRow(rowIndex).GetCell(23).SetCellValue(backingWelder.Count().ToString());
reportModel.GetRow(rowIndex).GetCell(23).CellStyle.SetFont(cs_content_Font);
//盖面焊工号
if (reportModel.GetRow(rowIndex).GetCell(22) == null) reportModel.GetRow(rowIndex).CreateCell(22);
reportModel.GetRow(rowIndex).GetCell(22).SetCellValue(coverWelder.Count().ToString());
reportModel.GetRow(rowIndex).GetCell(22).CellStyle.SetFont(cs_content_Font);
if (reportModel.GetRow(rowIndex).GetCell(24) == null) reportModel.GetRow(rowIndex).CreateCell(24);
reportModel.GetRow(rowIndex).GetCell(24).SetCellValue(coverWelder.Count().ToString());
reportModel.GetRow(rowIndex).GetCell(24).CellStyle.SetFont(cs_content_Font);
}
#endregion
reportModel.ForceFormulaRecalculation = true;

12
HJGL/FineUIPro.Web/common/mainFullViews.aspx
View File

@ -66,10 +66,10 @@
<Items>
<f:ContentPanel ShowHeader="false" runat="server" ID="ContentPanel1" Margin="0 0 0 0">
<div id="divArea1">
<h4>&nbsp Welders Ranking Report gives you the impression of BSF</h4>
<h4>&nbsp Welders Ranking Report gives you the impression of BASF</h4>
<h4>&nbsp welders rank list. (The rank is according to the rejected rates.) </h4>
<h4>&nbsp Each year for the rank can be easily ranked out.</h4>
<h4>&nbsp 焊工排名报表是所有在BSF从事焊接工作的焊工年度排名</h4>
<h4>&nbsp 焊工排名报表是所有在BASF从事焊接工作的焊工年度排名</h4>
<h4>&nbsp（排名是根据焊工拍片量及拍片合格率确定的）。</h4>
<h4>&nbsp 查询时可选择不同年份查询每年的焊工合格率排名情况。</h4>
</div>
@ -161,12 +161,12 @@
<f:ContentPanel ShowHeader="false" runat="server" ID="ContentPanel2" Margin="0 0 0 0">
<div id="divArea4">
<h4>&nbsp Weld Contractors Report gives the welding quality information</h4>
<h4>&nbsp of all the contractors of BSF according to choice the </h4>
<h4>&nbsp of all the contractors of BASF according to choice the </h4>
<h4>&nbsp different period and different contractor.</h4>
<h4>&nbsp Accumulated rejection rate was calculated from Jan 2006.</h4>
<h4>&nbsp 该报告提供了所有在BSF从事焊接工作的承包商在不同时期的焊接质量状况。</h4>
<h4>&nbsp Accumulated rejection rate was calculated from Jan 2024.</h4>
<h4>&nbsp 该报告提供了所有在BASF从事焊接工作的承包商在不同时期的焊接质量状况。</h4>
<h4>&nbsp 查询时可通过选择不同日期及不同承包商名称查看相关信息。</h4>
<h4>&nbsp 其中，累计焊接返修率是从2006年1月起计算的。</h4>
<h4>&nbsp 其中，累计焊接返修率是从2024年1月起计算的。</h4>
</div>
</f:ContentPanel>
</Items>

4
HJGL/FineUIPro.Web/common/mainFullViews.aspx.cs
View File

@ -85,12 +85,12 @@ namespace FineUIPro.Web.common
string strSql = @"SELECT (WelderName+'（'+WelderCode+'） 焊工证过期，有效期为：'+CONVERT(VARCHAR(100),CertificateValidity,23))
AS QualificationLimit
FROM dbo.Welder_Welder
WHERE CertificateValidity<=GETDATE()
WHERE CertificateValidity<=GETDATE() AND IsOnDuty=1
UNION
SELECT (WelderName+'（'+WelderCode+'） 焊工证还有：'+convert(nvarchar(6),DATEDIFF(day,getdate(),CertificateValidity))+ '天到期')
AS QualificationLimit
FROM dbo.Welder_Welder
where DATEADD(m,-1,CertificateValidity)<GETDATE() and CertificateValidity>GETDATE()";
where DATEADD(m,-1,CertificateValidity)<GETDATE() and CertificateValidity>GETDATE() AND IsOnDuty=1";
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
GridWelder.DataSource = dt;
GridWelder.DataBind();

86
HJGL/Model/Model.cs
View File

@ -21300,7 +21300,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
public string ProjectId
{
get
@ -21477,10 +21477,10 @@ namespace Model
private string _Acceptance;
private System.Nullable<System.DateTime> _CreatedTime;
private int _Status;
private System.Nullable<System.DateTime> _CreatedTime;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -21495,10 +21495,10 @@ namespace Model
partial void OnQualityNoChanged();
partial void OnAcceptanceChanging(string value);
partial void OnAcceptanceChanged();
partial void OnCreatedTimeChanging(System.Nullable<System.DateTime> value);
partial void OnCreatedTimeChanged();
partial void OnStatusChanging(int value);
partial void OnStatusChanged();
partial void OnCreatedTimeChanging(System.Nullable<System.DateTime> value);
partial void OnCreatedTimeChanged();
#endregion
public PMI_DelegationDetails()
@ -21606,6 +21606,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="Int NOT NULL")]
public int Status
{
get
{
return this._Status;
}
set
{
if ((this._Status != value))
{
this.OnStatusChanging(value);
this.SendPropertyChanging();
this._Status = value;
this.SendPropertyChanged("Status");
this.OnStatusChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")]
public System.Nullable<System.DateTime> CreatedTime
{
@ -21626,26 +21646,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")]
public int Status
{
get
{
return this._Status;
}
set
{
if ((this._Status != value))
{
this.OnStatusChanging(value);
this.SendPropertyChanging();
this._Status = value;
this.SendPropertyChanged("Status");
this.OnStatusChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -37266,8 +37266,6 @@ namespace Model
private string _ProjectId;
private System.Nullable<bool> _IsPMI;
private string _PipelineCode;
private string _PipelineId;
@ -37398,22 +37396,6 @@ 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._IsPMI = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")]
public string PipelineCode
{
@ -39422,6 +39404,8 @@ namespace Model
private string _PipingClassCode;
private string _PIPClassCode;
private string _WeldingDate;
private System.Nullable<bool> _IsCancel;
@ -40530,6 +40514,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PIPClassCode", DbType="NVarChar(50)")]
public string PIPClassCode
{
get
{
return this._PIPClassCode;
}
set
{
if ((this._PIPClassCode != value))
{
this._PIPClassCode = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldingDate", DbType="VarChar(100)")]
public string WeldingDate
{

2
HJGL/Model/Model.csproj.user
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
<ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
</Project>