diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 988c443c..684c89d4 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -2665,7 +2665,22 @@ namespace Tnb.WarehouseMgr }); return Points; }*/ + + + List roads = await _db.Queryable().Where(it => it.status == 1).ToListAsync(); + + // 待验证 电梯不跑算法 + //List wmsRoads = await _db.Queryable().Where(r => r.startpoint_id == pStartId).ToListAsync(); + //if (wmsRoads?.FindAll(x => x.endpoint_code != null && x.location_code.Contains("dt", StringComparison.OrdinalIgnoreCase))?.Count > 0) + //{ + + //} + + //List wmsRoads = await _db.Queryable().Where(r => r.startpoint_id == pStartId).ToListAsync(); + + + List points = await LocPathCalcAlgorithms(pStartId, pEndId, roads); try { diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs index 86e88833..717aec7a 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs @@ -149,7 +149,7 @@ namespace Tnb.WarehouseMgr List endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput); if (endLocations?.Count == 0) { - throw new AppFriendlyException("没有可用的中储仓库位", 500); + throw new AppFriendlyException("没有可用的库位", 500); } BasLocation endLocation = endLocations[0]; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleReleaseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleReleaseService.cs index e36b2395..7da3b8ee 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleReleaseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleReleaseService.cs @@ -418,9 +418,5 @@ namespace Tnb.WarehouseMgr return await Task.FromResult(true); } - - - - } }