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

11

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/FineUIPro.Web.csproj
+1 -1
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>
HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+1 -1
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>
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
+1 -1
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
{
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx
+13 -4
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">
HJGL/FineUIPro.Web/common/mainFullViews.aspx.cs
+2 -2
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();