2022-10-15 焊接修改

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
+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);
}
}