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

材料管理修改

Browse Source
This commit is contained in:
李鹏飞
2024-10-09 17:20:12 +08:00
parent a7205a984d
commit f06da19405
14 changed files with 154 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CLGL/TwArrivalStatisticsService.cs
+8 -1
View File
@@ -16,6 +16,7 @@ namespace BLL
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
///所需材料数量列表
var NeedOutMateriaList = from x in db.HJGL_PipeLineMat
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
join z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId
@@ -27,7 +28,7 @@ namespace BLL
g.Key,
NeedNum = g.Sum(x => x.Number) ?? 0,
};
///实际材料入库数量列表
var RealInMateriaList = from x in db.Tw_InputDetail
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
group x by x.MaterialCode
@@ -44,9 +45,12 @@ namespace BLL
from y in gg.DefaultIfEmpty()
join z in db.HJGL_MaterialCodeLib on x.Key equals z.MaterialCode into zz
from z in zz.DefaultIfEmpty()
join m in db.Tw_MaterialStock on x.Key equals m.PipeLineMatCode into mm
from m in mm.DefaultIfEmpty()
select new Tw_ArrivalStatisticsOutPut
{
MaterialCode = x.Key,
StockNum = m==null?0: (decimal)m.StockNum,
NeedNum = x.NeedNum,
RealNum = y==null?0:y.RealNum,
MaterialName = z.MaterialName,
@@ -75,12 +79,15 @@ namespace BLL
var requiredMaterials = (from x in db.HJGL_PipeLineMat
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
join z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId
join m in db.WBS_UnitWork on z.UnitWorkId equals m.UnitWorkId
where z.ProjectId == projectid && pipelineIds.Contains(z.PipelineId)
select new Tw_PipeMatMatchOutput
{
Id= Guid.NewGuid().ToString(),
PipelineId =x.PipelineId,
PipelineCode=z.PipelineCode,
UnitWorkId=z.UnitWorkId,
UnitWorkName=m.UnitWorkName,
PrefabricatedComponents=x.PrefabricatedComponents,
MaterialCode = x.MaterialCode,
MaterialName= y.MaterialName,