shecs/Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
佘春生
2024-06-07 07:28:00 +08:00
parent 8a9a90e77d
commit 0a6cd1ea69
23 changed files with 1722 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs
+1 -1
View File
@@ -485,7 +485,7 @@ namespace FineUIPro.Web.CheckManage
if (ndtItem != string.Empty)
{
var q = BLL.Batch_NDEItemService.GetNDEItemById(ndtItem);
if (q.PassFilm != q.TotalFilm && q.SubmitDate.HasValue)
if ((q.PassFilm != q.TotalFilm || q.Remark.Contains("修磨") || q.Remark.Contains("异物")) && q.SubmitDate.HasValue)
{
string window = String.Format("RepairNotice.aspx?NDEItemID={0}", ndtItem, "返修通知单");
PageContext.RegisterStartupScript(WindowRepair.GetShowReference(window));
HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs
+5 -5
View File
@@ -210,7 +210,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
if (repairRecord != null && !string.IsNullOrEmpty(repairRecord.RepairRecordCode))
{
// 取返修单后4位
code4 = repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 4);
code4 = repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 5);
// 取返修单后2位
code2 = repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 2);
}
@@ -245,7 +245,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@DetectionTypeId", repairRecord.DetectionTypeId));
// 如果是第二次返修不加载扩透口
if (!code4.Contains("K1") && code2 == "R2")
if (!code4.Contains("EX1") && code2 == "R2")
{
listStr.Add(new SqlParameter("@ProjectId", "0"));
}
@@ -263,7 +263,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
}
else
{
if (ndtItem.JudgeGrade == "修磨" || ndtItem.JudgeGrade == "异物")
if (ndtItem.Remark.Contains("修磨") || ndtItem.Remark.Contains("异物"))
{
listStr.Add(new SqlParameter("@ProjectId", "0"));
}
@@ -724,7 +724,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
if (code != null && !string.IsNullOrEmpty(code.RepairRecordCode))
{
// 取返修单后4位
string code4 = code.RepairRecordCode.Substring(code.RepairRecordCode.Length - 4);
string code4 = code.RepairRecordCode.Substring(code.RepairRecordCode.Length - 5);
// 取返修单后2位
string code2 = code.RepairRecordCode.Substring(code.RepairRecordCode.Length - 2);
if (code2 == "R1")
@@ -749,7 +749,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
}
else
{
if (code4.Contains("K1") && code2 == "R2")
if (code4.Contains("EX1") && code2 == "R2")
{
Grid1.SelectAllRows();
}
HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs
+4 -1
View File
@@ -81,7 +81,10 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
{
newItem.RepairRecordCode = q.TrustBatchCode + "-" + q.WeldJointCode + "P1";
}
else if (q.Remark.Contains("异物"))
{
newItem.RepairRecordCode = q.TrustBatchCode + "-" + q.WeldJointCode + "S1";
}
else
{
newItem.RepairRecordCode = q.TrustBatchCode + "-" + q.WeldJointCode + "R1";