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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
杨红卫
2022-10-20 11:27:23 +08:00
parent 8ca211fd8b 00616b7fa0
commit c7dc20aa5d
26 changed files with 442 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/HJGL/APIPackagingManageService.cs
+3 -3
View File
@@ -29,7 +29,7 @@ namespace BLL
StackingPosition = x.StackingPosition,
State= x.State,
ReceiveMan=t.PersonName,
ReceiveDate=x.ReceiveDate,
ReceiveDate = string.Format("{0:g}", x.ReceiveDate)
}).Distinct();
return q.ToList();
@@ -57,7 +57,7 @@ namespace BLL
StackingPosition = x.StackingPosition,
State =x.State,
ReceiveMan = t.PersonName,
ReceiveDate = x.ReceiveDate,
ReceiveDate = string.Format("{0:g}", 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(',');
@@ -70,7 +70,7 @@ namespace BLL
PipelineComponentCode = x.PipelineComponentCode,
PreUnit = "1/个",
UnitWorkName = z.UnitWorkName,
PlanStartDate=y.PlanStartDate
PlanStartDate = string.Format("{0:g}", y.PlanStartDate),
}).ToList();
bool isPower = Person_PersonsService.IsGeneralUnitByPersonId(personId, projectId);
SGGL/BLL/API/HJGL/APIPipelineComponentService.cs
+4 -4
View File
@@ -30,10 +30,10 @@ namespace BLL
DrawingName = x.DrawingName,
BoxNumber = x.BoxNumber,
State = x.State,
PlanStartDate = y.PlanStartDate,
PlanStartDate = string.Format("{0:g}", y.PlanStartDate) ,
QRCode = x.QRCode,
ReceiveMan=p.PersonName,
ReceiveDate=x.ReceiveDate
ReceiveDate= string.Format("{0:g}", x.ReceiveDate)
}).Distinct();
return q.ToList();
@@ -60,10 +60,10 @@ namespace BLL
DrawingName = x.DrawingName,
BoxNumber = x.BoxNumber,
State = x.State,
PlanStartDate = y.PlanStartDate,
PlanStartDate = string.Format("{0:g}", y.PlanStartDate),
QRCode = x.QRCode,
ReceiveMan = p.PersonName,
ReceiveDate = x.ReceiveDate
ReceiveDate = string.Format("{0:g}", x.ReceiveDate)
}).FirstOrDefault();
bool isPower = Person_PersonsService.IsGeneralUnitByPersonId(personId, projectId);
pipelineComponentDetail.pipelineComponentItem = q;
SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs
+1 -1
View File
@@ -136,7 +136,7 @@ namespace BLL
FROM dbo.HJGL_PipeLineMat pipe
LEFT JOIN dbo.HJGL_MaterialCodeLib lib ON lib.MaterialCode = pipe.MaterialCode
LEFT JOIN HJGL_Pipeline line ON pipe.PipelineId=line.PipelineId
WHERE line.PipeArea=@PipeArea and line.State=1
WHERE line.PipeArea=@PipeArea
group by lib.MaterialCode,lib.MaterialName,lib.MaterialUnit, lib.MaterialSpec,lib.MaterialMade) as aa on mat.MaterialCode=aa.MaterialCode
where mat.projectid=@Projectid and Ins.State=@State
group by mat.MaterialCode,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num
SGGL/BLL/HJGL/PreDesign/YardPlanningService.cs
+7 -4
View File
@@ -14,10 +14,10 @@ namespace BLL
{
return Funs.DB.HJGL_YardPlanning.FirstOrDefault(e => e.YardPlanningId == YardPlanningId);
}
public static Model.HJGL_YardPlanning GetHJGL_YardPlanningByProjectId(string projectId)
public static Model.HJGL_YardPlanning GetHJGL_YardPlanningByProjectId(string projectId,string unitworkid)
{
return Funs.DB.HJGL_YardPlanning.FirstOrDefault(e => e.ProjectId == projectId);
return Funs.DB.HJGL_YardPlanning.FirstOrDefault(e => e.ProjectId == projectId && e.UnitWorkId == unitworkid);
}
/// <summary>
/// 保存应急流程图
@@ -25,9 +25,9 @@ namespace BLL
/// <param name="projectid"></param>
/// <param name="unitid"></param>
/// <param name="imgurl"></param>
public static void SavePic(string projectid, string imgurl)
public static void SavePic(string projectid,string unitworkid, string imgurl)
{
var model = Funs.DB.HJGL_YardPlanning.FirstOrDefault(e => e.ProjectId == projectid);
var model = Funs.DB.HJGL_YardPlanning.FirstOrDefault(e => e.ProjectId == projectid && e.UnitWorkId==unitworkid);
if (model != null)
{
model.FlowChartPic = imgurl;
@@ -38,6 +38,7 @@ namespace BLL
Model.HJGL_YardPlanning table = new Model.HJGL_YardPlanning();
table.YardPlanningId = SQLHelper.GetNewID(typeof(Model.HJGL_YardPlanning));
table.ProjectId = projectid;
table.UnitWorkId = unitworkid;
table.FlowChartPic = imgurl;
Funs.DB.HJGL_YardPlanning.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
@@ -51,6 +52,7 @@ namespace BLL
table.ProjectId = newtable.ProjectId;
table.Remark = newtable.Remark;
table.FlowChartPic = newtable.FlowChartPic;
table.UnitWorkId = newtable.UnitWorkId;
Funs.DB.HJGL_YardPlanning.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
}
@@ -66,6 +68,7 @@ namespace BLL
table.ProjectId = newtable.ProjectId;
table.Remark = newtable.Remark;
table.FlowChartPic = newtable.FlowChartPic;
table.UnitWorkId = newtable.UnitWorkId;
Funs.DB.SubmitChanges();
}
SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs
+10
View File
@@ -237,6 +237,16 @@ namespace BLL
select x).ToList();
return q;
}
public static List<Model.HJGL_Pipeline_Component> GetComponentByPipelineId(string PipelineId)
{
Model.SGGLDB db = Funs.DB;
var q = (from x in db.HJGL_Pipeline_Component
where x.PipelineId == PipelineId
select x).OrderBy(x=>x.PlanStartDate).ToList();
return q;
}
/// <summary>
/// 管线下拉框