20250623 无损检测日报

.gitignore

@@ -22,3 +22,4 @@ bin-release/
 /HJGL_DS/.vs/
 /HJGL_DS/.vs/config/applicationhost.config
 /HJGL_DS/FineUIPro.Web/FileUpload/Sign
+/sh.exe.stackdump

HJGL_DS/FineUIPro.Web/HJGL/CheckManage/QualityRating.aspx.cs

@@ -626,7 +626,6 @@ namespace FineUIPro.Web.HJGL.CheckManage
         {
             if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_CheckMenuId, Const.BtnSave))
             {
-                SubmitQualityRating();
                 foreach (JObject mergedRow in Grid1.GetMergedData())
                 {
                     JObject values = mergedRow.Value<JObject>("values");
@@ -640,7 +639,13 @@ namespace FineUIPro.Web.HJGL.CheckManage
                             return;
                         }
                     }
+                    if ((string.IsNullOrEmpty(values.Value<string>("DefectResult")) || values.Value<string>("DefectResult") == "          ") && values.Value<string>("IsPass") == "不合格")
+                    {
+                        ShowNotify("不合格记录评定结果不能为空！", MessageBoxIcon.Warning);
+                        return;
                     }
+                }
+                SubmitQualityRating();
                 ShowNotify("提交成功！", MessageBoxIcon.Success);
             }
             else
@@ -656,13 +661,13 @@ namespace FineUIPro.Web.HJGL.CheckManage
             int rMatNum = 0;
             string changeId = string.Empty;
             bool b = true;   //默认合格
+            bool bRT = true;  //RT默认合格
             bool needRemake = false;   //重拍
             foreach (JObject mergedRow in Grid1.GetMergedData())
             {
                 JObject values = mergedRow.Value<JObject>("values");
                 string cH_TrustItemID = values.Value<string>("CH_TrustItemID");
-                if (!string.IsNullOrEmpty(values.Value<string>("DefectResult")))   //有评定结果的口再保存记录
+
-                {
                 if (changeId != cH_TrustItemID)   //循环至新的焊口记录
                 {
                     Model.HJGL_CH_TrustItem oldTrustItem = BLL.HJGL_CH_TrustItemService.GetTrustItemByID(changeId);
@@ -689,7 +694,24 @@ namespace FineUIPro.Web.HJGL.CheckManage
                                 oldTrustItem.States = "4";   //待返修
                             }
                         }
-
+                        else
+                        {
+                            if (bRT)
+                            {
+                                if (needRemake)
+                                {
+                                    oldTrustItem.States = "3";   //待重检
+                                }
+                                else
+                                {
+                                    oldTrustItem.States = "2";   //检测合格
+                                }
+                            }
+                            else
+                            {
+                                oldTrustItem.States = "4";   //待返修
+                            }
+                        }
 
                         oldTrustItem.FeedbackMan = this.CurrUser.UserName;
                         oldTrustItem.FeedbackDate = DateTime.Now;
@@ -697,6 +719,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
                     }
                     changeId = cH_TrustItemID;
                     b = true;
+                    bRT = true;
                     needRemake = false;
 
                     filmNum = 0;
@@ -770,6 +793,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
                 if (values.Value<string>("IsPass") == "不合格")
                 {
                     b = false;
+                    bRT = false;
                 }
                 if (Convert.ToBoolean(values.Value<string>("Remake")))
                 {
@@ -779,8 +803,8 @@ namespace FineUIPro.Web.HJGL.CheckManage
                 this.QualityRatingId = values.Value<string>("QualityRatingId");
                 if (trust.CH_NDTMethod == "20d2cbca-8b3d-434b-b1c1-181796986fa5")   //RT检测，评定结果不为空才保存拍片记录
                 {
-                        if (!string.IsNullOrEmpty(newQualityRating.DefectResult))
+                    //if (!string.IsNullOrEmpty(newQualityRating.DefectResult))
-                        {
+                    //{
                         filmNum++;
                         if (newQualityRating.RMaterial == true)
                         {
@@ -802,7 +826,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
                             newQualityRating.QualityRatingId = this.QualityRatingId;
                             BLL.HJGL_BO_QualityRatingService.UpadteQualityRating(newQualityRating);
                         }
-                        }
+                    //}
                 }
                 else
                 {
@@ -838,7 +862,6 @@ namespace FineUIPro.Web.HJGL.CheckManage
                     Funs.DB.SubmitChanges();
                 }
             }
-            }
             //更新列表最后一个口的数据
             if (!string.IsNullOrEmpty(changeId))
             {
@@ -862,6 +885,24 @@ namespace FineUIPro.Web.HJGL.CheckManage
                         oldTrustItem1.States = "4";   //待返修
                     }
                 }
+                else
+                {
+                    if (bRT)
+                    {
+                        if (needRemake)
+                        {
+                            oldTrustItem1.States = "3";   //待重检
+                        }
+                        else
+                        {
+                            oldTrustItem1.States = "2";   //检测合格
+                        }
+                    }
+                    else
+                    {
+                        oldTrustItem1.States = "4";   //待返修
+                    }
+                }
                 oldTrustItem1.FeedbackMan = this.CurrUser.UserName;
                 oldTrustItem1.FeedbackDate = DateTime.Now;
                 BLL.HJGL_PW_JointInfoService.JointFileNumWriteBack(oldTrustItem1.JOT_ID, filmNum);

HJGL_DS/FineUIPro.Web/HJGL/RepairManage/QualityRating.aspx.cs

@@ -624,7 +624,6 @@ namespace FineUIPro.Web.HJGL.RepairManage
         {
             if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_CheckAuditMenuId, Const.BtnSave))
             {
-                SubmitQualityRating();
                 foreach (JObject mergedRow in Grid1.GetMergedData())
                 {
                     JObject values = mergedRow.Value<JObject>("values");
@@ -638,7 +637,13 @@ namespace FineUIPro.Web.HJGL.RepairManage
                             return;
                         }
                     }
+                    if ((string.IsNullOrEmpty(values.Value<string>("DefectResult")) || values.Value<string>("DefectResult") == "          ") && values.Value<string>("IsPass") == "不合格")
+                    {
+                        ShowNotify("不合格记录评定结果不能为空！", MessageBoxIcon.Warning);
+                        return;
                     }
+                }
+                SubmitQualityRating();
                 ShowNotify("提交成功！", MessageBoxIcon.Success);
             }
             else
@@ -813,8 +818,8 @@ namespace FineUIPro.Web.HJGL.RepairManage
                 }
                 BLL.HJGL_RepairItemService.UpdateCH_TrustItem(repairItem);
                 //回写返修片子情况
-                if (!string.IsNullOrEmpty(newQualityRatingRepair.DefectResult))
+                //if (!string.IsNullOrEmpty(newQualityRatingRepair.DefectResult))
-                {
+                //{
                     if (newQualityRatingRepair.RepairTag == "R1")
                     {
                         if (ndt.NDT_Code.Contains("RT"))
@@ -896,7 +901,7 @@ namespace FineUIPro.Web.HJGL.RepairManage
                             }
                         }
                     }
-                }
+                //}
 
                 if (newQualityRatingRepair.RMaterial == true)
                 {