Merge branch 'csc'

Demo

2024-03-26 19be6575a27a007b3dba7b0d28ddb769b5a1fed6

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -2874,12 +2874,11 @@
                        #region 包装信息

                        var pack = packList.FirstOrDefault(p => p.PackagNo == detail.PackagNo);
                        if (pack == null)
                        {
                            throw new Exception("未查询到物料包装");
                        }
                        var pNum = 0;//托盘物品数量
                        var bNum = 0;//箱物品数量
                        if (pack != null)
                        {
                            //throw new Exception("未查询到物料包装");
                        if (pack.L5Num.HasValue)
                        {
                            pNum = Convert.ToInt32(pack.L5Num);
@@ -2905,10 +2904,13 @@
                            pNum = Convert.ToInt32(pack.L1Num);
                            bNum = Convert.ToInt32(pack.L1Num);
                        }
                        if (pNum == 0)
                        {
                            throw new Exception("未查询到物料包装托箱关系信息");
                        }
                       
                        
                        //if (pNum == 0)
                        //{
                        //    throw new Exception("未查询到物料包装托箱关系信息");
                        //}
                        #endregion
                        //取合适库存商品
                        Dictionary<int, decimal> stockQtyDic = new Dictionary<int, decimal>();//托出库物品数