入库单修改，增加入库明细序号，修改入库单打印模板。

2024-11-14 16:27:15 +08:00
parent 02ebf92623
commit edb2e10e69
16 changed files with 198 additions and 157 deletions
@@ -31,7 +31,7 @@ namespace BLL
                    from mat in mm.DefaultIfEmpty()
                    join master in Funs.DB.Tw_OutputMaster on x.OutputMasterId 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
+                    join stock in Funs.DB.Tw_MaterialStock on new { x.MaterialCode, master.WarehouseCode, master.ProjectId } equals new { MaterialCode = stock.PipeLineMatCode, stock.WarehouseCode, stock.ProjectId } into st
                    from stock in st.DefaultIfEmpty()
                    where
                              (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&