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

1

This commit is contained in:
高飞 2025-12-02 15:04:00 +08:00
parent 1bd9ba36c3
commit 6ec3af0ba9
1 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -663,6 +663,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
bool b = true; //默认合格
bool bRT = true; //RT默认合格
bool needRemake = false; //重拍
bool hasResult = true; //是否有检测结果
foreach (JObject mergedRow in Grid1.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
@ -677,6 +678,8 @@ namespace FineUIPro.Web.HJGL.CheckManage
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 (hasResult)
{
if (b)
{
@ -694,7 +697,10 @@ namespace FineUIPro.Web.HJGL.CheckManage
oldTrustItem.States = "4"; //待返修
}
}
}
else
{
if (hasResult)
{
if (bRT)
{
@ -712,6 +718,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
oldTrustItem.States = "4"; //待返修
}
}
}
oldTrustItem.FeedbackMan = this.CurrUser.UserName;
oldTrustItem.FeedbackDate = DateTime.Now;
@ -721,7 +728,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
b = true;
bRT = true;
needRemake = false;
hasResult = true;
filmNum = 0;
rMatNum = 0;
}
@ -795,6 +802,10 @@ namespace FineUIPro.Web.HJGL.CheckManage
b = false;
bRT = false;
}
if (values.Value<string>("IsPass") == "")
{
hasResult = false;
}
if (Convert.ToBoolean(values.Value<string>("Remake")))
{
needRemake = true;
@ -868,6 +879,8 @@ namespace FineUIPro.Web.HJGL.CheckManage
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 (hasResult)
{
if (b)
{
@ -885,7 +898,10 @@ namespace FineUIPro.Web.HJGL.CheckManage
oldTrustItem1.States = "4"; //待返修
}
}
}
else
{
if (hasResult)
{
if (bRT)
{
@ -903,6 +919,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
oldTrustItem1.States = "4"; //待返修
}
}
}
oldTrustItem1.FeedbackMan = this.CurrUser.UserName;
oldTrustItem1.FeedbackDate = DateTime.Now;
BLL.HJGL_PW_JointInfoService.JointFileNumWriteBack(oldTrustItem1.JOT_ID, filmNum);