From f126461c35e6924f5f71c5f5266926b2dadfa909 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 31 一月 2024 08:44:31 +0800
Subject: [PATCH] Merge branch 'yyk' into wxw
---
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index 128feea..0b17705 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -306,17 +306,14 @@
/// <param name="wareHouseNo">浠撳簱</param>
/// <param name="roadway">宸烽亾鍙�</param>
/// <param name="row">鎺� 1 or 2</param>
+ /// <param name="depth">娣卞害</param>
/// <returns></returns>
- public List<SysStorageLocat> GetStorageLocatLists(string wareHouseNo, string roadway, string row)
+ public List<SysStorageLocat> GetStorageLocatLists(string wareHouseNo, string roadway, string row, string depth)
{
try
{
- var road = roadway.Substring(1, roadway.Length - 1);
- var num = int.Parse(road);
- var rows = (num - 1) * 2 + int.Parse(row);//鎺�
-
var list = Db.Queryable<SysStorageLocat>().Where(m =>
- m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == rows).ToList();
+ m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == int.Parse(row) && m.Depth == depth).ToList();
return list;
}
@@ -343,7 +340,7 @@
var rows = (num - 1) * 2 + int.Parse(row);//鎺�
var maxLayer = Db.Queryable<SysStorageLocat>().Where(m =>
- m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == rows).Max(m=>m.Layer);
+ m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == int.Parse(row)).Max(m=>m.Layer);
return maxLayer;
}
@@ -369,7 +366,7 @@
var rows = (num - 1) * 2 + int.Parse(row);//鎺�
var maxColumn = Db.Queryable<SysStorageLocat>().Where(m =>
- m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == rows).Max(m => m.Column);
+ m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == int.Parse(row)).Max(m => m.Column);
return maxColumn;
}
--
Gitblit v1.8.0