修复仓库列表未返回绑定基地标识bug

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

@@ -76,4 +76,5 @@ public interface FmsLandHouseMapper
 
     public int deleteBatchFmsLandHouseByWarehouseIds(@Param("warehouseIds") String[] warehouseIds, @Param("tid") String tid);
 
+
 }

src/main/java/com/yunfeiyun/agmp/fms/service/IFmsLandHouseService.java

@@ -74,4 +74,6 @@ public interface IFmsLandHouseService
     public List<FmsLandHouse> selectFmsLandHouseByWarehouseId(String[] warehouseIds, String tid);
 
     public int deleteBatchFmsLandHouseByWarehouseIds(String[] warehouseIds, String tid);
+
+
 }

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

@@ -111,4 +111,5 @@ public class FmsLandHouseServiceImpl implements IFmsLandHouseService
     public int deleteBatchFmsLandHouseByWarehouseIds(String[] warehouseIds, String tid) {
         return fmsLandHouseMapper.deleteBatchFmsLandHouseByWarehouseIds(warehouseIds,tid);
     }
+
 }

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

@@ -15,7 +15,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -43,7 +46,14 @@ public class WmsWarehouseServiceImpl implements IWmsWarehouseService
      */
     @Override
     public WmsWarehouse selectWmsWarehouseByWarehouseId(String warehouseId, String tid) {
-        return wmsWarehouseMapper.selectWmsWarehouseByWarehouseId(warehouseId,tid);
+        WmsWarehouse wmsWarehouse = wmsWarehouseMapper.selectWmsWarehouseByWarehouseId(warehouseId,tid);
+        FmsLandHouse fmsLandHouseQuery = new FmsLandHouse();
+        fmsLandHouseQuery.setWarehouseId(warehouseId);
+        fmsLandHouseQuery.setTid(tid);
+        List<FmsLandHouse> fmsLandHouseList = fmsLandHouseService.selectFmsLandHouseList(fmsLandHouseQuery);
+        List<String> landIds = fmsLandHouseList.stream().map(FmsLandHouse::getLandId).collect(Collectors.toList());
+        wmsWarehouse.setLandIds(landIds);
+        return wmsWarehouse;
     }
 
     /**
@@ -55,7 +65,24 @@ public class WmsWarehouseServiceImpl implements IWmsWarehouseService
     @Override
     public List<WmsWarehouse> selectWmsWarehouseList(WmsWarehouse wmsWarehouse) {
         wmsWarehouse.setTid(SecurityUtils.getTid());
-        return wmsWarehouseMapper.selectWmsWarehouseList(wmsWarehouse);
+        List<WmsWarehouse> wmsWarehouseList = wmsWarehouseMapper.selectWmsWarehouseList(wmsWarehouse);
+        String[] warehouseIds = new String[wmsWarehouseList.size()];
+        Map<String,WmsWarehouse> wmsWarehouseMap = new HashMap<>();
+        for(int i = 0;i<wmsWarehouseList.size();i++){
+            WmsWarehouse warehouse = wmsWarehouseList.get(i);
+            warehouse.setLandIds(new ArrayList<>());
+            warehouseIds[i] = warehouse.getWarehouseId();
+            wmsWarehouseMap.put(warehouse.getWarehouseId(),warehouse);
+        }
+
+        List<FmsLandHouse> fmsLandHouseList = fmsLandHouseService.selectFmsLandHouseByWarehouseId(warehouseIds, SecurityUtils.getTid());
+        for(FmsLandHouse fmsLandHouse :fmsLandHouseList){
+            WmsWarehouse warehouse = wmsWarehouseMap.get(fmsLandHouse.getWarehouseId());
+            if(null != warehouse){
+                warehouse.getLandIds().add(fmsLandHouse.getLandId());
+            }
+        }
+        return wmsWarehouseList;
     }
 
     /**