Merge branch 'master' into yyk

yyk

2024-08-22 1310b47a24f0cc70f0128c820bd490dca6a1a921

 Wms/WMS.BLL/SysServer/WareHouseServer.cs

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

                
                var data = WareHouseRst.GetAllByOrderPageAsync(item, limit, page,out int counts)
                var data = WareHouseRst.GetAllByOrderPage(item, limit, page,out int counts)
                    .Includes(x => x.TypeInfo)
                    .Includes(x => x.TemperatureInfo)
                    .Includes(x => x.CreateUserInfo)
@@ -108,7 +108,7 @@
            try
            {
                //判断除当前id信息以外是否含有编号和名称
                var bol = await WareHouseRst.GetAllAsync()
                var bol = await WareHouseRst.GetAll()
                    .AnyAsync(m => m.Id != id && (m.WareHouseNo == no.Trim() || m.WareHouseName == name.Trim()));
                if (bol)
                {
@@ -155,7 +155,7 @@
        {
            try
            {
                var list = await WareHouseRst.GetAllAsync().ToListAsync();
                var list = await WareHouseRst.GetAll().ToListAsync();
                return list;
            }
            catch (Exception e)