2022-10-11 焊接修改及接口新增
This commit is contained in:
@@ -10,14 +10,11 @@ namespace BLL
|
||||
{
|
||||
public class APIPackagingManageService
|
||||
{
|
||||
public static List<Model.PackagingManageDetailItem> GetPackagingManageList(string projectId,int pagesize,int pageindex)
|
||||
public static List<Model.PackagingManageDetailItem> GetPackagingManageList(string projectId)
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
var q = (from x in db.HJGL_PackagingManage
|
||||
//join y in db.HJGL_Pipeline_Component on x.PipelineComponentId equals y.PipelineComponentId
|
||||
// join z in db.HJGL_Pipeline on tt.PipelineId equals z.PipelineId
|
||||
//join m in db.WBS_UnitWork on z.UnitWorkId equals m.UnitId
|
||||
join n in db.Base_Project on x.ProjectId equals n.ProjectId
|
||||
where x.ProjectId == projectId
|
||||
select new PackagingManageDetailItem
|
||||
@@ -30,24 +27,25 @@ namespace BLL
|
||||
StackingPosition = x.StackingPosition,
|
||||
State= x.State,
|
||||
}).Distinct();
|
||||
return q.Take(pagesize*pageindex).Skip(pageindex).ToList();
|
||||
return q.ToList();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public static Model.PackagingManageItem GetPackagingInformationById(string projectId, string packagingManageId)
|
||||
public static Model.PackagingManageItem GetPackagingInformationById(string projectId,string personId, string packagingManageId)
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
PackagingManageItem packagingManageItem = new PackagingManageItem();
|
||||
var q = (from x in db.HJGL_PackagingManage
|
||||
join n in db.Base_Project on x.ProjectId equals n.ProjectId
|
||||
where x.ProjectId == projectId && x.PackagingManageId == packagingManageId
|
||||
where x.PackagingManageId == packagingManageId
|
||||
select new PackagingManageDetailItem
|
||||
{
|
||||
PackagingManageId = x.PackagingManageId,
|
||||
PackagingCode = x.PackagingCode,
|
||||
ProjectName = n.ProjectName,
|
||||
ProjectId = x.ProjectId,
|
||||
ContactName = x.ContactName,
|
||||
ContactPhone = x.ContactPhone,
|
||||
StackingPosition = x.StackingPosition,
|
||||
@@ -67,8 +65,10 @@ namespace BLL
|
||||
PlanStartDate=y.PlanStartDate
|
||||
|
||||
}).ToList();
|
||||
bool isPower = Person_PersonsService.IsGeneralUnitByPersonId(personId, projectId);
|
||||
packagingManageItem.packagingManageDetailItem = q;
|
||||
packagingManageItem.packagingPrepipeItems = packagingPrepipeItem;
|
||||
packagingManageItem.isPower = isPower;
|
||||
return packagingManageItem;
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user