lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2022-10-15 焊接修改

Browse Source
This commit is contained in:
李鹏飞
2022-10-15 15:40:49 +08:00
parent 9183f74b55
commit 0ec0031e20
26 changed files with 1623 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HJGL/DataImport/DataImportService.cs
+1 -1
View File
@@ -179,7 +179,7 @@ namespace BLL
}
).FirstOrDefault();
//where t.Key == UnitWorkId & x.FileType == "1" select x.Version).Distinct().ToList();
if (!string.IsNullOrEmpty(q.FileName))
if (q!=null&&!string.IsNullOrEmpty(q.FileName))
{
result=q.FileName.Substring (0,q.FileName.LastIndexOf('.'));
SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs
+4
View File
@@ -158,6 +158,8 @@ namespace BLL
ContactName = newtable.ContactName,
ContactPhone = newtable.ContactPhone,
Remark = newtable.Remark,
ReceiveDate = newtable.ReceiveDate,
ReceiveMan = newtable.ReceiveMan,
};
db.HJGL_PackagingManage.InsertOnSubmit(table);
db.SubmitChanges();
@@ -179,6 +181,8 @@ namespace BLL
table.ContactName = newtable.ContactName;
table.ContactPhone = newtable.ContactPhone;
table.Remark = newtable.Remark;
table.ReceiveMan=newtable.ReceiveMan;
table.ReceiveDate=newtable.ReceiveDate;
db.SubmitChanges();
}
SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs
+7 -1
View File
@@ -133,6 +133,8 @@ namespace BLL
newPipeline.ActStartDate = pipeline.ActStartDate;
newPipeline.ActEndDate = pipeline.ActEndDate;
newPipeline.DrawingName = pipeline.DrawingName;
newPipeline.ReceiveMan= pipeline.ReceiveMan;
newPipeline.ReceiveDate= pipeline.ReceiveDate;
db.HJGL_Pipeline_Component.InsertOnSubmit(newPipeline);
db.SubmitChanges();
}
@@ -160,15 +162,19 @@ namespace BLL
newPipeline.ActStartDate = pipeline.ActStartDate;
newPipeline.ActEndDate = pipeline.ActEndDate;
newPipeline.DrawingName = pipeline.DrawingName;
newPipeline.ReceiveMan = pipeline.ReceiveMan;
newPipeline.ReceiveDate = pipeline.ReceiveDate;
db.SubmitChanges();
}
}
public static void UpdateOutState(string pipelineComponentId)
public static void UpdateOutState(string pipelineComponentId,string BoxNumber)
{
var q=GetPipelineComponentById(pipelineComponentId);
if (q.State==state_1)
{
q.State = state_2;
q.BoxNumber=BoxNumber;
UpdatePipelineComponent(q);
}