From 903bbdc5ac969240704c411b4117e900e2199bde Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期四, 01 八月 2024 18:53:15 +0800
Subject: [PATCH] 优化申请巷道方法
---
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index a0e4e08..64da155 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -1272,7 +1272,9 @@
break;
}
}
- var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.WareHouseNo == houseNo && m.AreaNo == areaNoStr)
+ //鍚敤鐨勫贩閬撻泦鍚�
+ 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 && m.AreaNo == areaNoStr && 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(); //宸烽亾鏈�鍚庝竴娆′娇鐢ㄨ褰�
@@ -1307,6 +1309,10 @@
}
roadList2.AddRange(roadLarge);
roadList2.AddRange(roadSmall);
+ }
+ else
+ {
+ roadList2 = roadList;
}
roadList = roadList2;
@@ -1362,6 +1368,7 @@
}
else//鎸夌収宸烽亾浼樺厛绾у垎閰�
{
+ roadList = Db.Queryable<SysStorageRoadway>().Where(m=> roadList.Contains(m.RoadwayNo)).OrderBy(m => new {m.Priority ,m.RoadwayNo}).Select(m=>m.RoadwayNo).ToList();
foreach (var item in roadList)
{
var locateCount = Db.Queryable<SysStorageLocat>()
--
Gitblit v1.8.0