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

test

6 小时以前 e9fa2cd033cc5399a4a23601f8155a8cd2079aab

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -948,6 +948,7 @@
                    WaveNo = a.WaveNo,
                    IsDespatch = a.IsDespatch,
                    Demo = a.Demo,
                    OrderCode = a.OrderCode,

                    CreateUserName = c.RealName,
                    UpdateUserName = c.RealName,
@@ -1067,10 +1068,10 @@
                        inspectStatus = "0,1";
                        break;
                    case "9"://生产领料出库
                        if (house != "W02")
                        {
                            throw new Exception("生产领料出库只能选择原料库");
                        }
                        //if (house != "W02")
                        //{
                        //    throw new Exception("生产领料出库只能选择原料库");
                        //}
                        skuType = "(0,1,3)";
                        inspectStatus = "1";
                        break;
@@ -1187,10 +1188,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"))