1

2024-09-24 20:38:50 +08:00
parent 4e9832dc8a
commit 8edf7e1389
46 changed files with 3109 additions and 748 deletions
@@ -1,4 +1,5 @@
 using FineUIPro;
+using NPOI.OpenXmlFormats.Wordprocessing;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -28,6 +29,8 @@ namespace BLL
                    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()
+                    join stock in Funs.DB.Tw_MaterialStock on x.MaterialCode equals stock.PipeLineMatCode into st
+                    from stock in st.DefaultIfEmpty()
                    where
                              (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
                              (string.IsNullOrEmpty(table.OutputMasterId) || x.OutputMasterId.Contains(table.OutputMasterId)) &&
@@ -43,7 +46,9 @@ namespace BLL
                        ActNum = x.ActNum,
                        PipelineComponentCode = y.PipelineComponentCode,
                        MaterialName = mat.MaterialName,
-                    }
+                        StockNum = stock.StockNum ?? 0,
+                        DiffNum = (x.ActNum??0) - (x.PlanNum??0),
+                        }
                  ;

            return q;