新增 批量删除仓库和关联绑定功能

src/main/java/com/yunfeiyun/agmp/fms/mapper/FmsLandHouseMapper.java

@@ -72,8 +72,8 @@ public interface FmsLandHouseMapper
      */
     public int insertBatchFmsLandHouse(List<FmsLandHouse> landHouseList);
 
-    public List<FmsLandHouse> selectFmsLandHouseByWarehouseId(@Param("array") String[] warehouseIds, @Param("tid") String tid);
+    public List<FmsLandHouse> selectFmsLandHouseByWarehouseId(@Param("warehouseIds") String[] warehouseIds, @Param("tid") String tid);
 
-    public int deleteBatchFmsLandHouseByWarehouseIds(String[] warehouseIds, String tid);
+    public int deleteBatchFmsLandHouseByWarehouseIds(@Param("warehouseIds") String[] warehouseIds, @Param("tid") String tid);
 
 }

src/main/java/com/yunfeiyun/agmp/fms/service/impl/WmsWarehouseServiceImpl.java

@@ -141,7 +141,7 @@ public class WmsWarehouseServiceImpl implements IWmsWarehouseService
     public int deleteWmsWarehouseByWarehouseIds(String[] warehouseIds, String tid) {
         //更新关联关系
         List<FmsLandHouse> fmsLandHouseList = fmsLandHouseService.selectFmsLandHouseByWarehouseId(warehouseIds, tid);
-        if(fmsLandHouseList == null || fmsLandHouseList.isEmpty()){
+        if(fmsLandHouseList != null && !fmsLandHouseList.isEmpty()){
             throw new BizException(ErrorCode.INVALID_PARAMETER.getCode(), "仓库已绑定基地，请先解绑后再删除");
         }
         int status = wmsWarehouseMapper.deleteWmsWarehouseByWarehouseIds(warehouseIds,tid);

src/main/resources/mapper/FmsLandHouseMapper.xml

@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectFmsLandHouseByWarehouseId" parameterType="String" resultType="FmsLandHouse">
         <include refid="selectFmsLandHouseVo"/>
         where tid = #{tid} and warehouseId in
-        <foreach item="warehouseId" collection="array" open="(" separator="," close=")">
+        <foreach item="warehouseId" collection="warehouseIds" open="(" separator="," close=")">
             #{warehouseId}
         </foreach>
     </select>
@@ -87,9 +87,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from FmsLandHouse where warehouseId = #{warehouseId} and tid = #{tid}
     </delete>
 
-    <delete id="deleteBatchFmsLandHouseByWarehouseIds">
+    <delete id="deleteBatchFmsLandHouseByWarehouseIds" parameterType="String">
         delete from FmsLandHouse where tid = #{tid} and warehouseId in
-        <foreach item="warehouseId" collection="array" open="(" separator="," close=")">
+        <foreach item="warehouseId" collection="warehouseIds" open="(" separator="," close=")">
             #{warehouseId}
         </foreach>
     </delete>