From 9202f45578fced1005ba7795552ce76a4de9c056 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期日, 22 九月 2024 09:06:47 +0800
Subject: [PATCH] 修改申请巷道问题
---
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index a17bec6..807f202 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,18 @@
}
roadList2.AddRange(roadLarge);
roadList2.AddRange(roadSmall);
+
}
else
{
roadList2 = roadList;
}
roadList = roadList2;
+
+ if (roadList.Count == 0)
+ {
+ throw new Exception("鏈煡璇㈠埌鍙兘浣跨敤鐨勫贩閬�");
+ }
#endregion
@@ -1679,9 +1687,13 @@
}
roadList = roadList2;
+ if (roadList.Count == 0)
+ {
+ throw new Exception("鏈煡璇㈠埌鍙兘浣跨敤鐨勫贩閬�");
+ }
#endregion
-
+
var roadNo = "";
if (laneAllot == 0)//璺冲贩閬撳钩鍧囧垎閰�
{
--
Gitblit v1.8.0