diff --git a/Service/Station/MonitorService.cs b/Service/Station/MonitorService.cs index 93dde56..c541bca 100644 --- a/Service/Station/MonitorService.cs +++ b/Service/Station/MonitorService.cs @@ -149,7 +149,7 @@ public class MonitorService { //校验:出仓位 BinInfo? removeBin = BinInfoRepository.QueryByClause(i => - i.No.Equals(removeBinNo) && (i.ChargeStatus == 2 || i.ChargeStatus == 4) && i.Exists == 1 && + i.No.Equals(removeBinNo) && (i.ChargeStatus != 1) && i.Exists == 1 && i.AmtLock == 0); if (removeBin == null) @@ -195,7 +195,7 @@ public class MonitorService if (!result) { Log.Error("BatteryRelocation PlcMgr.HoldOn() =false"); - return Result.Fail(); + return Result.Fail(); } Log.Info($"battery move task Manual removeBinNo={removeBinNo}, putBinNo={putBinNo} ");