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

1

Browse Source
This commit is contained in:
李鹏飞
2024-10-22 21:13:56 +08:00
parent cb13fe481d
commit e680580417
25 changed files with 2099 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs
+5 -5
View File
@@ -33,7 +33,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
if (!string.IsNullOrEmpty(repairRecordId))
{
this.txtPipeCode.Text = jot.PipelineCode;
txtWeldJointCode.Text = jot.WeldJointCode;
txtWeldJointCode.Text = jot.WeldJointCode+repairRecord.RepairMark;
txtWelder.Text = jot.BackingWelderCode;
txtRepairLocation.Text = repairRecord.RepairLocation;
txtJudgeGrade.Text = ndeItem.JudgeGrade;
@@ -657,11 +657,11 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
//}
db.Repair_RepairRecord.DeleteOnSubmit(repair);
db.SubmitChanges();
if (joint.WeldJointCode.Contains("P") || joint.WeldJointCode.Contains("S") || joint.WeldJointCode.Contains("R"))
{
Pipeline_WeldJointService.DeleteWeldJointById(joint.WeldJointId);
//if (joint.WeldJointCode.Contains("P") || joint.WeldJointCode.Contains("S") || joint.WeldJointCode.Contains("R"))
//{
// Pipeline_WeldJointService.DeleteWeldJointById(joint.WeldJointId);
}
//}
this.InitTreeMenu();//加载树
Alert.ShowInTop("删除成功！", MessageBoxIcon.Success);
}
HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs
+55 -55
View File
@@ -212,61 +212,61 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
// 回写焊口号
var weldJoint = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(q.WeldJointId);
//joint.WeldJointCode = newJointCode;
//joint.OldWeldJointCode = q.WeldJointCode;
//Funs.DB.SubmitChanges();
Model.Pipeline_WeldJoint newWeldJoint = new Model.Pipeline_WeldJoint
{
WeldJointId = SQLHelper.GetNewID(typeof(Model.Pipeline_WeldJoint)),
ProjectId = weldJoint.ProjectId,
PipelineId = weldJoint.PipelineId,
WeldJointCode = newJointCode,
WeldTypeId = weldJoint.WeldTypeId,
Material1Id = weldJoint.Material1Id,
Material2Id = weldJoint.Material2Id,
Thickness = weldJoint.Thickness,
Dia = weldJoint.Dia,
Size = weldJoint.Size,
JointAttribute = weldJoint.JointAttribute,
JointArea = weldJoint.JointArea,
WeldingMethodId = weldJoint.WeldingMethodId,
IsHotProess = weldJoint.IsHotProess,
WeldingLocationId = weldJoint.WeldingLocationId,
WeldMatId = weldJoint.WeldMatId,
WeldSilkId = weldJoint.WeldSilkId,
GrooveTypeId = weldJoint.GrooveTypeId,
PipeSegment = weldJoint.PipeSegment,
PipeAssembly1Id = weldJoint.PipeAssembly1Id,
PipeAssembly2Id = weldJoint.PipeAssembly2Id,
PipeAssemblyCount = weldJoint.PipeAssemblyCount,
HeartNo1 = weldJoint.HeartNo1,
HeartNo2 = weldJoint.HeartNo2,
LastTemp = weldJoint.LastTemp,
CellTemp = weldJoint.CellTemp,
PrepareTemp = weldJoint.PrepareTemp,
Electricity = weldJoint.Electricity,
Voltage = weldJoint.Voltage,
TestPackageNo = weldJoint.TestPackageNo,
WeldingDailyCode = weldJoint.WeldingDailyCode,
BackingWelderId = weldJoint.BackingWelderId,
CoverWelderId = weldJoint.CoverWelderId,
WeldingDailyId = weldJoint.WeldingDailyId,
PipingClassId = weldJoint.PipingClassId,
Specification = weldJoint.Specification,
DoneDin = weldJoint.DoneDin,
SystemNumber = weldJoint.SystemNumber,
Remark = weldJoint.Remark,
IsGoldJoint = weldJoint.IsGoldJoint,
IsPMI = weldJoint.IsPMI,
WPQId = weldJoint.WPQId,
DetectionType = weldJoint.DetectionType,
PageNum = weldJoint.PageNum,
ANSISCH = weldJoint.ANSISCH,
OldWeldJointCode = weldJoint.OldWeldJointCode,
/*var joint = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(q.WeldJointId);
joint.WeldJointCode = newJointCode;
joint.OldWeldJointCode = q.WeldJointCode;
Funs.DB.SubmitChanges();*/
// Model.Pipeline_WeldJoint newWeldJoint = new Model.Pipeline_WeldJoint
// {
// WeldJointId = SQLHelper.GetNewID(typeof(Model.Pipeline_WeldJoint)),
// ProjectId = weldJoint.ProjectId,
// PipelineId = weldJoint.PipelineId,
// WeldJointCode = newJointCode,
// WeldTypeId = weldJoint.WeldTypeId,
// Material1Id = weldJoint.Material1Id,
// Material2Id = weldJoint.Material2Id,
// Thickness = weldJoint.Thickness,
// Dia = weldJoint.Dia,
// Size = weldJoint.Size,
// JointAttribute = weldJoint.JointAttribute,
// JointArea = weldJoint.JointArea,
// WeldingMethodId = weldJoint.WeldingMethodId,
// IsHotProess = weldJoint.IsHotProess,
// WeldingLocationId = weldJoint.WeldingLocationId,
// WeldMatId = weldJoint.WeldMatId,
// WeldSilkId = weldJoint.WeldSilkId,
// GrooveTypeId = weldJoint.GrooveTypeId,
// PipeSegment = weldJoint.PipeSegment,
// PipeAssembly1Id = weldJoint.PipeAssembly1Id,
// PipeAssembly2Id = weldJoint.PipeAssembly2Id,
// PipeAssemblyCount = weldJoint.PipeAssemblyCount,
// HeartNo1 = weldJoint.HeartNo1,
// HeartNo2 = weldJoint.HeartNo2,
// LastTemp = weldJoint.LastTemp,
// CellTemp = weldJoint.CellTemp,
// PrepareTemp = weldJoint.PrepareTemp,
// Electricity = weldJoint.Electricity,
// Voltage = weldJoint.Voltage,
// TestPackageNo = weldJoint.TestPackageNo,
// WeldingDailyCode = weldJoint.WeldingDailyCode,
// BackingWelderId = weldJoint.BackingWelderId,
// CoverWelderId = weldJoint.CoverWelderId,
// WeldingDailyId = weldJoint.WeldingDailyId,
// PipingClassId = weldJoint.PipingClassId,
// Specification = weldJoint.Specification,
// DoneDin = weldJoint.DoneDin,
// SystemNumber = weldJoint.SystemNumber,
// Remark = weldJoint.Remark,
// IsGoldJoint = weldJoint.IsGoldJoint,
// IsPMI = weldJoint.IsPMI,
// WPQId = weldJoint.WPQId,
// DetectionType = weldJoint.DetectionType,
// PageNum = weldJoint.PageNum,
// ANSISCH = weldJoint.ANSISCH,
// OldWeldJointCode = weldJoint.OldWeldJointCode,
};
string WeldJointId= BLL.Pipeline_WeldJointService.AddWeldJointRef(newWeldJoint);
// };
//string WeldJointId= BLL.Pipeline_WeldJointService.AddWeldJointRef(newWeldJoint);
newItem.ProjectId = q.ProjectId;
newItem.UnitId = q.UnitId;
@@ -274,7 +274,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
newItem.WorkAreaId = q.WorkAreaId;
newItem.NoticeDate = DateTime.Now;
newItem.NDEItemID = ndeItemId;
newItem.WeldJointId = WeldJointId;
newItem.WeldJointId = q.WeldJointId;
newItem.DetectionTypeId = q.DetectionTypeId;
newItem.WelderId = q.BackingWelderId;
newItem.RepairLocation = q.RepairLocation;