From f087171723a66f09e660fd8ef4fb3748ac6fc3a4 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 14 七月 2025 08:53:48 +0800
Subject: [PATCH] 修改问题
---
Wms/Wms/Controllers/PdaCrController.cs | 4 ----
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 17 +++++++++++++++--
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 0c2ac49..f1138ed 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -1001,6 +1001,10 @@
}
//鏍规嵁鐩爣鍖哄煙鑾峰彇鐩爣鍌ㄤ綅鍦板潃
EndLocat = await GetLocat(areaNo);
+ if (string.IsNullOrEmpty(EndLocat))
+ {
+ throw Oops.Bah("鑾峰彇鐩爣鍌ㄤ綅澶辫触!");
+ }
//璧峰鍌ㄤ綅淇℃伅
var storageLocat = await Db.Queryable<SysStorageLocat>().FirstAsync(w => w.IsDel == "0" && w.LocatNo == locatNo);
@@ -1265,9 +1269,18 @@
string endLocat = string.Empty;//鐩爣鍌ㄤ綅
//褰撳墠鍖哄煙鎵�鏈夊偍浣嶄俊鎭�
var storageLocatList = await Db.Queryable<SysStorageLocat>().Where(w => w.WareHouseNo == "W04" && w.AreaNo == areaNo).ToListAsync();
-
- var locatInfo2 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0" && w.Status == "0")
+
+ var locatInfo2 = new SysStorageLocat();
+ if (areaNo == "B10")
+ {
+ locatInfo2 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0")
.OrderByDescending(m => m.Layer).OrderByDescending(m => m.Column).OrderByDescending(m => m.Row).First();
+ }
+ else
+ {
+ locatInfo2 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0" && w.Status == "0")
+ .OrderByDescending(m => m.Layer).OrderByDescending(m => m.Column).OrderByDescending(m => m.Row).First();
+ }
if (locatInfo2 != null)
{
diff --git a/Wms/Wms/Controllers/PdaCrController.cs b/Wms/Wms/Controllers/PdaCrController.cs
index 552d088..8faedc6 100644
--- a/Wms/Wms/Controllers/PdaCrController.cs
+++ b/Wms/Wms/Controllers/PdaCrController.cs
@@ -264,10 +264,6 @@
#endregion
- #region AGV绌烘墭鐩樿浆杩�
-
- #endregion
-
#region 闆剁瑙ｇ粦
/// <summary>
/// 闆剁瑙ｇ粦
--
Gitblit v1.8.0