Merge branch 'master' into csc

chengsc

2024-07-21 e75362cc5d11d900068a26232eb97ebd30203d48

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -4380,7 +4380,7 @@

                var exAllotList = new List<BllExportAllot>();
                var assign = new AllotSku();
                var specialSku = new List<string>();//特殊物料集合，无需托盘上全部分配的
                var specialSku = new List<string>();//特殊物料集合， 无需托盘上全部分配的
                Db.BeginTran();
                try
                {
@@ -4458,7 +4458,7 @@
                        }
                        else
                        {
                            qty += assign.AllotPallets(stockDetail, needQty, pNum, bNum, stockQtyDic);
                            qty += assign.AllotPallets(stockDetail, needQty, pNum, bNum, stockQtyDic, detail.LotNo, detail.IsMixBox);
                        }
                        
                        foreach (var sc in stockQtyDic)