From ef421d5c43845a621acc6fa93cf7e36e194959cb Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Fri, 19 Dec 2025 14:24:54 +0800 Subject: [PATCH] 1 --- .../HJGL/CheckManage/QualityRating.aspx.cs | 33 ++++++++++--------- .../PublishProfiles/FolderProfile.pubxml.user | 14 ++++---- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/QualityRating.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/QualityRating.aspx.cs index 4ec0d51..c89c066 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/QualityRating.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/QualityRating.aspx.cs @@ -814,8 +814,8 @@ namespace FineUIPro.Web.HJGL.CheckManage this.QualityRatingId = values.Value("QualityRatingId"); if (trust.CH_NDTMethod == "20d2cbca-8b3d-434b-b1c1-181796986fa5") //RT检测,评定结果不为空才保存拍片记录 { - //if (!string.IsNullOrEmpty(newQualityRating.DefectResult)) - //{ + if (!string.IsNullOrEmpty(newQualityRating.IsPass)) + { filmNum++; if (newQualityRating.RMaterial == true) { @@ -837,25 +837,28 @@ namespace FineUIPro.Web.HJGL.CheckManage newQualityRating.QualityRatingId = this.QualityRatingId; BLL.HJGL_BO_QualityRatingService.UpadteQualityRating(newQualityRating); } - //} + } } else { - var quatlityRating = BLL.HJGL_BO_QualityRatingService.GetQualityRatingById(this.QualityRatingId); - if (quatlityRating == null) + if (!string.IsNullOrEmpty(newQualityRating.IsPass)) { - newQualityRating.QualityRatingId = this.QualityRatingId; - BLL.HJGL_BO_QualityRatingService.AddQualityRating(newQualityRating); - } - else - { - Model.HJGL_BO_QualityRating oldQualityRating = BLL.HJGL_BO_QualityRatingService.GetQualityRatingById(this.QualityRatingId); - if (oldQualityRating != null) + var quatlityRating = BLL.HJGL_BO_QualityRatingService.GetQualityRatingById(this.QualityRatingId); + if (quatlityRating == null) { - newQualityRating.RemakeResult = oldQualityRating.RemakeResult; + newQualityRating.QualityRatingId = this.QualityRatingId; + BLL.HJGL_BO_QualityRatingService.AddQualityRating(newQualityRating); + } + else + { + Model.HJGL_BO_QualityRating oldQualityRating = BLL.HJGL_BO_QualityRatingService.GetQualityRatingById(this.QualityRatingId); + if (oldQualityRating != null) + { + newQualityRating.RemakeResult = oldQualityRating.RemakeResult; + } + newQualityRating.QualityRatingId = this.QualityRatingId; + BLL.HJGL_BO_QualityRatingService.UpadteQualityRating(newQualityRating); } - newQualityRating.QualityRatingId = this.QualityRatingId; - BLL.HJGL_BO_QualityRatingService.UpadteQualityRating(newQualityRating); } } BLL.HJGL_CH_TrustItemService.UpdateTrustItem(trustItem); diff --git a/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index eca38d4..67bbaa5 100644 --- a/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -79,13 +79,13 @@ 09/10/2013 16:29:20 - 11/18/2025 11:30:43 + 12/19/2025 10:46:46 07/28/2025 20:15:00 - 11/18/2025 11:30:43 + 12/19/2025 10:46:46 12/17/2020 21:32:28 @@ -115,10 +115,10 @@ 07/25/2012 11:48:56 - 11/18/2025 11:30:43 + 12/19/2025 10:46:45 - 11/18/2025 11:30:43 + 12/19/2025 10:46:45 03/17/2021 20:03:36 @@ -319,10 +319,10 @@ 02/01/2018 12:20:56 - 11/18/2025 11:30:44 + 12/19/2025 10:46:46 - 11/18/2025 11:30:44 + 12/19/2025 10:46:46 01/23/2014 13:57:34 @@ -448,7 +448,7 @@ 07/03/2024 11:01:07 - 11/18/2025 11:30:50 + 12/19/2025 10:47:09 \ No newline at end of file