From 165a01e366d3331f8a2d2a9e42c05bcd1209abde Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 10 七月 2025 08:41:39 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 7154975..3e14ce4 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -420,7 +420,7 @@
public async Task<List<DataStockDetail>> GetStockQueryList(string locatNo, string palletNo)
{
return await Db.Queryable<DataStockDetail>()
- .Where(s => s.IsDel == "0" && s.LocatNo.Contains(locatNo) && s.PalletNo.Contains(palletNo))
+ .Where(s => s.IsDel == "0" && s.LocatNo.Contains(locatNo) || s.PalletNo.Contains(palletNo))
.OrderBy(s => new { s.LotNo, s.LocatNo, s.PalletNo })
.ToListAsync();
--
Gitblit v1.8.0