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

能够实现多人扫码出库，材料匹配生成的任务单，排序需要一致，退货入库导入，匹配管线正在出库中管线不统计散件出库

Browse Source
This commit is contained in:
李超
2025-01-23 15:52:33 +08:00
parent 718467e9f9
commit 0ff22e7876
13 changed files with 124 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CLGL/TwArrivalStatisticsService.cs
+6 -4
View File
@@ -114,8 +114,8 @@ namespace BLL
if (stock != null)
{
stock.StockNum -= material.MatchNum;
}
}
}
}
var results = requiredMaterials;
return results;
@@ -177,7 +177,8 @@ namespace BLL
var requiredMaterials = (from x in db.Tw_InOutPlanDetail_Relation
join master in db.Tw_InOutPlanMaster on x.InOutPlanMasterId equals master.Id
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 z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId
join t in db.HJGL_WeldTask on master.WeldTaskId equals t.WeldTaskId
where x.InOutPlanMasterId == outPlanMasterId
select new Tw_PipeMatMatchOutput
{
@@ -191,9 +192,10 @@ namespace BLL
MaterialUnit = y.MaterialUnit,
MaterialDef = y.MaterialDef,
NeedNum = x.Number,
PipeLineSortIndex=t.PipeLineSortIndex
}
).ToList();
var masterModle = db.Tw_InOutPlanMaster.FirstOrDefault(x => x.Id == outPlanMasterId);
var masterModle = db.Tw_InOutPlanMaster.FirstOrDefault(x => x.Id == outPlanMasterId);
results = GetMatMatchOutput(requiredMaterials.OrderBy(x=>x.PipelineId).ThenBy(x=>x.MaterialCode).ToList(), masterModle.WarehouseCode, masterModle.ProjectId);
return results;
}