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/API/HJGL/APIPackagingManageService.cs
+12 -2
View File
@@ -16,6 +16,8 @@ namespace BLL
{
var q = (from x in db.HJGL_PackagingManage
join n in db.Base_Project on x.ProjectId equals n.ProjectId
join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into tt
from t in tt.DefaultIfEmpty()
where x.ProjectId == projectId
select new PackagingManageDetailItem
{
@@ -26,6 +28,8 @@ namespace BLL
ContactPhone = x.ContactPhone,
StackingPosition = x.StackingPosition,
State= x.State,
ReceiveMan=t.PersonName,
ReceiveDate=x.ReceiveDate,
}).Distinct();
return q.ToList();
@@ -39,6 +43,8 @@ namespace BLL
PackagingManageItem packagingManageItem = new PackagingManageItem();
var q = (from x in db.HJGL_PackagingManage
join n in db.Base_Project on x.ProjectId equals n.ProjectId
join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into tt
from t in tt.DefaultIfEmpty()
where x.PackagingManageId == packagingManageId
select new PackagingManageDetailItem
{
@@ -49,7 +55,9 @@ namespace BLL
ContactName = x.ContactName,
ContactPhone = x.ContactPhone,
StackingPosition = x.StackingPosition,
State =x.State
State =x.State,
ReceiveMan = t.PersonName,
ReceiveDate = x.ReceiveDate,
}).FirstOrDefault();
var tb_packing = (from x in db.HJGL_PackagingManage where x.PackagingManageId==packagingManageId select x ).FirstOrDefault() ;
var PipelineComponentIdList = tb_packing.PipelineComponentId.Split(',');
@@ -74,12 +82,14 @@ namespace BLL
}
}
public static void GetPackingInfoConfirmArrival(string packagingManageId)
public static void GetPackingInfoConfirmArrival(string packagingManageId,string PersonId)
{
var q= BLL.HJGL_PackagingmanageService.GetHJGL_PackagingManageById(packagingManageId);
if (q!=null)
{
q.State = HJGL_PackagingmanageService.state_2;
q.ReceiveMan = PersonId;
q.ReceiveDate = DateTime.Now;
HJGL_PackagingmanageService.UpdateHJGL_PackagingManage(q);
}
}
SGGL/BLL/API/HJGL/APIPipelineComponentService.cs
+12 -2
View File
@@ -18,7 +18,9 @@ namespace BLL
var q = (from x in db.HJGL_Pipeline_Component
join y in db.HJGL_Pipeline on x.PipelineId equals y.PipelineId
join z in db.Base_Unit on x.PreUnit equals z.UnitId into tt
from t in tt.DefaultIfEmpty()
join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into pp
from t in tt.DefaultIfEmpty()
from p in pp.DefaultIfEmpty()
where y.ProjectId == projectid
select new PipelineComponentItem
{
@@ -30,6 +32,8 @@ namespace BLL
State = x.State,
PlanStartDate = y.PlanStartDate,
QRCode = x.QRCode,
ReceiveMan=p.PersonName,
ReceiveDate=x.ReceiveDate
}).Distinct();
return q.ToList();
@@ -44,7 +48,9 @@ namespace BLL
var q = (from x in db.HJGL_Pipeline_Component
join y in db.HJGL_Pipeline on x.PipelineId equals y.PipelineId
join z in db.Base_Unit on x.PreUnit equals z.UnitId into tt
join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into pp
from t in tt.DefaultIfEmpty()
from p in pp.DefaultIfEmpty()
where x.PipelineComponentId== PipelineComponentId
select new PipelineComponentItem
{
@@ -56,6 +62,8 @@ namespace BLL
State = x.State,
PlanStartDate = y.PlanStartDate,
QRCode = x.QRCode,
ReceiveMan = p.PersonName,
ReceiveDate = x.ReceiveDate
}).FirstOrDefault();
bool isPower = Person_PersonsService.IsGeneralUnitByPersonId(personId, projectId);
pipelineComponentDetail.pipelineComponentItem = q;
@@ -64,12 +72,14 @@ namespace BLL
}
}
public static void GetComponentConfirmArrival(string PipelineComponentId)
public static void GetComponentConfirmArrival(string PipelineComponentId,string PersonId)
{
var q = BLL.HJGL_PipelineComponentService.GetPipelineComponentById(PipelineComponentId);
if (q != null)
{
q.State = HJGL_PipelineComponentService.state_1;
q.ReceiveMan = PersonId;
q.ReceiveDate = DateTime.Now;
HJGL_PipelineComponentService.UpdatePipelineComponent(q);
}
}
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);
}