From 062f48649bc14ad0a94c6ddcf4fd6a9920be8d86 Mon Sep 17 00:00:00 2001 From: shecs <408299694@qq.com> Date: Thu, 30 May 2024 20:01:56 +0800 Subject: [PATCH] 11 --- HJGL/.vs/HJGL/config/applicationhost.config | 4 ++-- HJGL/.vs/HJGL/v17/.suo | Bin 1376768 -> 1382912 bytes HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- HJGL/FineUIPro.Web/Web.config | 2 +- .../CheckManage/CheckManage.aspx.cs | 6 +++--- .../CheckManage/RepairAndExpand.aspx.cs | 10 +++++----- .../CheckManage/RepairNotice.aspx.cs | 9 +++++---- .../TrustManage/PointManage.aspx.cs | 2 +- .../TrustManage/SelectExpandPoint.aspx.cs | 6 +++--- HJGL/WebApi/WebApi.csproj.user | 2 +- 10 files changed, 22 insertions(+), 21 deletions(-) diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index e47cfd0..1963de0 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -162,7 +162,7 @@ - + @@ -250,7 +250,7 @@ - + diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index c0ab7c724a70fca970fa21502e0daf27f637d63a..6a192681b7ffcac342f92a45cd8b20f52ef6ec1f 100644 GIT binary patch delta 37556 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 DVR4AQ delta 14957 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 A!~g&Q diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 0baedd9..8d0cdf2 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ ProjectFiles - Release|Any CPU + Debug|Any CPU true diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config index 9ecdad1..baa8804 100644 --- a/HJGL/FineUIPro.Web/Web.config +++ b/HJGL/FineUIPro.Web/Web.config @@ -9,7 +9,7 @@
- + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs index b5f0b20..6cb9eb9 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs @@ -734,15 +734,15 @@ namespace FineUIPro.Web.CheckManage var jointInfo = db.Pipeline_WeldJoint.FirstOrDefault(x => x.WeldJointId == pointBatchItem.WeldJointId); int k_num = 0; - string jot = "K1"; - int indexK = jointInfo.WeldJointCode.LastIndexOf("K"); + string jot = "EX1"; + int indexK = jointInfo.WeldJointCode.LastIndexOf("EX"); if (indexK > 0) { try { k_num = Convert.ToInt32(jointInfo.WeldJointCode.Substring(indexK + 1, 1)) + 1; - jot = "K" + k_num.ToString(); + jot = "EX" + k_num.ToString(); } catch { } } diff --git a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs index a650b26..f69a03a 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs @@ -573,19 +573,19 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage if (exp != null) { string exportTrustCode = string.Empty; - if (repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 4) == "K1R2") + if (repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 5) == "EX1R2") { - exportTrustCode = repairRecord.RepairRecordCode.Substring(0, repairRecord.RepairRecordCode.Length - 4) + "K2R2"; + exportTrustCode = repairRecord.RepairRecordCode.Substring(0, repairRecord.RepairRecordCode.Length - 4) + "EX2R2"; } else { - if (repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 4) == "K1R1") + if (repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 5) == "EX1R1") { - exportTrustCode = repairRecord.RepairRecordCode.Substring(0, repairRecord.RepairRecordCode.Length - 4) + "K2"; + exportTrustCode = repairRecord.RepairRecordCode.Substring(0, repairRecord.RepairRecordCode.Length - 4) + "EX2"; } else { - exportTrustCode = repairRecord.RepairRecordCode.Substring(0, repairRecord.RepairRecordCode.Length - 2) + "K1"; + exportTrustCode = repairRecord.RepairRecordCode.Substring(0, repairRecord.RepairRecordCode.Length - 2) + "EX1"; } } diff --git a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs index 3af7183..58ef0cc 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs @@ -71,16 +71,17 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage } else { - if (code.Substring(code.Length - 2, 1) == "K") + if (code.Substring(code.Length - 3, 2) == "EX") { - newItem.RepairRecordCode = q.TrustBatchCode.Substring(0, code.Length - 2) + "-" + q.WeldJointCode + "K1R1"; + newItem.RepairRecordCode = q.TrustBatchCode.Substring(0, code.Length - 3) + "-" + q.WeldJointCode + "EX1R1"; } else { - if (q.JudgeGrade == "修磨" || q.JudgeGrade == "异物") + if (q.Remark.Contains("修磨")) { - newItem.RepairRecordCode = q.TrustBatchCode + "-" + q.WeldJointCode + "M1"; + newItem.RepairRecordCode = q.TrustBatchCode + "-" + q.WeldJointCode + "P1"; } + else { newItem.RepairRecordCode = q.TrustBatchCode + "-" + q.WeldJointCode + "R1"; diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs index c8afdf3..8c52f9c 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs @@ -1272,7 +1272,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage pointBatchItem.CutDate = System.DateTime.Now;////更新批明细 切除日期 Funs.DB.SubmitChanges(); - BLL.Batch_PointBatchService.UpdateNewKuoOrCutJointNo(pointBatchItem.PointBatchItemId, "C"); + BLL.Batch_PointBatchService.UpdateNewKuoOrCutJointNo(pointBatchItem.PointBatchItemId, "C1"); // 更新批 是否委托:否 var updatePointBatch = BLL.Batch_PointBatchService.GetPointBatchById(this.PointBatchId); if (updatePointBatch != null) diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/SelectExpandPoint.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/SelectExpandPoint.aspx.cs index 780539f..0e86dfa 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/SelectExpandPoint.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/SelectExpandPoint.aspx.cs @@ -162,7 +162,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage db.SubmitChanges(); ////更新批明细 返修日期 状态 int k_num = 0; - string jot = "K1"; + string jot = "EX1"; Model.Pipeline_WeldJoint jointInfo = null; if (!String.IsNullOrEmpty(weldJointId)) @@ -178,13 +178,13 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage } } - int indexK = jointInfo.WeldJointCode.LastIndexOf("K"); + int indexK = jointInfo.WeldJointCode.LastIndexOf("EX"); if (indexK > 0) { try { k_num = Convert.ToInt32(jointInfo.WeldJointCode.Substring(indexK + 1, 1)) + 1; - jot = "K" + k_num.ToString(); + jot = "EX" + k_num.ToString(); } catch { } } diff --git a/HJGL/WebApi/WebApi.csproj.user b/HJGL/WebApi/WebApi.csproj.user index 33091aa..6db81e9 100644 --- a/HJGL/WebApi/WebApi.csproj.user +++ b/HJGL/WebApi/WebApi.csproj.user @@ -8,7 +8,7 @@ - Release|Any CPU + Debug|Any CPU FolderProfile