From 23721918cac512373cf7ef7954ceae387900af24 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 22 八月 2024 09:13:54 +0800
Subject: [PATCH] 业务测试问题修改
---
Wms/WMS.BLL/Logic/AllotSku.cs | 55 ++++++++++++++++++++++++++++---------------------------
1 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/Wms/WMS.BLL/Logic/AllotSku.cs b/Wms/WMS.BLL/Logic/AllotSku.cs
index 50235b8..03ae06d 100644
--- a/Wms/WMS.BLL/Logic/AllotSku.cs
+++ b/Wms/WMS.BLL/Logic/AllotSku.cs
@@ -922,12 +922,13 @@
//绔嬪簱鍐呮墭鐩�
var detail3 = list.Where(m => m.WareHouseNo == "W01").ToList();
- foreach (var item in detail2)
- {
- var dept = item.LocatNo.Substring(5,2);
+ // 骞冲簱鍌ㄤ綅缂栫爜瑙勫垯纭鍚庯紝鏍规嵁瀹為檯瑙勫垯鍙栨繁搴�
+ //foreach (var item in detail2)
+ //{
+ // var dept = item.LocatNo.Substring(5,2);
- item.Dept = int.Parse(dept);
- }
+ // item.Dept = int.Parse(dept);
+ //}
foreach (var item in detail3)
{
var dept = item.LocatNo.Substring(6, 2);
@@ -935,27 +936,27 @@
item.Dept = int.Parse(dept);
}
//骞冲簱
- var locate1 = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == "W02");
- var data2 = new List<StockDetailDto>();
- foreach (var pingku in detail2.OrderByDescending(a => a.PalletTags).ThenBy(m => m.Dept).ToList())
- {
- if (data2.Contains(pingku))
- {
- continue;
- }
+ //var locate1 = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == "W02");
+ //var data2 = new List<StockDetailDto>();
+ //foreach (var pingku in detail2.OrderByDescending(a => a.PalletTags).ThenBy(m => m.Dept).ToList())
+ //{
+ // if (data2.Contains(pingku))
+ // {
+ // continue;
+ // }
- var currentLocate = locate1.First(m => m.LocatNo == pingku.LocatNo);
- var locateAfter = locate1.Where(m => m.AreaNo == currentLocate.AreaNo && m.Layer == currentLocate.Layer && m.Row == currentLocate.Row && int.Parse(m.Depth) < int.Parse(currentLocate.Depth)).OrderBy(m => m.Depth).ToList();
- foreach (var locat in locateAfter)
- {
- if (detail2.Any(m => m.LocatNo == locat.LocatNo) && !data2.Contains(detail2.First(m => m.LocatNo == locat.LocatNo)))
- {
- data2.Add(detail2.First(m => m.LocatNo == locat.LocatNo));
- }
+ // var currentLocate = locate1.First(m => m.LocatNo == pingku.LocatNo);
+ // var locateAfter = locate1.Where(m => m.AreaNo == currentLocate.AreaNo && m.Layer == currentLocate.Layer && m.Row == currentLocate.Row && int.Parse(m.Depth) < int.Parse(currentLocate.Depth)).OrderBy(m => m.Depth).ToList();
+ // foreach (var locat in locateAfter)
+ // {
+ // if (detail2.Any(m => m.LocatNo == locat.LocatNo) && !data2.Contains(detail2.First(m => m.LocatNo == locat.LocatNo)))
+ // {
+ // data2.Add(detail2.First(m => m.LocatNo == locat.LocatNo));
+ // }
- }
- data2.Add(pingku);
- }
+ // }
+ // data2.Add(pingku);
+ //}
//绔嬪簱
var locate2 = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == "W01").ToList();
@@ -981,9 +982,9 @@
}
- data.AddRange(detail1);
- data.AddRange(data2);
- data.AddRange(data3);
+ data.AddRange(detail1); // 搴撳
+ data.AddRange(detail2); // 骞冲簱
+ data.AddRange(data3); // 绔嬪簱
return data;
}
--
Gitblit v1.8.0