From 5c40d83463c3db4455985f0302b10b79c63af23a Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 22 八月 2024 09:14:22 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Wms/WMS.BLL/SysServer/WareHouseServer.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/WareHouseServer.cs b/Wms/WMS.BLL/SysServer/WareHouseServer.cs
index 515515b..1bee3e8 100644
--- a/Wms/WMS.BLL/SysServer/WareHouseServer.cs
+++ b/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
{
//鍒ゆ柇闄ゅ綋鍓峣d淇℃伅浠ュ鏄惁鍚湁缂栧彿鍜屽悕绉�
- 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)
--
Gitblit v1.8.0