From 1bdff4b3ba2c338fdf815b9e02ea15bfeb6e3ad0 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 22 七月 2024 17:00:17 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC26WMS
---
Wms/WMS.BLL/SysServer/StorageAreaServer.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/StorageAreaServer.cs b/Wms/WMS.BLL/SysServer/StorageAreaServer.cs
index 1dc557a..d81dd61 100644
--- a/Wms/WMS.BLL/SysServer/StorageAreaServer.cs
+++ b/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
{
//鍒ゆ柇闄ゅ綋鍓峣d淇℃伅浠ュ鏄惁鍚湁缂栧彿鍜屽悕绉�
- var bol = AreaRst.GetAllAsync()
+ var bol = AreaRst.GetAll()
.Any(m => m.Id != id && m.AreaName == name.Trim());
if (bol)
{
--
Gitblit v1.8.0