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

11

This commit is contained in:
佘春生 2024-05-12 17:04:46 +08:00
parent 19753815b1
commit acff7f22d4
12 changed files with 105 additions and 83 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

61
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
@ -202,7 +207,6 @@ FROM Pipeline_WeldJoint AS weldJoint
GO
UPDATE dbo.Template_Files SET title=REPLACE(title,cast(sortindex as nvarchar(50))+'-','')
GO
@ -223,6 +227,7 @@ create table PMI_Delegation
InstallationId nvarchar(50),
UnitId nvarchar(50),
DetectionStandard nvarchar(50),
Tabler nvarchar(50),
Remark nvarchar(255),
CreatedTime datetime default getdate()
)
@ -240,43 +245,45 @@ create table PMI_DelegationDetails
)
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)
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委托明细视图***********/
CREATE VIEW [dbo].[View_PMI_DelegationDetails]
ALTER VIEW [dbo].[View_PMI_DelegationDetails]
AS
/********热处理明细********/
SELECT
B.PMIId,
B.JointId,
B.QualityNo,
B.Acceptance,
B.CreatedTime,
B.status,
Pipeline.PipelineCode,
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,
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
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

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;

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

@ -4473,6 +4473,7 @@
</Compile>
<Compile Include="WeldingProcess\PMI\PMIDetectionEntry.aspx.cs">
<DependentUpon>PMIDetectionEntry.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WeldingProcess\PMI\PMIDetectionEntry.aspx.designer.cs">
<DependentUpon>PMIDetectionEntry.aspx</DependentUpon>
@ -4910,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/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">

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>