1

2024-09-27 18:17:21 +08:00
parent be070f85e2
commit 064a849b97
73 changed files with 3248 additions and 589 deletions
@@ -27,7 +27,11 @@ namespace BLL
                    join y in Funs.DB.HJGL_Pipeline_Component on x.PipelineComponentId equals y.PipelineComponentId into yy
                    from y in yy.DefaultIfEmpty()
                    join mat in Funs.DB.HJGL_MaterialCodeLib on x.MaterialCode equals mat.MaterialCode into mm
-                    from mat in mm.DefaultIfEmpty() 
+                    from mat in mm.DefaultIfEmpty()
+                    join master in Funs.DB.Tw_InOutPlanMaster on x.InOutPlanMasterId equals master.Id into masters
+                    from master in masters.DefaultIfEmpty()
+                    join stock in Funs.DB.Tw_MaterialStock on new { x.MaterialCode, master.WarehouseCode } equals new { MaterialCode = stock.PipeLineMatCode, stock.WarehouseCode } into st
+                    from stock in st.DefaultIfEmpty()
                    where
                              (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
                              (string.IsNullOrEmpty(table.InOutPlanMasterId) || x.InOutPlanMasterId.Contains(table.InOutPlanMasterId)) &&
@@ -43,6 +47,8 @@ namespace BLL
                        ActNum = x.ActNum,
                        PipelineComponentCode = y.PipelineComponentCode,
                        MaterialName = mat.MaterialName,
+                        MaterialDef= mat.MaterialDef,
+                        StockNum = stock.StockNum ?? 0,
                    }
                  ;