Merge branch 'master' into yyk

yyk

2024-08-22 1310b47a24f0cc70f0128c820bd490dca6a1a921

 Wms/WMS.BLL/SysServer/StorageAreaServer.cs

@@ -49,7 +49,7 @@
                    .ToExpression();//注意 这一句 不能少


                var data = AreaRst.GetAllByOrderPageAsync(item, limit, page, out int counts)
                var data = AreaRst.GetAllByOrderPage(item, limit, page, out int counts)
                    .Includes(x => x.WareHouseInfo)
                    .Includes(x => x.TemperatureInfo)
                    .Includes(x => x.CreateUserInfo)
@@ -125,7 +125,7 @@
        {
            try
            {
                var data = AreaRst.GetAllAsync().ToList();
                var data = AreaRst.GetAll().ToList();
                if (!string.IsNullOrWhiteSpace(wareHouseNo))
                {
                    data = data.Where(m => m.WareHouseNo == wareHouseNo).ToList();
@@ -225,7 +225,7 @@
            try
            {
                //判断除当前id信息以外是否含有编号和名称
                var bol = AreaRst.GetAllAsync()
                var bol = AreaRst.GetAll()
                    .Any(m => m.Id != id && m.AreaName == name.Trim());
                if (bol)
                {