diff --git a/Entity/Api/Resp/BinInfoResp.cs b/Entity/Api/Resp/BinInfoResp.cs
index ad93307..359c79a 100644
--- a/Entity/Api/Resp/BinInfoResp.cs
+++ b/Entity/Api/Resp/BinInfoResp.cs
@@ -2,172 +2,182 @@ namespace Entity.Api.Resp;
 
 public class BinInfoResp
 {
-      /// <summary>
-        /// Desc:id
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        public int Id { get; set; }
-
-        /// <summary>
-        /// Desc:仓位编号
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public string No { get; set; }
-
-        /// <summary>
-        /// Desc:仓位编码
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public string Code { get; set; }
-
-        /// <summary>
-        /// Desc:仓位名称
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Desc:在位状态：0-不在位；1-在位；2-无效
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public int Exists { get; set; }
-
-        /// <summary>
-        /// Desc:电池编号
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public string BatteryNo { get; set; }
-
-        /// <summary>
-        /// Desc:充电机编号
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public string ChargerNo { get; set; }
-
-        /// <summary>
-        /// Desc:充电枪编号
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public string ChargerGunNo { get; set; }
-
-        /// <summary>
-        /// Desc:水冷编号
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public string WaterCoolNo { get; set; }
-
-        /// <summary>
-        /// Desc:是否有电插头;0-无电插头；1-有电插头
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public int? ElecPluginFlag { get; set; }
-
-        /// <summary>
-        /// Desc:电插头状态;0-未知；1-已经连接；2-未连接
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public string ElecPluginStatus { get; set; }
-
-        /// <summary>
-        /// Desc:是否有水插头;0-无水插头；1-有水插头
-        /// Default:
-        /// Nullable:False
-        /// </summary>
-        public string WaterPluginFlag { get; set; }
-
-        /// <summary>
-        /// Desc:预约锁定;0-未锁定；1-锁定
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public int AmtLock { get; set; }
-
-        /// <summary>
-        /// Desc:soc
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public decimal? Soc { get; set; }
-
-        /// <summary>
-        /// Desc:soe
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public decimal? Soe { get; set; }
-
-        /// <summary>
-        /// Desc:soh
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public decimal? Soh { get; set; }
-
-        /// <summary>
-        /// Desc:电池入仓顺序
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public int? BatteryEnterSeq { get; set; }
-
-        /// <summary>
-        /// Desc:充电状态;0-未知；1-正在充电；2-无电池；3-禁用
-        /// Default:0
-        /// Nullable:True
-        /// </summary>
-        public int? ChargeStatus { get; set; }
-
-        /// <summary>
-        /// Desc:仓位状态;0-禁用；1-启用
-        /// Default:1
-        /// Nullable:True
-        /// </summary>
-        public int? Status { get; set; }
-
-      
-
-        /// <summary>
-        /// Desc:创建时间
-        /// Default:CURRENT_TIMESTAMP
-        /// Nullable:True
-        /// </summary>
-        public DateTime? CreatedTime { get; set; }
-
-        /// <summary>
-        /// Desc:更新人
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Desc:最后结束充电时间 结束充电后更新
-        /// Default:
-        /// Nullable:True
-        /// </summary>
-        public DateTime? LastChargeFinishTime { get; set; }
-
-        /// <summary>
-        /// Desc:更新时间
-        /// Default:CURRENT_TIMESTAMP
-        /// Nullable:True
-        /// </summary>
-        public DateTime? UpdatedTime { get; set; }
-        
-        
-        /// <summary>
-        /// 缓存仓标记 0:不是 1:是
-        /// </summary>
-        public int CacheBinFlag { get; set; }
-}
\ No newline at end of file
+    /// <summary>
+    /// Desc:id
+    /// Default:
+    /// Nullable:False
+    /// </summary>           
+    public int Id { get; set; }
+
+    /// <summary>
+    /// Desc:仓位编号
+    /// Default:
+    /// Nullable:True
+    /// </summary>
+    public string No { get; set; }
+
+    /// <summary>
+    /// Desc:仓位编码
+    /// Default:
+    /// Nullable:True
+    /// </summary>
+    public string Code { get; set; }
+
+    /// <summary>
+    /// Desc:仓位名称
+    /// Default:
+    /// Nullable:True
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Desc:在位状态：0-不在位；1-在位；2-无效
+    /// Default:
+    /// Nullable:True
+    /// </summary>
+    public int Exists { get; set; }
+
+    /// <summary>
+    /// Desc:电池编号
+    /// Default:
+    /// Nullable:True
+    /// </summary>
+    public string BatteryNo { get; set; }
+
+    /// <summary>
+    /// Desc:充电机编号
+    /// Default:
+    /// Nullable:True
+    /// </summary>
+    public string ChargerNo { get; set; }
+
+    /// <summary>
+    /// Desc:充电枪编号
+    /// Default:
+    /// Nullable:True
+    /// </summary>
+    public string ChargerGunNo { get; set; }
+
+    /// <summary>
+    /// Desc:水冷编号
+    /// Default:
+    /// Nullable:True
+    /// </summary>
+    public string WaterCoolNo { get; set; }
+
+    /// <summary>
+    /// Desc:是否有电插头;0-无电插头；1-有电插头
+    /// Default:
+    /// Nullable:True
+    /// </summary>
+    public int? ElecPluginFlag { get; set; }
+
+    /// <summary>
+    /// Desc:电插头状态;0-未知；1-已经连接；2-未连接
+    /// Default:
+    /// Nullable:True
+    /// </summary>
+    public string ElecPluginStatus { get; set; }
+
+    /// <summary>
+    /// Desc:是否有水插头;0-无水插头；1-有水插头
+    /// Default:
+    /// Nullable:False
+    /// </summary>
+    public string WaterPluginFlag { get; set; }
+
+    /// <summary>
+    /// Desc:预约锁定;0-未锁定；1-锁定
+    /// Default:
+    /// Nullable:True
+    /// </summary>
+    public int AmtLock { get; set; }
+
+    /// <summary>
+    /// Desc:soc
+    /// Default:
+    /// Nullable:True
+    /// </summary>
+    public decimal? Soc { get; set; }
+
+    /// <summary>
+    /// Desc:soe
+    /// Default:
+    /// Nullable:True
+    /// </summary>
+    public decimal? Soe { get; set; }
+
+    /// <summary>
+    /// Desc:soh
+    /// Default:
+    /// Nullable:True
+    /// </summary>
+    public decimal? Soh { get; set; }
+
+    /// <summary>
+    /// Desc:电池入仓顺序
+    /// Default:
+    /// Nullable:True
+    /// </summary>
+    public int? BatteryEnterSeq { get; set; }
+
+    /// <summary>
+    /// Desc:充电状态;0-未知；1-正在充电；2-无电池；3-禁用
+    /// Default:0
+    /// Nullable:True
+    /// </summary>
+    public int? ChargeStatus { get; set; }
+
+    /// <summary>
+    /// Desc:仓位状态;0-禁用；1-启用
+    /// Default:1
+    /// Nullable:True
+    /// </summary>
+    public int? Status { get; set; }
+
+
+    /// <summary>
+    /// Desc:创建时间
+    /// Default:CURRENT_TIMESTAMP
+    /// Nullable:True
+    /// </summary>
+    public DateTime? CreatedTime { get; set; }
+
+    /// <summary>
+    /// Desc:更新人
+    /// Default:
+    /// Nullable:True
+    /// </summary>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Desc:最后结束充电时间 结束充电后更新
+    /// Default:
+    /// Nullable:True
+    /// </summary>
+    public DateTime? LastChargeFinishTime { get; set; }
+
+    /// <summary>
+    /// Desc:更新时间
+    /// Default:CURRENT_TIMESTAMP
+    /// Nullable:True
+    /// </summary>
+    public DateTime? UpdatedTime { get; set; }
+
+
+    /// <summary>
+    /// 缓存仓标记 0:不是 1:是
+    /// </summary>
+    public int CacheBinFlag { get; set; }
+
+
+    /// <summary>
+    /// 是否可以换电 0:不可换 1：可换
+    /// </summary>
+    public int CanSwapFlag { get; set; }
+
+    /// <summary>
+    /// 是否可以充电 0:不可换 1：可换
+    /// </summary>
+    public int CanChargeFlag { get; set; }
+} 
\ No newline at end of file
diff --git a/Entity/DbModel/Station/BinInfo.cs b/Entity/DbModel/Station/BinInfo.cs
index f21a91a..1a7f2f9 100644
--- a/Entity/DbModel/Station/BinInfo.cs
+++ b/Entity/DbModel/Station/BinInfo.cs
@@ -209,5 +209,20 @@ namespace Entity.DbModel.Station
         /// </summary>
         [SugarColumn(ColumnName = "cache_bin_flag")]
         public int CacheBinFlag { get; set; }
+        
+        /// <summary>
+        /// 是否可以换电 0:不可换 1：可换
+        /// </summary>
+        [SugarColumn(ColumnName = "can_swap_flag")]
+        public int CanSwapFlag { get; set; }    
+        
+        /// <summary>
+        /// 是否可以充电 0:不可换 1：可换
+        /// </summary>
+        [SugarColumn(ColumnName = "can_charge_flag")]
+        public int CanChargeFlag { get; set; }    
+        
+            
+
     }
 }
\ No newline at end of file
diff --git a/Repository/Station/BinInfoRepository.cs b/Repository/Station/BinInfoRepository.cs
index 9a1c0ff..816a277 100644
--- a/Repository/Station/BinInfoRepository.cs
+++ b/Repository/Station/BinInfoRepository.cs
@@ -26,7 +26,7 @@ public class BinInfoRepository : BaseRepository<BinInfo>
             SuccessFlag = false,
         };
         List<BinInfo> list =
-            QueryListByClause(i => i.CacheBinFlag == 0 &&
+            QueryListByClause(i => i.CacheBinFlag == 0 && i.CanSwapFlag==1 &&
                                    i.Exists == 1 && i.Status == 1 && i.AmtLock == (int)InfoEnum.AmtBatLockStatus.UnLock,
                 "battery_enter_seq asc");
         BinInfo? cacheBinBattery = ChooseCacheBinBattery();