From ed42cc20f82aeb38b3f34824903aa1f62016d7f2 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 20 Mar 2024 14:58:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs | 8 ++++----
 src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
index b33205b0..60d7e12f 100644
--- a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
+++ b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
@@ -149,9 +149,9 @@ namespace WMS.Web.Repositories
                 query = query.Where(w => EF.Functions.Like(w.srcBox.BoxBillNo, "%" + dto.SrcBox + "%"));
             if (!string.IsNullOrEmpty(dto.DestBox))
                 query = query.Where(w => EF.Functions.Like(w.destBox.BoxBillNo, "%" + dto.DestBox + "%"));
-            if (dto.SrcSubStockCode != null)
+            if (!string.IsNullOrEmpty(dto.SrcSubStockCode))
                 query = query.Where(w => w.changeBox.SrcSubStockCode == dto.SrcSubStockCode);
-            if (dto.DestSubStockCode != null)
+            if (!string.IsNullOrEmpty(dto.DestSubStockCode))
                 query = query.Where(w => w.changeBox.DestSubStockCode == dto.DestSubStockCode);
             if (dto.CreateBeginDate != null)
                 query = query.Where(w => w.changeBox.CreateTime >= dto.CreateBeginDate);
@@ -170,8 +170,8 @@ namespace WMS.Web.Repositories
                 SerialNumbers = string.Join(",", s.changeBox.SerialNumbers),
                 SrcBox = s.srcBox.BoxBillNo,
                 DestBox = s.destBox.BoxBillNo,
-                Qty=s.changeBox.Qty,
-                DestBoxOrg= _singleDataService.GetSingleData(SingleAction.Orgs, companyId, s.changeBox.DestBoxOrgCode),
+                Qty = s.changeBox.Qty,
+                DestBoxOrg = _singleDataService.GetSingleData(SingleAction.Orgs, companyId, s.changeBox.DestBoxOrgCode),
                 SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.changeBox.SrcSubStockCode + s.changeBox.SrcStockCode + s.changeBox.SrcBoxOrgCode),
                 DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.changeBox.DestSubStockCode + s.changeBox.DestStockCode + s.changeBox.DestBoxOrgCode),
                 Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.changeBox.CreatorId),
diff --git a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
index e5eba78a..d67f67da 100644
--- a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
+++ b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
@@ -101,7 +101,7 @@ namespace WMS.Web.Repositories
                     _transaction.Commit();
                 return true;
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 if (_transaction != null)
                     _transaction.Rollback();
@@ -160,9 +160,9 @@ namespace WMS.Web.Repositories
                .OrderByDescending(o => o.moveBox.Id)
                .Where(adv => 1 == 1);
 
-            if (dto.SrcSubStockCode != null)
+            if (!string.IsNullOrEmpty(dto.SrcSubStockCode))
                 query = query.Where(w => w.moveBox.SrcSubStockCode == dto.SrcSubStockCode);
-            if (dto.DestSubStockCode != null)
+            if (!string.IsNullOrEmpty(dto.DestSubStockCode))
                 query = query.Where(w => w.moveBox.DestSubStockCode == dto.DestSubStockCode);
             if (!string.IsNullOrEmpty(dto.Creator))
                 query = query.Where(w => ids.Contains(w.moveBox.CreatorId));