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,156 +661,155 @@ 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)   //循环至新的焊口记录
                 {
-                    if (changeId != cH_TrustItemID)   //循环至新的焊口记录
+                    Model.HJGL_CH_TrustItem oldTrustItem = BLL.HJGL_CH_TrustItemService.GetTrustItemByID(changeId);
+                    if (oldTrustItem != null)
                     {
-                        Model.HJGL_CH_TrustItem oldTrustItem = BLL.HJGL_CH_TrustItemService.GetTrustItemByID(changeId);
+                        BLL.HJGL_PW_JointInfoService.JointFileNumWriteBack(oldTrustItem.JOT_ID, filmNum);
-                        if (oldTrustItem != null)
+                        BLL.HJGL_PW_JointInfoService.JointRMaterialWriteBack(oldTrustItem.JOT_ID, rMatNum);
+                        Model.HJGL_CH_Trust trust1 = BLL.HJGL_TrustManageEditService.GetCH_TrustByID(oldTrustItem.CH_TrustID);
+                        if (trust1.CH_NDTMethod != "20d2cbca-8b3d-434b-b1c1-181796986fa5")   //非RT检测，更新焊口检测状态
                         {
-                            BLL.HJGL_PW_JointInfoService.JointFileNumWriteBack(oldTrustItem.JOT_ID, filmNum);
+                            if (b)
-                            BLL.HJGL_PW_JointInfoService.JointRMaterialWriteBack(oldTrustItem.JOT_ID, rMatNum);
-                            Model.HJGL_CH_Trust trust1 = BLL.HJGL_TrustManageEditService.GetCH_TrustByID(oldTrustItem.CH_TrustID);
-                            if (trust1.CH_NDTMethod != "20d2cbca-8b3d-434b-b1c1-181796986fa5")   //非RT检测，更新焊口检测状态
                             {
-                                if (b)
+                                if (needRemake)
                                 {
-                                    if (needRemake)
+                                    oldTrustItem.States = "3";   //待重检
-                                    {
-                                        oldTrustItem.States = "3";   //待重检
-                                    }
-                                    else
-                                    {
-                                        oldTrustItem.States = "2";   //检测合格
-                                    }
                                 }
                                 else
                                 {
-                                    oldTrustItem.States = "4";   //待返修
+                                    oldTrustItem.States = "2";   //检测合格
                                 }
                             }
-
-
-                            oldTrustItem.FeedbackMan = this.CurrUser.UserName;
-                            oldTrustItem.FeedbackDate = DateTime.Now;
-                            BLL.HJGL_CH_TrustItemService.UpdateTrustItem(oldTrustItem);
-                        }
-                        changeId = cH_TrustItemID;
-                        b = true;
-                        needRemake = false;
-
-                        filmNum = 0;
-                        rMatNum = 0;
-                    }
-                    Model.HJGL_CH_TrustItem trustItem = BLL.HJGL_CH_TrustItemService.GetTrustItemByID(cH_TrustItemID);
-                    if (this.drpEquipment.SelectedValue != "null")
-                    {
-                        trustItem.EquipmentId = this.drpEquipment.SelectedValue;
-                    }
-                    if (!string.IsNullOrEmpty(this.txtShootMan.Text))
-                    {
-                        trustItem.ShootMan = this.txtShootMan.Text.Trim();
-                    }
-                    if (!string.IsNullOrEmpty(this.txtShootDate.Text))
-                    {
-                        trustItem.ShootDate = Convert.ToDateTime(this.txtShootDate.Text);
-                    }
-
-                    var trust = BLL.HJGL_TrustManageEditService.GetCH_TrustByID(trustItem.CH_TrustID);
-                    var jot = BLL.HJGL_PW_JointInfoService.GetJointInfoByJotID(trustItem.JOT_ID);
-                    Model.HJGL_BO_QualityRating newQualityRating = new Model.HJGL_BO_QualityRating();
-
-
-                    newQualityRating.CH_TrustItemID = cH_TrustItemID;
-                    if (!string.IsNullOrEmpty(jot.ISO_ID))
-                    {
-                        newQualityRating.ISO_ID = jot.ISO_ID;
-                    }
-                    if (!string.IsNullOrEmpty(trustItem.JOT_ID))
-                    {
-                        newQualityRating.JOT_ID = trustItem.JOT_ID;
-                    }
-                    newQualityRating.Remake = Convert.ToBoolean(values.Value<string>("Remake"));
-                    newQualityRating.RemakeResult = values.Value<string>("RemakeResult");
-                    if (Grid1.Columns[5].Hidden == true)
-                    {
-                        newQualityRating.FilmNum = null;
-                    }
-                    else
-                    {
-                        newQualityRating.FilmNum = values.Value<string>("FilmNum");
-                    }
-                    newQualityRating.RepairTag = values.Value<string>("RepairTag");
-                    newQualityRating.RMaterial = Convert.ToBoolean(values.Value<string>("RMaterial"));
-                    newQualityRating.Cack = Convert.ToBoolean(values.Value<string>("Cack"));
-                    newQualityRating.NotFusion = Convert.ToBoolean(values.Value<string>("NotFusion"));
-                    newQualityRating.NotPenetration = Convert.ToBoolean(values.Value<string>("NotPenetration"));
-                    newQualityRating.StripDefects = Convert.ToBoolean(values.Value<string>("StripDefects"));
-                    newQualityRating.CircularDefects = Convert.ToBoolean(values.Value<string>("CircularDefects"));
-                    newQualityRating.DeepHoleDefects = Convert.ToBoolean(values.Value<string>("DeepHoleDefects"));
-                    newQualityRating.RootsConcave = Convert.ToBoolean(values.Value<string>("RootsConcave"));
-                    newQualityRating.RootsBiteEdge = Convert.ToBoolean(values.Value<string>("RootsBiteEdge"));
-                    newQualityRating.PseudoDefects = Convert.ToBoolean(values.Value<string>("PseudoDefects"));
-                    newQualityRating.DefectLength = values.Value<string>("DefectLength");
-                    newQualityRating.DefectResult = values.Value<string>("DefectResult");
-                    newQualityRating.DefectRation = values.Value<string>("DefectRation");
-                    newQualityRating.SignDate = Funs.GetNewDateTime(values.Value<string>("SignDate"));
-                    newQualityRating.Remark = values.Value<string>("Remark");
-
-                    newQualityRating.DetectLength = Funs.GetNewDecimal(values.Value<string>("DetectLength"));
-                    newQualityRating.PeakAmplitude = values.Value<string>("PeakAmplitude");
-                    newQualityRating.DefectLocation = values.Value<string>("DefectLocation");
-                    newQualityRating.DepthDefect = Funs.GetNewDecimal(values.Value<string>("DepthDefect"));
-                    newQualityRating.IndicatingLength = Funs.GetNewDecimal(values.Value<string>("IndicatingLength"));
-                    newQualityRating.DefectHeight = Funs.GetNewDecimal(values.Value<string>("DefectHeight"));
-                    newQualityRating.DefectsHighSide = Funs.GetNewDecimal(values.Value<string>("DefectsHighSide"));
-                    newQualityRating.DefectSize = Funs.GetNewDecimal(values.Value<string>("DefectSize"));
-
-                    newQualityRating.DefectNature = values.Value<string>("DefectNature");
-                    if (values.Value<string>("IsPass") == "不合格")
-                    {
-                        b = false;
-                    }
-                    if (Convert.ToBoolean(values.Value<string>("Remake")))
-                    {
-                        needRemake = true;
-                    }
-                    newQualityRating.IsPass = values.Value<string>("IsPass");
-                    this.QualityRatingId = values.Value<string>("QualityRatingId");
-                    if (trust.CH_NDTMethod == "20d2cbca-8b3d-434b-b1c1-181796986fa5")   //RT检测，评定结果不为空才保存拍片记录
-                    {
-                        if (!string.IsNullOrEmpty(newQualityRating.DefectResult))
-                        {
-                            filmNum++;
-                            if (newQualityRating.RMaterial == true)
-                            {
-                                rMatNum++;
-                            }
-                            var quatlityRating = BLL.HJGL_BO_QualityRatingService.GetQualityRatingById(this.QualityRatingId);
-                            if (quatlityRating == null)
-                            {
-                                newQualityRating.QualityRatingId = this.QualityRatingId;
-                                BLL.HJGL_BO_QualityRatingService.AddQualityRating(newQualityRating);
-                            }
                             else
                             {
-                                Model.HJGL_BO_QualityRating oldQualityRating = BLL.HJGL_BO_QualityRatingService.GetQualityRatingById(this.QualityRatingId);
+                                oldTrustItem.States = "4";   //待返修
-                                if (oldQualityRating != null)
-                                {
-                                    newQualityRating.RemakeResult = oldQualityRating.RemakeResult;
-                                }
-                                newQualityRating.QualityRatingId = this.QualityRatingId;
-                                BLL.HJGL_BO_QualityRatingService.UpadteQualityRating(newQualityRating);
                             }
                         }
+                        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;
+                        BLL.HJGL_CH_TrustItemService.UpdateTrustItem(oldTrustItem);
                     }
-                    else
+                    changeId = cH_TrustItemID;
-                    {
+                    b = true;
+                    bRT = true;
+                    needRemake = false;
+
+                    filmNum = 0;
+                    rMatNum = 0;
+                }
+                Model.HJGL_CH_TrustItem trustItem = BLL.HJGL_CH_TrustItemService.GetTrustItemByID(cH_TrustItemID);
+                if (this.drpEquipment.SelectedValue != "null")
+                {
+                    trustItem.EquipmentId = this.drpEquipment.SelectedValue;
+                }
+                if (!string.IsNullOrEmpty(this.txtShootMan.Text))
+                {
+                    trustItem.ShootMan = this.txtShootMan.Text.Trim();
+                }
+                if (!string.IsNullOrEmpty(this.txtShootDate.Text))
+                {
+                    trustItem.ShootDate = Convert.ToDateTime(this.txtShootDate.Text);
+                }
+
+                var trust = BLL.HJGL_TrustManageEditService.GetCH_TrustByID(trustItem.CH_TrustID);
+                var jot = BLL.HJGL_PW_JointInfoService.GetJointInfoByJotID(trustItem.JOT_ID);
+                Model.HJGL_BO_QualityRating newQualityRating = new Model.HJGL_BO_QualityRating();
+
+
+                newQualityRating.CH_TrustItemID = cH_TrustItemID;
+                if (!string.IsNullOrEmpty(jot.ISO_ID))
+                {
+                    newQualityRating.ISO_ID = jot.ISO_ID;
+                }
+                if (!string.IsNullOrEmpty(trustItem.JOT_ID))
+                {
+                    newQualityRating.JOT_ID = trustItem.JOT_ID;
+                }
+                newQualityRating.Remake = Convert.ToBoolean(values.Value<string>("Remake"));
+                newQualityRating.RemakeResult = values.Value<string>("RemakeResult");
+                if (Grid1.Columns[5].Hidden == true)
+                {
+                    newQualityRating.FilmNum = null;
+                }
+                else
+                {
+                    newQualityRating.FilmNum = values.Value<string>("FilmNum");
+                }
+                newQualityRating.RepairTag = values.Value<string>("RepairTag");
+                newQualityRating.RMaterial = Convert.ToBoolean(values.Value<string>("RMaterial"));
+                newQualityRating.Cack = Convert.ToBoolean(values.Value<string>("Cack"));
+                newQualityRating.NotFusion = Convert.ToBoolean(values.Value<string>("NotFusion"));
+                newQualityRating.NotPenetration = Convert.ToBoolean(values.Value<string>("NotPenetration"));
+                newQualityRating.StripDefects = Convert.ToBoolean(values.Value<string>("StripDefects"));
+                newQualityRating.CircularDefects = Convert.ToBoolean(values.Value<string>("CircularDefects"));
+                newQualityRating.DeepHoleDefects = Convert.ToBoolean(values.Value<string>("DeepHoleDefects"));
+                newQualityRating.RootsConcave = Convert.ToBoolean(values.Value<string>("RootsConcave"));
+                newQualityRating.RootsBiteEdge = Convert.ToBoolean(values.Value<string>("RootsBiteEdge"));
+                newQualityRating.PseudoDefects = Convert.ToBoolean(values.Value<string>("PseudoDefects"));
+                newQualityRating.DefectLength = values.Value<string>("DefectLength");
+                newQualityRating.DefectResult = values.Value<string>("DefectResult");
+                newQualityRating.DefectRation = values.Value<string>("DefectRation");
+                newQualityRating.SignDate = Funs.GetNewDateTime(values.Value<string>("SignDate"));
+                newQualityRating.Remark = values.Value<string>("Remark");
+
+                newQualityRating.DetectLength = Funs.GetNewDecimal(values.Value<string>("DetectLength"));
+                newQualityRating.PeakAmplitude = values.Value<string>("PeakAmplitude");
+                newQualityRating.DefectLocation = values.Value<string>("DefectLocation");
+                newQualityRating.DepthDefect = Funs.GetNewDecimal(values.Value<string>("DepthDefect"));
+                newQualityRating.IndicatingLength = Funs.GetNewDecimal(values.Value<string>("IndicatingLength"));
+                newQualityRating.DefectHeight = Funs.GetNewDecimal(values.Value<string>("DefectHeight"));
+                newQualityRating.DefectsHighSide = Funs.GetNewDecimal(values.Value<string>("DefectsHighSide"));
+                newQualityRating.DefectSize = Funs.GetNewDecimal(values.Value<string>("DefectSize"));
+
+                newQualityRating.DefectNature = values.Value<string>("DefectNature");
+                if (values.Value<string>("IsPass") == "不合格")
+                {
+                    b = false;
+                    bRT = false;
+                }
+                if (Convert.ToBoolean(values.Value<string>("Remake")))
+                {
+                    needRemake = true;
+                }
+                newQualityRating.IsPass = values.Value<string>("IsPass");
+                this.QualityRatingId = values.Value<string>("QualityRatingId");
+                if (trust.CH_NDTMethod == "20d2cbca-8b3d-434b-b1c1-181796986fa5")   //RT检测，评定结果不为空才保存拍片记录
+                {
+                    //if (!string.IsNullOrEmpty(newQualityRating.DefectResult))
+                    //{
+                        filmNum++;
+                        if (newQualityRating.RMaterial == true)
+                        {
+                            rMatNum++;
+                        }
                         var quatlityRating = BLL.HJGL_BO_QualityRatingService.GetQualityRatingById(this.QualityRatingId);
                         if (quatlityRating == null)
                         {
@@ -822,21 +826,40 @@ namespace FineUIPro.Web.HJGL.CheckManage
                             newQualityRating.QualityRatingId = this.QualityRatingId;
                             BLL.HJGL_BO_QualityRatingService.UpadteQualityRating(newQualityRating);
                         }
-                    }
+                    //}
-                    BLL.HJGL_CH_TrustItemService.UpdateTrustItem(trustItem);
+                }
-
+                else
-                    //  有焊口增加的，对应的检测报告打印要变成未打印状态
+                {
-                    var p = from x in Funs.DB.HJGL_CH_TestingReportPrint
+                    var quatlityRating = BLL.HJGL_BO_QualityRatingService.GetQualityRatingById(this.QualityRatingId);
-                            where x.ISO_ID == jot.ISO_ID && x.Specifications == jot.JOT_JointDesc
+                    if (quatlityRating == null)
-                                  && x.NDT_ID == trust.CH_NDTMethod && x.BatchId == trust.BatchId
-                            select x;
-                    if (p.Count() > 0)
                     {
-                        Model.HJGL_CH_TestingReportPrint report = Funs.DB.HJGL_CH_TestingReportPrint.FirstOrDefault(x => x.TestingReportPrintId == p.First().TestingReportPrintId);
+                        newQualityRating.QualityRatingId = this.QualityRatingId;
-                        report.Printer = null;
+                        BLL.HJGL_BO_QualityRatingService.AddQualityRating(newQualityRating);
-                        report.PrintTime = null;
-                        Funs.DB.SubmitChanges();
                     }
+                    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);
+                    }
+                }
+                BLL.HJGL_CH_TrustItemService.UpdateTrustItem(trustItem);
+
+                //  有焊口增加的，对应的检测报告打印要变成未打印状态
+                var p = from x in Funs.DB.HJGL_CH_TestingReportPrint
+                        where x.ISO_ID == jot.ISO_ID && x.Specifications == jot.JOT_JointDesc
+                              && x.NDT_ID == trust.CH_NDTMethod && x.BatchId == trust.BatchId
+                        select x;
+                if (p.Count() > 0)
+                {
+                    Model.HJGL_CH_TestingReportPrint report = Funs.DB.HJGL_CH_TestingReportPrint.FirstOrDefault(x => x.TestingReportPrintId == p.First().TestingReportPrintId);
+                    report.Printer = null;
+                    report.PrintTime = null;
+                    Funs.DB.SubmitChanges();
                 }
             }
             //更新列表最后一个口的数据
@@ -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)
                 {