fix:安装清单页面4项修改（过滤裕-量、预制组件数量=1、隐藏预制工作包列、修复导出IOException）、预制组件管理页面过滤裕-量、材料匹配算法预扣除出库申请单材料

2026-04-15 16:31:33 +08:00
parent 467b936ae5
commit f1a0f68a01
6 changed files with 76 additions and 60 deletions
@@ -86,7 +86,35 @@ namespace BLL
                WarehouseCode = warehouseCode,
                ProjectId = projectId
            };
-            var stockList = TwMaterialstockService.GetTw_MaterialStockByModle(twMaterialStockOutput).ToList();//获取库存列表 
+var stockList = TwMaterialstockService.GetTw_MaterialStockByModle(twMaterialStockOutput).ToList();//获取库存列表 
+
+            // 预扣除出库申请单中状态为待审核/已审核的材料数量
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var outboundMaterials = from detail in db.Tw_InOutPlanDetail
+                                        join master in db.Tw_InOutPlanMaster on detail.InOutPlanMasterId equals master.Id
+                                        where master.InOutType == (int)TwConst.InOutType.出库
+                                              && (master.State == (int)TwConst.State.待审核 || master.State == (int)TwConst.State.已审核)
+                                              && master.WarehouseCode == warehouseCode
+                                              && master.ProjectId == projectId
+                                        group detail by detail.MaterialCode into g
+                                        select new
+                                        {
+                                            MaterialCode = g.Key,
+                                            TotalPlanNum = g.Sum(d => d.PlanNum) ?? 0
+                                        };
+
+                var outboundList = outboundMaterials.ToList();
+                foreach (var outbound in outboundList)
+                {
+                    var stock = stockList.FirstOrDefault(x => x.PipeLineMatCode == outbound.MaterialCode);
+                    if (stock != null)
+                    {
+                        stock.StockNum -= outbound.TotalPlanNum;
+                    }
+                }
+            }
+
            foreach (var material in requiredMaterials)
            {
                material.Id = Guid.NewGuid().ToString();