gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
高飞 2025-12-19 14:24:54 +08:00
parent 28634ed93b
commit ef421d5c43
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
HJGL_DS/FineUIPro.Web/HJGL/CheckManage/QualityRating.aspx.cs
View File

@ -814,8 +814,8 @@ namespace FineUIPro.Web.HJGL.CheckManage
this.QualityRatingId = values.Value<string>("QualityRatingId"); this.QualityRatingId = values.Value<string>("QualityRatingId");
if (trust.CH_NDTMethod == "20d2cbca-8b3d-434b-b1c1-181796986fa5") //RT检测，评定结果不为空才保存拍片记录 if (trust.CH_NDTMethod == "20d2cbca-8b3d-434b-b1c1-181796986fa5") //RT检测，评定结果不为空才保存拍片记录
{ {
//if (!string.IsNullOrEmpty(newQualityRating.DefectResult)) if (!string.IsNullOrEmpty(newQualityRating.IsPass))
//{ {
filmNum++; filmNum++;
if (newQualityRating.RMaterial == true) if (newQualityRating.RMaterial == true)
{ {
@ -837,9 +837,11 @@ namespace FineUIPro.Web.HJGL.CheckManage
newQualityRating.QualityRatingId = this.QualityRatingId; newQualityRating.QualityRatingId = this.QualityRatingId;
BLL.HJGL_BO_QualityRatingService.UpadteQualityRating(newQualityRating); BLL.HJGL_BO_QualityRatingService.UpadteQualityRating(newQualityRating);
} }
//} }
} }
else else
{
if (!string.IsNullOrEmpty(newQualityRating.IsPass))
{ {
var quatlityRating = BLL.HJGL_BO_QualityRatingService.GetQualityRatingById(this.QualityRatingId); var quatlityRating = BLL.HJGL_BO_QualityRatingService.GetQualityRatingById(this.QualityRatingId);
if (quatlityRating == null) if (quatlityRating == null)
@ -858,6 +860,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
BLL.HJGL_BO_QualityRatingService.UpadteQualityRating(newQualityRating); BLL.HJGL_BO_QualityRatingService.UpadteQualityRating(newQualityRating);
} }
} }
}
BLL.HJGL_CH_TrustItemService.UpdateTrustItem(trustItem); BLL.HJGL_CH_TrustItemService.UpdateTrustItem(trustItem);
// 有焊口增加的，对应的检测报告打印要变成未打印状态 // 有焊口增加的，对应的检测报告打印要变成未打印状态

14
HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -79,13 +79,13 @@
<publishTime>09/10/2013 16:29:20</publishTime> <publishTime>09/10/2013 16:29:20</publishTime>
</File> </File>
<File Include="bin/BLL.dll"> <File Include="bin/BLL.dll">
<publishTime>11/18/2025 11:30:43</publishTime> <publishTime>12/19/2025 10:46:46</publishTime>
</File> </File>
<File Include="bin/BLL.dll.config"> <File Include="bin/BLL.dll.config">
<publishTime>07/28/2025 20:15:00</publishTime> <publishTime>07/28/2025 20:15:00</publishTime>
</File> </File>
<File Include="bin/BLL.pdb"> <File Include="bin/BLL.pdb">
<publishTime>11/18/2025 11:30:43</publishTime> <publishTime>12/19/2025 10:46:46</publishTime>
</File> </File>
<File Include="bin/BouncyCastle.Crypto.dll"> <File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/17/2020 21:32:28</publishTime> <publishTime>12/17/2020 21:32:28</publishTime>
@ -115,10 +115,10 @@
<publishTime>07/25/2012 11:48:56</publishTime> <publishTime>07/25/2012 11:48:56</publishTime>
</File> </File>
<File Include="bin/Model.dll"> <File Include="bin/Model.dll">
<publishTime>11/18/2025 11:30:43</publishTime> <publishTime>12/19/2025 10:46:45</publishTime>
</File> </File>
<File Include="bin/Model.pdb"> <File Include="bin/Model.pdb">
<publishTime>11/18/2025 11:30:43</publishTime> <publishTime>12/19/2025 10:46:45</publishTime>
</File> </File>
<File Include="bin/Newtonsoft.Json.dll"> <File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/17/2021 20:03:36</publishTime> <publishTime>03/17/2021 20:03:36</publishTime>
@ -319,10 +319,10 @@
<publishTime>02/01/2018 12:20:56</publishTime> <publishTime>02/01/2018 12:20:56</publishTime>
</File> </File>
<File Include="bin/WebAPI.dll"> <File Include="bin/WebAPI.dll">
<publishTime>11/18/2025 11:30:44</publishTime> <publishTime>12/19/2025 10:46:46</publishTime>
</File> </File>
<File Include="bin/WebAPI.pdb"> <File Include="bin/WebAPI.pdb">
<publishTime>11/18/2025 11:30:44</publishTime> <publishTime>12/19/2025 10:46:46</publishTime>
</File> </File>
<File Include="bin/WebGrease.dll"> <File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 13:57:34</publishTime> <publishTime>01/23/2014 13:57:34</publishTime>
@ -448,7 +448,7 @@
<publishTime>07/03/2024 11:01:07</publishTime> <publishTime>07/03/2024 11:01:07</publishTime>
</File> </File>
<File Include="Web.config"> <File Include="Web.config">
<publishTime>11/18/2025 11:30:50</publishTime> <publishTime>12/19/2025 10:47:09</publishTime>
</File> </File>
</ItemGroup> </ItemGroup>
</Project> </Project>