From bdd84cc48ba7b2527584c44d174da8e7d20c5375 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期三, 18 九月 2024 16:37:13 +0800
Subject: [PATCH] 增加对申请入库时对平库库位的校验
---
Wms/WMS.BLL/SysServer/StorageAreaServer.cs | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/StorageAreaServer.cs b/Wms/WMS.BLL/SysServer/StorageAreaServer.cs
index 1dc557a..aafcdac 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();
@@ -148,16 +148,15 @@
try
{
string str = "";
- //鍒ゆ柇鎵�灞炰粨搴撴槸鍚︿负绔嬩綋搴�
- if (model.WareHouseNo != "W01")
+ //鍒ゆ柇鎵�灞炰粨搴撴槸鍚︿负null
+ if (string.IsNullOrWhiteSpace(model.WareHouseNo))
{
- str = "-1:鎵�灞炰粨搴撲笉涓虹珛浣撳簱锛岃閲嶆柊閫夋嫨锛�";
+ str = "-1:鎵�灞炰粨搴撲笉鍙负绌猴紒";
return str;
}
//鑾峰彇绔嬩綋搴撴渶澶х紪鐮�
- //var area = Db.Queryable<SysStorageArea>().Max(a => a.Id)(a => a.IsDel == "0" && a.WareHouseNo == "W01");
- var area = Db.Queryable<SysStorageArea>().Where(a => a.IsDel == "0" && a.WareHouseNo == "W01").OrderByDescending(a=>a.CreateTime).First();
- //楠岃瘉鏄惁瀛樺湪绔嬩綋搴撶涓�鏉″尯鍩熶俊鎭�
+ var area = Db.Queryable<SysStorageArea>().Where(a => a.IsDel == "0").OrderByDescending(a=>a.CreateTime).First();
+ //楠岃瘉鏄惁瀛樺湪鍖哄煙淇℃伅
if (area == null)
{
model.AreaNo = "A01";
@@ -225,7 +224,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