From dae4641c59da662ed9c18f6884544d0261604c5b Mon Sep 17 00:00:00 2001
From: rszn <645583145@qq.com>
Date: Sun, 30 Jun 2024 22:34:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BB=93=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Repository/Station/BinInfoRepository.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Repository/Station/BinInfoRepository.cs b/Repository/Station/BinInfoRepository.cs
index 7a7f0b0..6169854 100644
--- a/Repository/Station/BinInfoRepository.cs
+++ b/Repository/Station/BinInfoRepository.cs
@@ -50,7 +50,7 @@ public class BinInfoRepository : BaseRepository<BinInfo>
         if (!string.IsNullOrWhiteSpace(upMoveNo))
         {
 
-            list = list.Where(i => !upMoveNo.Equals(i.No) && (i.No != "" || i.No != "-1")).ToList();
+            list = list.Where(i => !upMoveNo.Equals(i.No) && i.No != "" && i.No != "-1").ToList();
             _log.Info($"BinInfoRepository SelectPack list3={JsonConvert.SerializeObject(list)},upMoveNo={upMoveNo}");
         }
 
@@ -69,14 +69,14 @@ public class BinInfoRepository : BaseRepository<BinInfo>
             return selectPackDto;
         }
 
-        list = list.Where(i => i.LastChargeFinishTime != null && new TimeSpan(DateTime.Now.Ticks -
+
+        /*list = list.Where(i => i.LastChargeFinishTime != null || new TimeSpan(DateTime.Now.Ticks -
                                                                               i.LastChargeFinishTime.ToDateTime().Ticks)
             .TotalMinutes > swapFinishChargeTime).ToList();
         if (list.Count <= 0)
-        {
-            selectPackDto.Info = InfoEnum.SelectBinStatusInfo.LessOf3Minute;
+        {            selectPackDto.Info = InfoEnum.SelectBinStatusInfo.LessOf3Minute;
             return selectPackDto;
-        }
+        }*/
 
 
         selectPackDto.BinInfo = list[0];