DESKTOP-9BNTV8O
2024-12-13 6c3738d337fe68c2008b38ad58861aa4b48d5530
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -983,42 +983,42 @@
                }).ToList();
                //库存总表
                var stock = stockRst.GetAllAsync().Select(it => new ExStockInfoDto
                {
                    SkuNo = it.SkuNo,
                    SkuName = it.SkuName,
                    LotNo = it.LotNo,
                    Standard = it.Standard,
                    //Qty = type == "4" ? it.Qty : it.Qty - it.LockQty - it.FrozenQty,
                    Qty = it.Qty - it.LockQty - it.FrozenQty,
                //var stock = stockRst.GetAllAsync().Select(it => new ExStockInfoDto
                //{
                //    SkuNo = it.SkuNo,
                //    SkuName = it.SkuName,
                //    LotNo = it.LotNo,
                //    Standard = it.Standard,
                //    //Qty = type == "4" ? it.Qty : it.Qty - it.LockQty - it.FrozenQty,
                //    Qty = it.Qty - it.LockQty - it.FrozenQty,
                }).ToList();
                //}).ToList();
                foreach (var l in stockDetail.ToArray())
                {
                    var fq = stock.Where(s => s.SkuNo == l.SkuNo);
                    if (!string.IsNullOrWhiteSpace(l.LotNo))
                    {
                        fq = fq.Where(s => s.LotNo == l.LotNo);
                    }
                    else
                    {
                        fq = fq.Where(s => string.IsNullOrWhiteSpace(s.LotNo));
                    }
                    var f = fq.FirstOrDefault();
                    if (f == null)
                    {
                        throw new Exception("库存信息错误,请核实");
                    }
                    if (f.Qty != null && f.Qty.Value < l.Qty)
                    {
                        l.Qty = f.Qty.Value;
                    }
                    if (l.Qty <= 0)
                    {
                        stockDetail.Remove(l);
                    }
                }
                //foreach (var l in stockDetail.ToArray())
                //{
                //    var fq = stock.Where(s => s.SkuNo == l.SkuNo);
                //    if (!string.IsNullOrWhiteSpace(l.LotNo))
                //    {
                //        fq = fq.Where(s => s.LotNo == l.LotNo);
                //    }
                //    else
                //    {
                //        fq = fq.Where(s => string.IsNullOrWhiteSpace(s.LotNo));
                //    }
                //    var f = fq.FirstOrDefault();
                //    if (f == null)
                //    {
                //        throw new Exception("库存信息错误,请核实");
                //    }
                //    if (f.Qty != null && f.Qty.Value < l.Qty)
                //    {
                //        l.Qty = f.Qty.Value;
                //    }
                //    if (l.Qty <= 0)
                //    {
                //        stockDetail.Remove(l);
                //    }
                //}
                return stockDetail;