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

提交代码

This commit is contained in:
高飞 2024-07-18 14:49:08 +08:00
parent 2f1fca4df2
commit a74a574ca4
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -85,3 +85,4 @@ HJGL_ZH/BLL/bin/Release/NPOI.OpenXmlFormats.dll
/HJGL_ZH/packages /HJGL_ZH/packages
/HJGL_ZH/WebAPI/bin /HJGL_ZH/WebAPI/bin
/HJGL_ZH/WebAPI/obj /HJGL_ZH/WebAPI/obj
/ReleasePackerALL2017.bat

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

@ -101,7 +101,7 @@
<Reference Include="System.Web.Services" /> <Reference Include="System.Web.Services" />
<Reference Include="System.EnterpriseServices" /> <Reference Include="System.EnterpriseServices" />
<Reference Include="ThoughtWorks.QRCode"> <Reference Include="ThoughtWorks.QRCode">
<HintPath>bin\ThoughtWorks.QRCode\X86\1.0.2774.19990\ThoughtWorks.QRCode.dll</HintPath> <HintPath>..\..\..\New\HJGL_ZH\FineUIPro.Web\bin\ThoughtWorks.QRCode.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

14
HJGL_ZH/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEdit.aspx.cs
View File

@ -127,9 +127,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
HotProessItem.RequestTime,HotProessItem.ActualTime,HotProessItem.RecordChartNo, HotProessItem.RequestTime,HotProessItem.ActualTime,HotProessItem.RecordChartNo,
HotProessItem.HotProessDate,HotProessItem.HotProessTrustId, HotProessItem.HotProessDate,HotProessItem.HotProessTrustId,
(SELECT (case when HotHardCode is null then HardTestReportCode else HotHardCode end) as HardTestReportCode FROM dbo.HJGL_CH_HardTestReport (SELECT (case when HotHardCode is null then HardTestReportCode else HotHardCode end) as HardTestReportCode FROM dbo.HJGL_CH_HardTestReport
WHERE HardTestReportId =(SELECT TOP 1 re.HardTestReportId FROM dbo.HJGL_CH_HardTestReportItem item WHERE HardTestReportId =t.HardTestReportId)
left join dbo.HJGL_CH_HardTestReport re on item.HardTestReportId=re.HardTestReportId
WHERE item.JOT_ID=HotProessItem.JOT_ID AND item.HotProessTrustId=HotProessItem.HotProessTrustId and (re.FileType='R' or re.FileType is null)))
AS HardnessReportNo, AS HardnessReportNo,
HotProessItem.HotProessItemId,HotProessItem.SortIndex,HotProessItem.ProessTypes,JointInfo.JOT_JointDesc,isnull(HotProessItem.Remark,'') as Remark HotProessItem.HotProessItemId,HotProessItem.SortIndex,HotProessItem.ProessTypes,JointInfo.JOT_JointDesc,isnull(HotProessItem.Remark,'') as Remark
FROM dbo.HJGL_HotProessItem AS HotProessItem FROM dbo.HJGL_HotProessItem AS HotProessItem
@ -144,6 +142,9 @@ namespace FineUIPro.Web.HJGL.HotProessManage
left join dbo.HJGL_HotProessItem h on h.JOT_ID=TrustItem.JOT_ID left join dbo.HJGL_HotProessItem h on h.JOT_ID=TrustItem.JOT_ID
where h.JOT_ID = TrustItem.JOT_ID and h.HotProessTrustId=TrustItem.HotProessTrustId and h.ProessTypes=TrustItem.ProessTypes) v where h.JOT_ID = TrustItem.JOT_ID and h.HotProessTrustId=TrustItem.HotProessTrustId and h.ProessTypes=TrustItem.ProessTypes) v
on v.JOT_ID=HotProessItem.JOT_ID and v.HotProessItemId=HotProessItem.HotProessItemId on v.JOT_ID=HotProessItem.JOT_ID and v.HotProessItemId=HotProessItem.HotProessItemId
left join (SELECT distinct re.HardTestReportId,item.JOT_ID,item.HotProessTrustId FROM dbo.HJGL_CH_HardTestReportItem item
left join dbo.HJGL_CH_HardTestReport re on item.HardTestReportId=re.HardTestReportId
WHERE (re.FileType='R' or re.FileType is null)) t on t.JOT_ID=HotProessItem.JOT_ID and t.HotProessTrustId=HotProessItem.HotProessTrustId
WHERE JointInfo.ProjectId= @ProjectId "; WHERE JointInfo.ProjectId= @ProjectId ";
listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID)); listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID));
if (this.drpIsoNo.SelectedValue != BLL.Const._Null) if (this.drpIsoNo.SelectedValue != BLL.Const._Null)
@ -188,9 +189,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
HotProessItem.ActualTime,HotProessItem.RecordChartNo, HotProessItem.ActualTime,HotProessItem.RecordChartNo,
HotProessItem.HotProessDate,HotProessItem.HotProessTrustId,HotProessItem.HotProessItemId,HotProessItem.SortIndex, HotProessItem.HotProessDate,HotProessItem.HotProessTrustId,HotProessItem.HotProessItemId,HotProessItem.SortIndex,
(SELECT (case when HotHardCode is null then HardTestReportCode else HotHardCode end) as HardTestReportCode FROM dbo.HJGL_CH_HardTestReport (SELECT (case when HotHardCode is null then HardTestReportCode else HotHardCode end) as HardTestReportCode FROM dbo.HJGL_CH_HardTestReport
WHERE HardTestReportId =(SELECT TOP 1 re.HardTestReportId FROM dbo.HJGL_CH_HardTestReportItem item WHERE HardTestReportId =t.HardTestReportId)
left join dbo.HJGL_CH_HardTestReport re on item.HardTestReportId=re.HardTestReportId
WHERE item.JOT_ID=HotProessItem.JOT_ID AND item.HotProessTrustId=HotProessItem.HotProessTrustId and (re.FileType='R' or re.FileType is null)))
AS HardnessReportNo, AS HardnessReportNo,
HotProessItem.ProessTypes,JointInfo.JOT_JointDesc,isnull(HotProessItem.Remark,'') as Remark HotProessItem.ProessTypes,JointInfo.JOT_JointDesc,isnull(HotProessItem.Remark,'') as Remark
FROM dbo.HJGL_HotProessItem AS HotProessItem FROM dbo.HJGL_HotProessItem AS HotProessItem
@ -205,6 +204,9 @@ namespace FineUIPro.Web.HJGL.HotProessManage
left join dbo.HJGL_HotProessItem h on h.JOT_ID=TrustItem.JOT_ID left join dbo.HJGL_HotProessItem h on h.JOT_ID=TrustItem.JOT_ID
where h.JOT_ID = TrustItem.JOT_ID and h.HotProessTrustId=TrustItem.HotProessTrustId and h.ProessTypes=TrustItem.ProessTypes) v where h.JOT_ID = TrustItem.JOT_ID and h.HotProessTrustId=TrustItem.HotProessTrustId and h.ProessTypes=TrustItem.ProessTypes) v
on v.JOT_ID=HotProessItem.JOT_ID and v.HotProessItemId=HotProessItem.HotProessItemId on v.JOT_ID=HotProessItem.JOT_ID and v.HotProessItemId=HotProessItem.HotProessItemId
left join (SELECT distinct re.HardTestReportId,item.JOT_ID,item.HotProessTrustId FROM dbo.HJGL_CH_HardTestReportItem item
left join dbo.HJGL_CH_HardTestReport re on item.HardTestReportId=re.HardTestReportId
WHERE (re.FileType='R' or re.FileType is null)) t on t.JOT_ID=HotProessItem.JOT_ID and t.HotProessTrustId=HotProessItem.HotProessTrustId
WHERE CHARINDEX(JointInfo.ProjectId,@ProjectId)>0 "; WHERE CHARINDEX(JointInfo.ProjectId,@ProjectId)>0 ";
listStr.Add(new SqlParameter("@ProjectId", projectIds)); listStr.Add(new SqlParameter("@ProjectId", projectIds));
if (this.drpIsoNo.SelectedValue != BLL.Const._Null) if (this.drpIsoNo.SelectedValue != BLL.Const._Null)