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

wxw

5 小时以前 88dd0bb81e2d4e6d560e7b62bbe0a9c141c84a41

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -1067,10 +1067,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 +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"))
@@ -3338,6 +3338,22 @@
                throw new Exception(e.Message);
            }
        }
        public string GetHouseByPalletNo(string palletNo)
        {
            try
            {
                var datail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
                if (datail == null)
                {
                    throw new Exception("未查询到托盘信息");
                }
                return datail.WareHouseNo;
            }
            catch (Exception e)
            {
                throw new Exception(e.Message);
            }
        }

        public List<OutCommandDto> IssueOutHouseLk(string soNo, string outMode, int userId, string url, out string str)
        {