Merge branch 'master' into wxw

wxw

3 天以前 165a01e366d3331f8a2d2a9e42c05bcd1209abde

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -6074,11 +6074,14 @@
                {
                    foreach (var item in stockDetail)
                    {
                        if (!string.IsNullOrEmpty(item.WareHouseNo))
                        if (!string.IsNullOrEmpty(item.WareHouseNo) && !string.IsNullOrEmpty(item.AreaNo))
                        {
                            if (item.AreaNo != "B06" && item.AreaNo != "B07" && item.AreaNo != "B09") 
                        {
                            throw new Exception("该托盘未在库外，请核查!");
                        }
                    }
                    }
                    iscount = 1; //回流入库
                }
                #endregion