From e9c1fb1cae94c52d2a634f6e21a3a87354b52716 Mon Sep 17 00:00:00 2001
From: test <15284381150@163.com>
Date: 星期一, 15 九月 2025 13:47:55 +0800
Subject: [PATCH] Merge branch 'master' into djp
---
Wms/WMS.BLL/HttpServer.cs | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.BLL/HttpServer.cs b/Wms/WMS.BLL/HttpServer.cs
index 05980e4..ba26307 100644
--- a/Wms/WMS.BLL/HttpServer.cs
+++ b/Wms/WMS.BLL/HttpServer.cs
@@ -144,7 +144,12 @@
for (int i = 1; i <= 2; i++)
{
var iStr = i.ToString();
- locate = allotLocate.GetSuiTableLocate(houseNo, areaList, "", iStr);
+ try
+ {
+ locate = allotLocate.GetSuiTableLocate(houseNo, areaList, "", iStr);
+ }
+ catch (Exception e)
+ { }
if (locate != null)
{
break;
@@ -840,7 +845,15 @@
var roadStr = Db.Queryable<SysStorageRoadway>().Where(m => m.IsDel == "0" && m.Status == "0").Select(m=>m.RoadwayNo).ToList();
//宸烽亾缁勪俊鎭�
var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo) && !string.IsNullOrWhiteSpace(m.RoadwayNo) && roadStr.Contains(m.RoadwayNo))
- .GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();
+ .GroupBy(m => m.RoadwayNo)
+ .Select(m => m.RoadwayNo)
+ .ToList()
+ .OrderBy(roadwayNo =>
+ {
+ // 绉婚櫎鎵�鏈夐潪鏁板瓧瀛楃锛屽彧淇濈暀鏁板瓧
+ var numbersOnly = new string(roadwayNo.Where(char.IsDigit).ToArray());
+ return int.TryParse(numbersOnly, out int result) ? result : 0;
+ }).ToList();
#endregion
--
Gitblit v1.8.0