Merge branch 'csc'

Demo

2024-03-16 7f4b5fb7a89052f1fbd2e00b34e60e1b55f73ab3

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -392,6 +392,15 @@
                {
                    throw new Exception("未查到对应出库类型的物料");
                }

                if (type!="8")
                {
                    skuList = skuList.Where(m => m != "100088").ToList();
                }
                else
                {
                    skuList = skuList.Where(m => m == "100088").ToList();
                }
                //skuList = sku.Select(m => m.SkuNo).ToList();
                var stockRst = new StockServer();
                var stockDetailRst = new StockDetailServer();
@@ -3013,6 +3022,8 @@
                //库存明细
                var stockList = Db.Queryable<DataStockDetail>().Where(a => stockIds.Contains(a.Id)).ToList();

                //分配信息
                var allots = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SODetailNo == detail.Id && m.Status == "0").ToList();

                //库存总表
                //var stockz = Db.Queryable<DataStock>().First(d => d.IsDel == "0" && d.SkuNo == detail.SkuNo && d.LotNo == detail.LotNo);
@@ -3030,6 +3041,10 @@
                    {
                        throw new Exception("操作失败，出库数量超出库存数量！");
                    }

                    var bl = allots.FirstOrDefault(m => m.StockId == st.StockId);
                    if (bl == null)
                    {
                    //添加分配表信息
                    var allot = new BllExportAllot
                    {
@@ -3057,6 +3072,13 @@
                        CreateTime = DateTime.Now
                    };
                    allotList.Add(allot);
                    }
                    else
                    {
                        bl.Qty += st.Qty;
                        Db.Updateable(bl).ExecuteCommand();
                    }
                    
                    //库存明细
                    stock.LockQty += st.Qty;
                    stock.Status = stock.LockQty == stock.Qty ? "2" : "1";