From 2f562e57aa9e64362b9b01e4f089fc203c88091b Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Wed, 4 Mar 2026 16:18:48 +0800
Subject: [PATCH] =?UTF-8?q?20260304=20=E6=89=B9=E9=87=8F=E6=8F=90=E4=BA=A4?=
=?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=8F=A3=E7=9A=84=E8=B4=A8=E9=87=8F=E7=AD=89?=
=?UTF-8?q?=E7=BA=A7=E8=AF=84=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../HJGL/CheckManage/QualityRating.aspx | 2 +-
.../HJGL/CheckManage/QualityRating.aspx.cs | 70 +++++++++----------
2 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/QualityRating.aspx b/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/QualityRating.aspx
index 0cb17d2..3231e58 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/QualityRating.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/QualityRating.aspx
@@ -229,7 +229,7 @@
HeaderTextAlign="Center" TextAlign="Center" Width="90px" FieldType="String">
-
+
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/QualityRating.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/QualityRating.aspx.cs
index c89c066..036840d 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/QualityRating.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/QualityRating.aspx.cs
@@ -875,62 +875,62 @@ namespace FineUIPro.Web.HJGL.CheckManage
report.PrintTime = null;
Funs.DB.SubmitChanges();
}
- }
- //更新列表最后一个口的数据
- if (!string.IsNullOrEmpty(changeId))
- {
- Model.HJGL_CH_TrustItem oldTrustItem1 = BLL.HJGL_CH_TrustItemService.GetTrustItemByID(changeId);
- Model.HJGL_CH_Trust trust1 = BLL.HJGL_TrustManageEditService.GetCH_TrustByID(oldTrustItem1.CH_TrustID);
- if (trust1.CH_NDTMethod != "20d2cbca-8b3d-434b-b1c1-181796986fa5") //非RT检测，更新焊口检测状态
+ //}
+ //更新列表焊口的数据
+ if (!string.IsNullOrEmpty(changeId))
{
- if (hasResult)
+ Model.HJGL_CH_TrustItem oldTrustItem1 = BLL.HJGL_CH_TrustItemService.GetTrustItemByID(changeId);
+ Model.HJGL_CH_Trust trust1 = BLL.HJGL_TrustManageEditService.GetCH_TrustByID(oldTrustItem1.CH_TrustID);
+ if (trust1.CH_NDTMethod != "20d2cbca-8b3d-434b-b1c1-181796986fa5") //非RT检测，更新焊口检测状态
{
- if (b)
+ if (hasResult)
{
- if (needRemake)
+ if (b)
{
- oldTrustItem1.States = "3"; //待重检
+ if (needRemake)
+ {
+ oldTrustItem1.States = "3"; //待重检
+ }
+ else
+ {
+ oldTrustItem1.States = "2"; //检测合格
+ }
}
else
{
- oldTrustItem1.States = "2"; //检测合格
+ oldTrustItem1.States = "4"; //待返修
}
}
- else
- {
- oldTrustItem1.States = "4"; //待返修
- }
}
- }
- else
- {
- if (hasResult)
+ else
{
- if (bRT)
+ if (hasResult)
{
- if (needRemake)
+ if (bRT)
{
- oldTrustItem1.States = "3"; //待重检
+ if (needRemake)
+ {
+ oldTrustItem1.States = "3"; //待重检
+ }
+ else
+ {
+ oldTrustItem1.States = "2"; //检测合格
+ }
}
else
{
- oldTrustItem1.States = "2"; //检测合格
+ oldTrustItem1.States = "4"; //待返修
}
}
- else
- {
- oldTrustItem1.States = "4"; //待返修
- }
}
+ oldTrustItem1.FeedbackMan = this.CurrUser.UserName;
+ oldTrustItem1.FeedbackDate = DateTime.Now;
+ BLL.HJGL_PW_JointInfoService.JointFileNumWriteBack(oldTrustItem1.JOT_ID, filmNum);
+ BLL.HJGL_PW_JointInfoService.JointRMaterialWriteBack(oldTrustItem1.JOT_ID, rMatNum);
+ BLL.HJGL_PW_JointInfoService.JointCheckStateWriteBack(oldTrustItem1.JOT_ID, trust1.CH_NDTMethod, oldTrustItem1.States);
+ BLL.HJGL_CH_TrustItemService.UpdateTrustItem(oldTrustItem1);
}
- oldTrustItem1.FeedbackMan = this.CurrUser.UserName;
- oldTrustItem1.FeedbackDate = DateTime.Now;
- BLL.HJGL_PW_JointInfoService.JointFileNumWriteBack(oldTrustItem1.JOT_ID, filmNum);
- BLL.HJGL_PW_JointInfoService.JointRMaterialWriteBack(oldTrustItem1.JOT_ID, rMatNum);
- BLL.HJGL_PW_JointInfoService.JointCheckStateWriteBack(oldTrustItem1.JOT_ID, trust1.CH_NDTMethod, oldTrustItem1.States);
- BLL.HJGL_CH_TrustItemService.UpdateTrustItem(oldTrustItem1);
}
-
// 删除现有数据
List deletedRows = Grid1.GetDeletedList();
foreach (int rowIndex in deletedRows)