From 6506264a5436e610ae655c2f86c593108085059a Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 23 二月 2024 08:23:41 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index f722153..c8826e5 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -635,7 +635,12 @@
{
try
{
- string str = "select RoadwayNo,RoadwayName,WareHouseNo from SysStorageRoadway where IsDel = @isdel and WareHouseNo = @warehouseno";
+ string str = "select RoadwayNo,RoadwayName,WareHouseNo from SysStorageRoadway where IsDel = @isdel";
+
+ if (!string.IsNullOrWhiteSpace(wareHouseNo))
+ {
+ str += " and WareHouseNo = @warehouseno";
+ }
List<RoadwayDto> roadway = Db.Ado.SqlQuery<RoadwayDto>(str, new
{
--
Gitblit v1.8.0