From 7ceb9b642fc01412fc4fe3e1a44f55cc79c10c88 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 15 七月 2024 17:00:31 +0800
Subject: [PATCH] Merge branch 'hwh'
---
Wms/WMS.BLL/SysServer/StorageRoadwayServer.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/StorageRoadwayServer.cs b/Wms/WMS.BLL/SysServer/StorageRoadwayServer.cs
index 323cb58..e05062c 100644
--- a/Wms/WMS.BLL/SysServer/StorageRoadwayServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageRoadwayServer.cs
@@ -42,7 +42,7 @@
.AndIF(!string.IsNullOrWhiteSpace(type), it => it.Type == type)
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
- var data = RoadwayRst.GetAllByOrderPageAsync(item, limit, page,out int counts)
+ var data = RoadwayRst.GetAllByOrderPage(item, limit, page,out int counts)
.Includes(x => x.WareHouseInfo)
.Includes(x => x.TemperatureInfo)
.Includes(x => x.CreateUserInfo)
@@ -99,7 +99,7 @@
{
try
{
- var data = RoadwayRst.GetAllAsync().ToList();
+ var data = RoadwayRst.GetAll().ToList();
if (!string.IsNullOrWhiteSpace(wareHouseNo))
{
data = data.Where(m => m.WareHouseNo == wareHouseNo).ToList();
@@ -137,7 +137,7 @@
throw new Exception("涓烘煡璇㈠埌褰撳墠宸烽亾淇℃伅");
}
//鍒ゆ柇闄ゅ綋鍓峣d淇℃伅浠ュ鏄惁鍚湁缂栧彿鍜屽悕绉�
- var bol = RoadwayRst.GetAllAsync().Any(m => m.Id != id && m.RoadwayNo== roadway.RoadwayNo && m.RoadwayName == roadwayName.Trim());
+ var bol = RoadwayRst.GetAll().Any(m => m.Id != id && m.RoadwayNo== roadway.RoadwayNo && m.RoadwayName == roadwayName.Trim());
if (bol)
{
throw new Exception("褰撳墠宸烽亾鍙锋垨宸烽亾鍚嶇О宸插瓨鍦�");
--
Gitblit v1.8.0