From 6d2552b84275884e2dfd9e39f8c550642e1cb568 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期五, 15 三月 2024 08:24:57 +0800
Subject: [PATCH] Merge branch 'yyk'
---
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index f722153..d968e79 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
{
@@ -696,7 +701,8 @@
else if (storageLocat.Status == "2")
{
//鎵樼洏缁戝畾淇℃伅
- List<BllPalletBind> palletBindList = Db.Queryable<BllPalletBind>().Where(w => w.LocatNo == locatNo && w.IsDel == "0").ToList();
+ List<BllPalletBind> palletBindList = Db.Queryable<BllPalletBind>()
+ .Where(w => w.LocatNo == locatNo && w.IsDel == "0" && w.Status == "1").ToList();
if (palletBindList == null || palletBindList.Count <= 0)
{
throw new Exception("鏈壘鍒板搴旂殑鎵樼洏缁戝畾淇℃伅");
--
Gitblit v1.8.0