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

11

Browse Source
This commit is contained in:
佘春生
2024-06-05 08:24:19 +08:00
parent 1677a6d714
commit 3990f747ce
67 changed files with 6774 additions and 1645 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/BLL/WeldingProcess/CheckManage/RepairRecordService.cs
+1 -1
View File
@@ -92,7 +92,7 @@ namespace BLL
public static List<Model.Batch_PointBatchItem> GetExportItem(string repairRecordId)
{
Model.HJGLDB db = Funs.DB;
var exp =from x in db.Batch_PointBatchItem where x.RepairRecordId == repairRecordId select x;
var exp = from x in db.Batch_PointBatchItem where x.RepairRecordId == repairRecordId && x.PointState == "2" select x;
if (exp.Count() > 0)
{
return exp.ToList();
HJGL/BLL/WeldingProcess/TestPackageManage/TestPackageManageEditService.cs
+3
View File
@@ -169,6 +169,9 @@ namespace BLL
newPipelineList.PTP_ID = IsoList.PTP_ID;
newPipelineList.PipelineId = IsoList.PipelineId;
newPipelineList.PT_DataType = IsoList.PT_DataType;
newPipelineList.IsAll = IsoList.IsAll;
newPipelineList.WorkAreaId= IsoList.WorkAreaId;
newPipelineList.WeldJonintCode = IsoList.WeldJonintCode;
db.PTP_PipelineList.InsertOnSubmit(newPipelineList);
db.SubmitChanges();
}
HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs
+1
View File
@@ -205,6 +205,7 @@ namespace BLL
{
newWeldJoint.WeldingLocationId = weldJoint.WeldingLocationId;
}
if (!string.IsNullOrEmpty(weldJoint.WeldMatId))
{
newWeldJoint.WeldMatId = weldJoint.WeldMatId;
HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldingDailyService.cs
+9 -5
View File
@@ -61,13 +61,16 @@ namespace BLL
newWeldReportItem.JointArea = item.JointArea;
newWeldReportItem.WeldingLocationId = item.WeldingLocationId;
newWeldReportItem.WeldingLocationCode = item.WeldingLocationCode;
newWeldReportItem.JointAttribute = item.JointAttribute;
newWeldReportItem.DoneDin = item.DoneDin;
newWeldReportItem.Dia = item.Dia;
newWeldReportItem.Thickness = item.Thickness;
newWeldReportItem.WeldingMethodCode = item.WeldingMethodCode;
newWeldReportItem.HeartNo1 = item.HeartNo1;
newWeldReportItem.HeartNo2 = item.HeartNo2;
newWeldReportItem.CoodeHeartNo1 = item.Coode1 + ":" + item.HeartNo1;
newWeldReportItem.CoodeHeartNo2 = item.Coode2 + ":" + item.HeartNo2;
//newWeldReportItem.HeartNo1 = item.HeartNo1;
//newWeldReportItem.HeartNo2 = item.HeartNo2;
newWeldReportItem.Components1Code = item.ComponentsCode1;
newWeldReportItem.Components2Code = item.ComponentsCode2;
newWeldReportItem.Material1Code = item.Material1Code;
@@ -141,9 +144,10 @@ namespace BLL
newWeldReportItem.WeldingLocationId = weldline.WeldingLocationId;
newWeldReportItem.WeldingLocationCode = weldline.WeldingLocationCode;
newWeldReportItem.JointAttribute = weldline.JointAttribute;
newWeldReportItem.HeartNo1 = weldline.HeartNo1;
newWeldReportItem.HeartNo2 = weldline.HeartNo2;
newWeldReportItem.CoodeHeartNo1 = weldline.Coode1 + ":" + weldline.HeartNo1;
newWeldReportItem.CoodeHeartNo2 = weldline.Coode2 + ":" + weldline.HeartNo2;
//newWeldReportItem.HeartNo1 = weldline.HeartNo1;
//newWeldReportItem.HeartNo2 = weldline.HeartNo2;
newWeldReportItem.Components1Code = weldline.ComponentsCode1;
newWeldReportItem.Components2Code = weldline.ComponentsCode2;
newWeldReportItem.Material1Code = weldline.Material1Code;