移仓报错

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];