Merge branch 'master' into wxw

wxw

3 天以前 165a01e366d3331f8a2d2a9e42c05bcd1209abde

 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs

@@ -420,7 +420,7 @@
        public async Task<List<DataStockDetail>> GetStockQueryList(string locatNo, string palletNo)
        {
            return await Db.Queryable<DataStockDetail>()
                     .Where(s => s.IsDel == "0" && s.LocatNo.Contains(locatNo) && s.PalletNo.Contains(palletNo))
                     .Where(s => s.IsDel == "0" && s.LocatNo.Contains(locatNo) || s.PalletNo.Contains(palletNo))
                     .OrderBy(s => new { s.LotNo, s.LocatNo, s.PalletNo })
                     .ToListAsync();