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

Compare commits

base: shecs:f201a467df95cae1c0392985b6981087a646da6a
Branches Tags
shecs:master
..
compare: shecs:f268912b72872101eac473d689cff0e53ecbe710
Branches Tags
shecs:master

No commits in common. "f201a467df95cae1c0392985b6981087a646da6a" and "f268912b72872101eac473d689cff0e53ecbe710" have entirely different histories.
f201a467df ... f268912b72

2 changed files with 7 additions and 9 deletions
Show Stats Expand all files Collapse all files

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

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

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

@ -127,7 +127,9 @@ namespace FineUIPro.Web.HJGL.HotProessManage
HotProessItem.RequestTime,HotProessItem.ActualTime,HotProessItem.RecordChartNo,
HotProessItem.HotProessDate,HotProessItem.HotProessTrustId,
(SELECT (case when HotHardCode is null then HardTestReportCode else HotHardCode end) as HardTestReportCode FROM dbo.HJGL_CH_HardTestReport
WHERE HardTestReportId =t.HardTestReportId)
WHERE HardTestReportId =(SELECT TOP 1 re.HardTestReportId FROM dbo.HJGL_CH_HardTestReportItem item
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,
HotProessItem.HotProessItemId,HotProessItem.SortIndex,HotProessItem.ProessTypes,JointInfo.JOT_JointDesc,isnull(HotProessItem.Remark,'') as Remark
FROM dbo.HJGL_HotProessItem AS HotProessItem
@ -142,9 +144,6 @@ namespace FineUIPro.Web.HJGL.HotProessManage
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
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 ";
listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID));
if (this.drpIsoNo.SelectedValue != BLL.Const._Null)
@ -189,7 +188,9 @@ namespace FineUIPro.Web.HJGL.HotProessManage
HotProessItem.ActualTime,HotProessItem.RecordChartNo,
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
WHERE HardTestReportId =t.HardTestReportId)
WHERE HardTestReportId =(SELECT TOP 1 re.HardTestReportId FROM dbo.HJGL_CH_HardTestReportItem item
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,
HotProessItem.ProessTypes,JointInfo.JOT_JointDesc,isnull(HotProessItem.Remark,'') as Remark
FROM dbo.HJGL_HotProessItem AS HotProessItem
@ -204,9 +205,6 @@ namespace FineUIPro.Web.HJGL.HotProessManage
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
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 ";
listStr.Add(new SqlParameter("@ProjectId", projectIds));
if (this.drpIsoNo.SelectedValue != BLL.Const._Null)