From 87110c04df904eb4947587a34f3fc5a1eb45eb7e Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期日, 12 十月 2025 16:21:11 +0800
Subject: [PATCH] 入库单据开发导入入库单功能;
---
Wms/WMS.BLL/Logic/AllotLocation.cs | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/Wms/WMS.BLL/Logic/AllotLocation.cs b/Wms/WMS.BLL/Logic/AllotLocation.cs
index 983fe6e..10284fe 100644
--- a/Wms/WMS.BLL/Logic/AllotLocation.cs
+++ b/Wms/WMS.BLL/Logic/AllotLocation.cs
@@ -313,6 +313,22 @@
var roadList = db.Queryable<SysStorageLocat>().Where(m => m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo) )
.GroupBy(m=>m.RoadwayNo).Select(m=>m.RoadwayNo).ToList();
+ if (houseNo == "W02")
+ {
+ //涓�妤煎贩閬�
+ var conveyList1 = new List<string>() { "LR01", "LR02", "LR03", "LR04", "LR05", "LR06", "LR07", "LR08" };
+ //浜屾ゼ宸烽亾
+ var conveyList2 = new List<string>() { "LR09", "LR10", "LR11", "LR12" };
+ if (ceng == "1")
+ {
+ roadList = roadList.Where(m => conveyList1.Contains(m)).ToList();
+ }
+ else if (ceng == "2")
+ {
+ roadList = roadList.Where(m => conveyList2.Contains(m)).ToList();
+ }
+ }
+
//鏁版嵁瀛楀吀(鑾峰彇瀛楀吀涓粨搴撶被鍨�)
var dic = db.Queryable<SysDictionary>().First(m => m.Id.ToString() == house.Type);
switch (dic.DictName)
@@ -601,10 +617,10 @@
foreach (var area in areaList)
{
var sql = $@"select * from SysStorageLocat where IsDel = 0 and Layer!= '3' and Flag = 0 and [Status] = 0 and RoadwayNo = '{roadwayNo}' and AreaNo = '{area}' and LocatNo not in({str}) ";
- if (!string.IsNullOrWhiteSpace(ceng))
- {
- sql += $"and Layer = '{ceng}' ";
- }
+ //if (!string.IsNullOrWhiteSpace(ceng))
+ //{
+ // sql += $"and Layer = '{ceng}' ";
+ //}
sql += "order by ";
sql += topOrBom == 0 ? "Layer desc, " : "Layer, ";
sql += leftOrRight == 0 ? "[Column], " : "[Column] desc, ";
--
Gitblit v1.8.0