Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

wxw

5 小时以前 88dd0bb81e2d4e6d560e7b62bbe0a9c141c84a41

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -1187,10 +1187,10 @@
                switch (model.WareHouseNo)
                {
                    case "W01"://成品库
                        if (skuList.Any(m => m.Type != "2"))
                        {
                            throw new Exception("仓库与出库物料不符");
                        }
                        //if (skuList.Any(m => m.Type != "2"))
                        //{
                        //    throw new Exception("仓库与出库物料不符");
                        //}
                        break;
                    case "W02"://原料库
                        if (skuList.Any(m => m.Type == "2"))