From 2be1922b035c182c3c516427aa68be54badd6938 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 26 九月 2024 15:15:52 +0800
Subject: [PATCH] 登录页修改
---
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index a17bec6..eb2d920 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -1333,8 +1333,10 @@
break;
}
}
- var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo))
- .GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();
+
+ var road = Db.Queryable<SysStorageRoadway>().Where(m => m.IsDel == "0" && m.Status == "0").Select(m => m.RoadwayNo).ToList();
+
+ var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo) && road.Contains(m.RoadwayNo)).GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();
SysRoadwayUseLog useLog = Db.Queryable<SysRoadwayUseLog>().Where(m => m.IsDel == "0" && roadList.Contains(m.RoadwayNo)).OrderByDescending(l => l.Id).First(); //宸烽亾鏈�鍚庝竴娆′娇鐢ㄨ褰�
#endregion
@@ -1368,12 +1370,13 @@
}
roadList2.AddRange(roadLarge);
roadList2.AddRange(roadSmall);
+ roadList = roadList2;
}
- else
+
+ if (roadList.Count == 0)
{
- roadList2 = roadList;
+ throw new Exception("鏈煡璇㈠埌鍙兘浣跨敤鐨勫贩閬�");
}
- roadList = roadList2;
#endregion
@@ -1400,14 +1403,14 @@
roadNo = l;
}
//褰撳墠宸锋湁浣嶇疆鍒欓��鍑�
- if (roadNo != null)
+ if (!string.IsNullOrWhiteSpace(roadNo))
{
break;
}
}
//濡傛灉璺冲贩閬撳苟涓旀湭鎵惧埌鍚堥�傜┖鍌ㄤ綅,鍒欒烦鍒版渶鍚庝竴娆′娇鐢ㄧ殑宸烽亾鏌ヨ
- if (roadNo == null)
+ if (string.IsNullOrWhiteSpace(roadNo))
{
if (useLog != null)
{
@@ -1440,7 +1443,7 @@
roadNo = item;
}
//褰撳墠宸锋湁浣嶇疆鍒欓��鍑�
- if (roadNo != null)
+ if (!string.IsNullOrWhiteSpace(roadNo))
{
break;
}
@@ -1672,16 +1675,16 @@
}
roadList2.AddRange(roadLarge);
roadList2.AddRange(roadSmall);
- }
- else
- {
- roadList2 = roadList;
+ roadList = roadList2;
}
- roadList = roadList2;
+ if (roadList.Count == 0)
+ {
+ throw new Exception("鏈煡璇㈠埌鍙兘浣跨敤鐨勫贩閬�");
+ }
#endregion
-
+
var roadNo = "";
if (laneAllot == 0)//璺冲贩閬撳钩鍧囧垎閰�
{
--
Gitblit v1.8.0