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

11

Browse Source
This commit is contained in:
jackchenyang
2024-05-30 20:14:15 +08:00
parent 359228e24a 062f48649b
commit 9203802b9e
7 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs
+3 -3
View File
@@ -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 { }
}
HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs
+5 -5
View File
@@ -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";
}
}
HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs
+5 -4
View File
@@ -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";
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs
+1 -1
View File
@@ -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)
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/SelectExpandPoint.aspx.cs
+3 -3
View File
@@ -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 { }
}